Skip to content

Commit

Permalink
[bitnami/zipkin] Set usePasswordFiles=true by default (#32123)
Browse files Browse the repository at this point in the history
* [bitnami/zipkin] Set `usePasswordFiles=true` by default

Signed-off-by: Miguel Ruiz <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Bitnami Containers <[email protected]>

* Update README.md with readme-generator-for-helm

Signed-off-by: Bitnami Containers <[email protected]>

---------

Signed-off-by: Miguel Ruiz <[email protected]>
Signed-off-by: Bitnami Containers <[email protected]>
Co-authored-by: Bitnami Containers <[email protected]>
  • Loading branch information
migruiz4 and bitnami-bot authored Feb 24, 2025
1 parent c46b8f0 commit 4b885c6
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 15 deletions.
1 change: 0 additions & 1 deletion .vib/zipkin/runtime-parameters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ containerSecurityContext:
runAsUser: 1002
containerPorts:
http: 6555
usePasswordFile: true
configOverrides:
AUTOCOMPLETE_TTL: "1000000"
secretConfigOverrides:
Expand Down
6 changes: 5 additions & 1 deletion bitnami/zipkin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)

## <small>1.1.5 (2025-02-16)</small>

Expand Down
2 changes: 1 addition & 1 deletion bitnami/zipkin/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion bitnami/zipkin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
Expand Down
6 changes: 3 additions & 3 deletions bitnami/zipkin/templates/_init_containers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions bitnami/zipkin/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand All @@ -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:
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions bitnami/zipkin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4b885c6

Please sign in to comment.