From 4b885c6c5439d558dc7528c456ad06380151a87f Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Mon, 24 Feb 2025 15:02:46 +0100 Subject: [PATCH] [bitnami/zipkin] Set `usePasswordFiles=true` by default (#32123) * [bitnami/zipkin] Set `usePasswordFiles=true` by default Signed-off-by: Miguel Ruiz * Update CHANGELOG.md Signed-off-by: Bitnami Containers * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers --------- Signed-off-by: Miguel Ruiz Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- .vib/zipkin/runtime-parameters.yaml | 1 - bitnami/zipkin/CHANGELOG.md | 6 +++++- bitnami/zipkin/Chart.yaml | 2 +- bitnami/zipkin/README.md | 2 +- bitnami/zipkin/templates/_init_containers.tpl | 6 +++--- bitnami/zipkin/templates/deployment.yaml | 12 ++++++------ bitnami/zipkin/values.yaml | 4 ++-- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.vib/zipkin/runtime-parameters.yaml b/.vib/zipkin/runtime-parameters.yaml index 30f3ad26f1..896bf28968 100644 --- a/.vib/zipkin/runtime-parameters.yaml +++ b/.vib/zipkin/runtime-parameters.yaml @@ -4,7 +4,6 @@ containerSecurityContext: runAsUser: 1002 containerPorts: http: 6555 -usePasswordFile: true configOverrides: AUTOCOMPLETE_TTL: "1000000" secretConfigOverrides: diff --git a/bitnami/zipkin/CHANGELOG.md b/bitnami/zipkin/CHANGELOG.md index a457177465..5e9e81655e 100644 --- a/bitnami/zipkin/CHANGELOG.md +++ b/bitnami/zipkin/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog +## 1.3.0 (2025-02-21) + +* [bitnami/zipkin] Set `usePasswordFiles=true` by default ([#32123](https://github.com/bitnami/charts/pull/32123)) + ## 1.2.0 (2025-02-20) -* [bitnami/zipkin] feat: use new helper for checking API versions ([#32065](https://github.com/bitnami/charts/pull/32065)) +* [bitnami/zipkin] feat: use new helper for checking API versions (#32065) ([bf89424](https://github.com/bitnami/charts/commit/bf894249b47cefa40e7dc44e8f8948c827415c54)), closes [#32065](https://github.com/bitnami/charts/issues/32065) ## 1.1.5 (2025-02-16) diff --git a/bitnami/zipkin/Chart.yaml b/bitnami/zipkin/Chart.yaml index c5af3b2882..fb286a3288 100644 --- a/bitnami/zipkin/Chart.yaml +++ b/bitnami/zipkin/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/bitnami/charts/tree/main/bitnami/zipkin - https://github.com/bitnami/containers/tree/main/bitnami/zipkin - https://github.com/openzipkin/zipkin -version: 1.2.0 +version: 1.3.0 diff --git a/bitnami/zipkin/README.md b/bitnami/zipkin/README.md index 10c9572aed..c75b7924c5 100644 --- a/bitnami/zipkin/README.md +++ b/bitnami/zipkin/README.md @@ -384,7 +384,7 @@ wrj2wDbCDCFmfqnSJ+dKI3vFLlEz44sAV8jX/kd4Y6ZTQhlLbYc= | `deploymentLabels` | Add extra labels to the Deployment object | `{}` | | `deploymentAnnotations` | Add extra annotations to the Deployment object | `{}` | | `logLevel` | Set application log level | `INFO` | -| `usePasswordFile` | Mount all sensitive information as files | `true` | +| `usePasswordFiles` | Mount all sensitive information as files | `true` | | `storageType` | Set version store type. The chart natively supports cassandra3, mem or other. Any other type requires you to add the configuration in configOverrides and secretConfigOverrides. | `cassandra3` | | `tls.enabled` | Enable TLS | `false` | | `tls.usePemCerts` | Use certificates in .pem format | `true` | diff --git a/bitnami/zipkin/templates/_init_containers.tpl b/bitnami/zipkin/templates/_init_containers.tpl index bccc8d57f3..955931a655 100644 --- a/bitnami/zipkin/templates/_init_containers.tpl +++ b/bitnami/zipkin/templates/_init_containers.tpl @@ -80,7 +80,7 @@ Init container definition for initializing the TLS certificates - -ec - | set -e - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} # We need to load all the secret env vars to the system for file in $(find /bitnami/zipkin/secrets -type f); do env_var_name="$(basename $file)" @@ -113,7 +113,7 @@ Init container definition for initializing the TLS certificates fi {{- end }} env: - {{- if not .Values.usePasswordFile }} + {{- if not .Values.usePasswordFiles }} {{- if or .Values.tls.passwordSecret .Values.tls.password .Values.tls.autoGenerated.enabled .Values.tls.usePemCerts }} - name: ZIPKIN_KEYSTORE_PASSWORD valueFrom: @@ -131,7 +131,7 @@ Init container definition for initializing the TLS certificates - name: empty-dir mountPath: /tmp subPath: tmp-dir - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} {{- if or .Values.tls.passwordSecret .Values.tls.password .Values.tls.autoGenerated.enabled .Values.tls.usePemCerts }} - name: keystore-password mountPath: /bitnami/zipkin/secrets/keystore-password diff --git a/bitnami/zipkin/templates/deployment.yaml b/bitnami/zipkin/templates/deployment.yaml index c9e82fdb49..b610eb84ad 100644 --- a/bitnami/zipkin/templates/deployment.yaml +++ b/bitnami/zipkin/templates/deployment.yaml @@ -112,7 +112,7 @@ spec: args: - -ec - | - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} # We need to load all the secret env vars to the system for file in $(find /bitnami/zipkin/secrets -type f); do env_var_name="$(basename $file)" @@ -129,14 +129,14 @@ spec: - name: JAVA_OPTS value: {{ .Values.javaOpts | quote }} {{- end }} - {{- if and (eq .Values.storageType "cassandra3") (not .Values.usePasswordFile) }} + {{- if and (eq .Values.storageType "cassandra3") (not .Values.usePasswordFiles) }} - name: CASSANDRA_PASSWORD valueFrom: secretKeyRef: name: {{ include "zipkin.cassandra.secretName" . }} key: {{ include "zipkin.cassandra.passwordKey" . | quote }} {{- end }} - {{- if not .Values.usePasswordFile }} + {{- if not .Values.usePasswordFiles }} {{- if or .Values.tls.passwordSecret .Values.tls.password .Values.tls.autoGenerated.enabled .Values.tls.usePemCerts }} - name: ARMERIA_SSL_KEY_STORE_PASSWORD valueFrom: @@ -151,7 +151,7 @@ spec: envFrom: - configMapRef: name: {{ include "zipkin.configmapName" . }} - {{- if and (not .Values.usePasswordFile) (or .Values.secretConfigOverrides .Values.existingSecret) }} + {{- if and (not .Values.usePasswordFiles) (or .Values.secretConfigOverrides .Values.existingSecret) }} - secretRef: name: {{ include "zipkin.secretName" . }} {{- end }} @@ -215,7 +215,7 @@ spec: mountPath: /bitnami/zipkin/certs subPath: app-processed-certs-dir {{- end }} - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} {{- if or .Values.tls.passwordSecret .Values.tls.password .Values.tls.autoGenerated.enabled .Values.tls.usePemCerts }} - name: keystore-password mountPath: /bitnami/zipkin/secrets/keystore-password @@ -253,7 +253,7 @@ spec: path: zipkin.jks {{- end }} {{- end }} - {{- if .Values.usePasswordFile }} + {{- if .Values.usePasswordFiles }} {{- if (eq .Values.storageType "cassandra3") }} - name: database-password secret: diff --git a/bitnami/zipkin/values.yaml b/bitnami/zipkin/values.yaml index 7b74dad9e2..f3c8343833 100644 --- a/bitnami/zipkin/values.yaml +++ b/bitnami/zipkin/values.yaml @@ -161,9 +161,9 @@ deploymentAnnotations: {} ## @param logLevel Set application log level ## logLevel: INFO -## @param usePasswordFile Mount all sensitive information as files +## @param usePasswordFiles Mount all sensitive information as files ## -usePasswordFile: true +usePasswordFiles: true ## @param storageType Set version store type. The chart natively supports cassandra3, mem or other. Any other type requires you to add the configuration in configOverrides and secretConfigOverrides. ## storageType: cassandra3