From 0f688f5c98e39b8450f93435f50200b20bf0a6f3 Mon Sep 17 00:00:00 2001 From: Michael Zuberbuehler Date: Mon, 7 Nov 2022 17:44:04 +0100 Subject: [PATCH] Modify config for our needs --- Chart.lock | 15 +++--- Chart.yaml | 10 ++-- templates/deployment.yaml | 2 +- templates/tests/test-connection.yaml | 15 ------ values-ha.yaml | 10 +++- values.yaml | 68 +++++++++------------------- 6 files changed, 41 insertions(+), 79 deletions(-) delete mode 100644 templates/tests/test-connection.yaml diff --git a/Chart.lock b/Chart.lock index ee313f5..611631d 100644 --- a/Chart.lock +++ b/Chart.lock @@ -1,18 +1,15 @@ dependencies: - name: mariadb repository: https://charts.bitnami.com/bitnami - version: 11.3.0 + version: 11.3.4 - name: mariadb-galera repository: https://charts.bitnami.com/bitnami - version: 7.4.1 + version: 7.4.7 - name: redis repository: https://charts.bitnami.com/bitnami - version: 17.1.5 + version: 17.3.8 - name: redis-cluster repository: https://charts.bitnami.com/bitnami - version: 8.2.2 -- name: passbolt-ha-monitor - repository: https://anatomicjc.gitlab.io/helm-charts - version: 0.0.6 -digest: sha256:a7c45328631ef60e5958b9702afb860b3f7d3c630c3d9fa1e263540ff0d31146 -generated: "2022-09-14T16:36:41.289695302+02:00" + version: 8.2.7 +digest: sha256:6dfc7faef13eac7ac1979d63d7b1f5b52e381736f8b0e54755d7216e140e0272 +generated: "2022-11-07T17:04:33.735304+01:00" diff --git a/Chart.yaml b/Chart.yaml index 7d18167..dcf8525 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.7.1 +version: 1.8.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -50,7 +50,7 @@ dependencies: version: ">8.2.0" repository: https://charts.bitnami.com/bitnami condition: redis-cluster.enabled - - name: passbolt-ha-monitor - version: ">=0.0.6" - repository: https://anatomicjc.gitlab.io/helm-charts - condition: passbolt-ha-monitor.enabled + # - name: passbolt-ha-monitor + # version: ">=0.0.6" + # repository: https://anatomicjc.gitlab.io/helm-charts + # condition: passbolt-ha-monitor.enabled diff --git a/templates/deployment.yaml b/templates/deployment.yaml index d8e644e..2c508b3 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -61,7 +61,7 @@ spec: /usr/bin/wait-for.sh -t 0 ${DATASOURCES_DEFAULT_HOST}:3306 -- /docker-entrypoint.sh" env: - name: APP_FULL_BASE_URL - value: {{ index .Values.ingress.hosts 0 "scheme" }}://{{ index .Values.ingress.hosts 0 "host" }} + value: {{ .Values.ingress.scheme }}://{{ .Values.ingress.host}} - name: DATASOURCES_DEFAULT_HOST {{- if .Values.mariadb.enabled }} value: {{ .Release.Name }}-mariadb diff --git a/templates/tests/test-connection.yaml b/templates/tests/test-connection.yaml deleted file mode 100644 index 1eda256..0000000 --- a/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "passbolt-helm.fullname" . }}-test-connection" - labels: -{{ include "passbolt-helm.labels" . | indent 4 }} - annotations: - "helm.sh/hook": test-success -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "passbolt-helm.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/values-ha.yaml b/values-ha.yaml index b14db82..246e304 100644 --- a/values-ha.yaml +++ b/values-ha.yaml @@ -6,7 +6,7 @@ image: repository: passbolt/passbolt pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "3.7.3-1-ce" + tag: "3.7.3-1-pro" passbolt: config: license: @@ -75,11 +75,17 @@ redis: automateClusterRecovery: true auth: password: "redispassword" + global: + storageClass: "" redis-cluster: enabled: false password: "redisclusterpassword" passbolt-ha-monitor: - enabled: true + enabled: false redisCliAuth: "redispassword" + # securityContext: + # runAsUser: 1000 + # runAsGroup: 1000 + # runAsNonRoot: true diff --git a/values.yaml b/values.yaml index 5d250af..73a8f4c 100644 --- a/values.yaml +++ b/values.yaml @@ -1,30 +1,30 @@ -# Default values for passbolt-helm. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - +--- +# For the database init, replicaCount must be set to 1 +# You can scale once the DB initialized replicaCount: 1 - image: repository: passbolt/passbolt pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - tag: "3.7.1-1-ce" - -topologySpreadConstraints: [] -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" -podLabels: {} - -# Passbolt configuration + tag: "3.7.3-1-pro" passbolt: + persistence: + enabled: true + ## passbolt application Persistent Volume Storage Class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + ## + # storageClass: "-" + accessMode: ReadWriteMany + size: 1Gi firstAdmin: email: admin@domain.tld name: "Admin" surname: "Passbolt" config: - debug: false - registration: false php: max_execution_time: 300 memory_limit: "512M" @@ -44,10 +44,6 @@ passbolt: lifetime: 3600 redis: enabled: false - # Redis Cluster - #service: passbolt-redis-cluster - # Redis Sentinel - service: "passbolt-redis-node-0.passbolt-redis-headless" salt: "your salt" gpgServerKeyFingerprint: "" # serverkey_private: @@ -87,24 +83,8 @@ serviceAccount: create: true # Annotations to add to the service account annotations: {} - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: "" - -podAnnotations: {} -podSecurityContext: {} - # fsGroup: 2000 -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -# Database (dependency:mariadb) mariadb: enabled: true ## @param architecture MariaDB architecture (`standalone` or `replication`) @@ -161,16 +141,11 @@ ingress: annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" - hosts: - - host: localhost - scheme: http - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local + host: localhost + scheme: https + paths: + - path: / + pathType: ImplementationSpecific resources: {} # We usually recommend not to specify default resources and to leave this as a conscious @@ -196,4 +171,3 @@ nodeSelector: {} tolerations: [] affinity: {} -