Skip to content

Commit e36e339

Browse files
ricolinricolin
committed
update version and configs
1 parent 9cae6fd commit e36e339

25 files changed

+89
-273
lines changed

‎.charts.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ charts:
156156
repository: *openstack_helm_repository
157157
dependencies: *openstack_helm_dependencies
158158
- name: octavia
159-
version: 0.2.14
159+
version: 0.2.15
160160
repository: *openstack_helm_repository
161161
dependencies: *openstack_helm_dependencies
162162
patches:
@@ -196,7 +196,7 @@ charts:
196196
repository:
197197
url: https://charts.bitnami.com/bitnami
198198
- name: redis
199-
version: 20.2.1
199+
version: 20.3.0
200200
repository:
201201
url: https://charts.bitnami.com/bitnami
202202
- name: rook-ceph

‎charts/octavia/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ name: octavia
99
sources:
1010
- https://opendev.org/openstack/octavia
1111
- https://opendev.org/openstack/openstack-helm
12-
version: 0.2.14
12+
version: 0.2.15

‎charts/octavia/templates/secret-db-persistence.yaml

+1-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
{{/*
22
Copyright 2024 Vexxhost Inc.
3-
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
3+
SPDX-License-Identifier: APACHE-2.0
154
*/}}
165

176
{{- if .Values.manifests.secret_db_presistence }}

‎charts/octavia/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ images:
4848
ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
4949
ks_service: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
5050
ks_endpoints: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
51-
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
51+
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
5252
image_repo_sync: docker.io/docker:17.07.0
5353
octavia_api: docker.io/loci/octavia:master-ubuntu
5454
octavia_worker: docker.io/loci/octavia:master-ubuntu

‎charts/redis/Chart.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: common
33
repository: oci://registry-1.docker.io/bitnamicharts
4-
version: 2.23.0
5-
digest: sha256:fbd6439f12ded949c04553b9c52a4c8153a8f2790147d972b314ddcd46921a14
6-
generated: "2024-09-14T18:55:25.608679155Z"
4+
version: 2.27.0
5+
digest: sha256:b711ab5874abf868a0c64353a790f17771758cee6f802acb9819be004c8460af
6+
generated: "2024-11-11T21:28:10.611479336Z"

‎charts/redis/Chart.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ annotations:
22
category: Database
33
images: |
44
- name: kubectl
5-
image: docker.io/bitnami/kubectl:1.31.1-debian-12-r3
5+
image: docker.io/bitnami/kubectl:1.31.2-debian-12-r6
66
- name: os-shell
7-
image: docker.io/bitnami/os-shell:12-debian-12-r30
7+
image: docker.io/bitnami/os-shell:12-debian-12-r33
88
- name: redis
9-
image: docker.io/bitnami/redis:7.4.1-debian-12-r0
9+
image: docker.io/bitnami/redis:7.4.1-debian-12-r2
1010
- name: redis-exporter
11-
image: docker.io/bitnami/redis-exporter:1.63.0-debian-12-r1
11+
image: docker.io/bitnami/redis-exporter:1.66.0-debian-12-r2
1212
- name: redis-sentinel
13-
image: docker.io/bitnami/redis-sentinel:7.4.1-debian-12-r0
13+
image: docker.io/bitnami/redis-sentinel:7.4.1-debian-12-r2
1414
licenses: Apache-2.0
1515
apiVersion: v2
1616
appVersion: 7.4.1
@@ -35,4 +35,4 @@ maintainers:
3535
name: redis
3636
sources:
3737
- https://github.com/bitnami/charts/tree/main/bitnami/redis
38-
version: 20.2.1
38+
version: 20.3.0

‎charts/redis/README.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Bitnami charts allow setting resource requests and limits for all containers ins
6565

6666
To make this process easier, the chart contains the `resourcesPreset` values, which automatically sets the `resources` section according to different presets. Check these presets in [the bitnami/common chart](https://github.com/bitnami/charts/blob/main/bitnami/common/templates/_resources.tpl#L15). However, in production workloads using `resourcePreset` is discouraged as it may not fully adapt to your specific needs. Find more information on container resource management in the [official Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/).
6767

68-
### [Rolling VS Immutable tags](https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html)
68+
### [Rolling VS Immutable tags](https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-understand-rolling-tags-containers-index.html)
6969

7070
It is strongly recommended to use immutable tags in a production environment. This ensures your deployment does not change automatically if the same tag is updated with a different image.
7171

@@ -173,6 +173,13 @@ One way of achieving this is by setting `master.service.internalTrafficPolicy=Lo
173173
It's recommended to only change `master.count` if you know what you are doing.
174174
`master.count` greater than `1` is not designed for use when `sentinel.enabled=true`.
175175

176+
### Update credentials
177+
178+
The Bitnami Redis chart, when upgrading, reuses the secret previously rendered by the chart or the one specified in `auth.existingSecret`. To update credentials, use one of the following:
179+
180+
- Run `helm upgrade` specifying a new password in `auth.password`
181+
- Run `helm upgrade` specifying a new secret in `auth.existingSecret`
182+
176183
### Using a password file
177184

178185
To use a password file for Redis® you need to create a secret containing the password and then deploy the chart using that secret. Follow these instructions:
@@ -1175,7 +1182,7 @@ This version also introduces `bitnami/common`, a [library chart](https://helm.sh
11751182

11761183
#### Useful links
11771184

1178-
- <https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-resolve-helm2-helm3-post-migration-issues-index.html>
1185+
- <https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-resolve-helm2-helm3-post-migration-issues-index.html>
11791186
- <https://helm.sh/docs/topics/v2_v3_migration/>
11801187
- <https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/>
11811188

‎charts/redis/charts/common/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ annotations:
22
category: Infrastructure
33
licenses: Apache-2.0
44
apiVersion: v2
5-
appVersion: 2.23.0
5+
appVersion: 2.27.0
66
description: A Library Helm Chart for grouping common logic between bitnami charts.
77
This chart is not deployable by itself.
88
home: https://bitnami.com
@@ -20,4 +20,4 @@ name: common
2020
sources:
2121
- https://github.com/bitnami/charts/tree/main/bitnami/common
2222
type: library
23-
version: 2.23.0
23+
version: 2.27.0

‎charts/redis/charts/common/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ tag:
6161

6262
pullPolicy:
6363
type: string
64-
description: Specify a imagePullPolicy. Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
64+
description: Specify a imagePullPolicy.'
6565

6666
pullSecrets:
6767
type: array
@@ -214,7 +214,7 @@ helm install test mychart --set path.to.value00="",path.to.value01=""
214214

215215
#### Useful links
216216

217-
- <https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-resolve-helm2-helm3-post-migration-issues-index.html>
217+
- <https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-resolve-helm2-helm3-post-migration-issues-index.html>
218218
- <https://helm.sh/docs/topics/v2_v3_migration/>
219219
- <https://helm.sh/blog/migrate-from-helm-v2-to-helm-v3/>
220220

‎charts/redis/charts/common/templates/_affinities.tpl

+18-2
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,14 @@ Return a topologyKey definition
6060

6161
{{/*
6262
Return a soft podAffinity/podAntiAffinity definition
63-
{{ include "common.affinities.pods.soft" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "context" $) -}}
63+
{{ include "common.affinities.pods.soft" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "extraNamespaces" (list "namespace1" "namespace2") "context" $) -}}
6464
*/}}
6565
{{- define "common.affinities.pods.soft" -}}
6666
{{- $component := default "" .component -}}
6767
{{- $customLabels := default (dict) .customLabels -}}
6868
{{- $extraMatchLabels := default (dict) .extraMatchLabels -}}
6969
{{- $extraPodAffinityTerms := default (list) .extraPodAffinityTerms -}}
70+
{{- $extraNamespaces := default (list) .extraNamespaces -}}
7071
preferredDuringSchedulingIgnoredDuringExecution:
7172
- podAffinityTerm:
7273
labelSelector:
@@ -77,6 +78,13 @@ preferredDuringSchedulingIgnoredDuringExecution:
7778
{{- range $key, $value := $extraMatchLabels }}
7879
{{ $key }}: {{ $value | quote }}
7980
{{- end }}
81+
{{- if $extraNamespaces }}
82+
namespaces:
83+
- {{ .context.Release.Namespace }}
84+
{{- with $extraNamespaces }}
85+
{{ include "common.tplvalues.render" (dict "value" . "context" $) | nindent 8 }}
86+
{{- end }}
87+
{{- end }}
8088
topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
8189
weight: 1
8290
{{- range $extraPodAffinityTerms }}
@@ -96,13 +104,14 @@ preferredDuringSchedulingIgnoredDuringExecution:
96104

97105
{{/*
98106
Return a hard podAffinity/podAntiAffinity definition
99-
{{ include "common.affinities.pods.hard" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "context" $) -}}
107+
{{ include "common.affinities.pods.hard" (dict "component" "FOO" "customLabels" .Values.podLabels "extraMatchLabels" .Values.extraMatchLabels "topologyKey" "BAR" "extraPodAffinityTerms" .Values.extraPodAffinityTerms "extraNamespaces" (list "namespace1" "namespace2") "context" $) -}}
100108
*/}}
101109
{{- define "common.affinities.pods.hard" -}}
102110
{{- $component := default "" .component -}}
103111
{{- $customLabels := default (dict) .customLabels -}}
104112
{{- $extraMatchLabels := default (dict) .extraMatchLabels -}}
105113
{{- $extraPodAffinityTerms := default (list) .extraPodAffinityTerms -}}
114+
{{- $extraNamespaces := default (list) .extraNamespaces -}}
106115
requiredDuringSchedulingIgnoredDuringExecution:
107116
- labelSelector:
108117
matchLabels: {{- (include "common.labels.matchLabels" ( dict "customLabels" $customLabels "context" .context )) | nindent 8 }}
@@ -112,6 +121,13 @@ requiredDuringSchedulingIgnoredDuringExecution:
112121
{{- range $key, $value := $extraMatchLabels }}
113122
{{ $key }}: {{ $value | quote }}
114123
{{- end }}
124+
{{- if $extraNamespaces }}
125+
namespaces:
126+
- {{ .context.Release.Namespace }}
127+
{{- with $extraNamespaces }}
128+
{{ include "common.tplvalues.render" (dict "value" . "context" $) | nindent 8 }}
129+
{{- end }}
130+
{{- end }}
115131
topologyKey: {{ include "common.affinities.topologyKey" (dict "topologyKey" .topologyKey) }}
116132
{{- range $extraPodAffinityTerms }}
117133
- labelSelector:

‎charts/redis/charts/common/templates/_secrets.tpl

+11-4
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Params:
6767
Generate secret password or retrieve one if already created.
6868
6969
Usage:
70-
{{ include "common.secrets.passwords.manage" (dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "context" $) }}
70+
{{ include "common.secrets.passwords.manage" (dict "secret" "secret-name" "key" "keyName" "providedValues" (list "path.to.password1" "path.to.password2") "length" 10 "strong" false "chartName" "chartName" "honorProvidedValues" false "context" $) }}
7171

7272
Params:
7373
- secret - String - Required - Name of the 'Secret' resource where the password is stored.
@@ -80,12 +80,15 @@ Params:
8080
- failOnNew - Boolean - Optional - Default to true. If set to false, skip errors adding new keys to existing secrets.
8181
- skipB64enc - Boolean - Optional - Default to false. If set to true, no the secret will not be base64 encrypted.
8282
- skipQuote - Boolean - Optional - Default to false. If set to true, no quotes will be added around the secret.
83+
- honorProvidedValues - Boolean - Optional - Default to false. If set to true, the values in providedValues have higher priority than an existing secret
8384
The order in which this function returns a secret password:
84-
1. Already existing 'Secret' resource
85+
1. Password provided via the values.yaml if honorProvidedValues = true
86+
(If one of the keys passed to the 'providedValues' parameter to this function is a valid path to a key in the values.yaml and has a value, the value of the first key with a value will be returned)
87+
2. Already existing 'Secret' resource
8588
(If a 'Secret' resource is found under the name provided to the 'secret' parameter to this function and that 'Secret' resource contains a key with the name passed as the 'key' parameter to this function then the value of this existing secret password will be returned)
86-
2. Password provided via the values.yaml
89+
3. Password provided via the values.yaml if honorProvidedValues = false
8790
(If one of the keys passed to the 'providedValues' parameter to this function is a valid path to a key in the values.yaml and has a value, the value of the first key with a value will be returned)
88-
3. Randomly generated secret password
91+
4. Randomly generated secret password
8992
(A new random secret password with the length specified in the 'length' parameter will be generated and returned)
9093

9194
*/}}
@@ -106,6 +109,10 @@ The order in which this function returns a secret password:
106109
{{- end -}}
107110
{{- end }}
108111

112+
{{- if and $providedPasswordValue .honorProvidedValues }}
113+
{{- $password = $providedPasswordValue | toString }}
114+
{{- end }}
115+
109116
{{- if not $password }}
110117
{{- if $providedPasswordValue }}
111118
{{- $password = $providedPasswordValue | toString }}

‎charts/redis/charts/common/templates/_tplvalues.tpl

+14
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,17 @@ Usage:
3636
{{- end -}}
3737
{{ $dst | toYaml }}
3838
{{- end -}}
39+
40+
{{/*
41+
Merge a list of values that contains template after rendering them.
42+
Merge precedence is consistent with https://masterminds.github.io/sprig/dicts.html#mergeoverwrite-mustmergeoverwrite
43+
Usage:
44+
{{ include "common.tplvalues.merge-overwrite" ( dict "values" (list .Values.path.to.the.Value1 .Values.path.to.the.Value2) "context" $ ) }}
45+
*/}}
46+
{{- define "common.tplvalues.merge-overwrite" -}}
47+
{{- $dst := dict -}}
48+
{{- range .values -}}
49+
{{- $dst = include "common.tplvalues.render" (dict "value" . "context" $.context "scope" $.scope) | fromYaml | mergeOverwrite $dst -}}
50+
{{- end -}}
51+
{{ $dst | toYaml }}
52+
{{- end -}}

‎charts/redis/charts/common/templates/_warnings.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Usage:
1313

1414
{{- if and (contains "bitnami/" .repository) (not (.tag | toString | regexFind "-r\\d+$|sha256:")) }}
1515
WARNING: Rolling tag detected ({{ .repository }}:{{ .tag }}), please note that it is strongly recommended to avoid using rolling tags in a production environment.
16-
+info https://docs.vmware.com/en/VMware-Tanzu-Application-Catalog/services/tutorials/GUID-understand-rolling-tags-containers-index.html
16+
+info https://techdocs.broadcom.com/us/en/vmware-tanzu/application-catalog/tanzu-application-catalog/services/tac-doc/apps-tutorials-understand-rolling-tags-containers-index.html
1717
{{- end }}
1818
{{- end -}}
1919

‎charts/redis/charts/common/templates/validations/_cassandra.tpl

-26
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,6 @@ SPDX-License-Identifier: APACHE-2.0
44
*/}}
55

66
{{/* vim: set filetype=mustache: */}}
7-
{{/*
8-
Validate Cassandra required passwords are not empty.
9-
10-
Usage:
11-
{{ include "common.validations.values.cassandra.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
12-
Params:
13-
- secret - String - Required. Name of the secret where Cassandra values are stored, e.g: "cassandra-passwords-secret"
14-
- subchart - Boolean - Optional. Whether Cassandra is used as subchart or not. Default: false
15-
*/}}
16-
{{- define "common.validations.values.cassandra.passwords" -}}
17-
{{- $existingSecret := include "common.cassandra.values.existingSecret" . -}}
18-
{{- $enabled := include "common.cassandra.values.enabled" . -}}
19-
{{- $dbUserPrefix := include "common.cassandra.values.key.dbUser" . -}}
20-
{{- $valueKeyPassword := printf "%s.password" $dbUserPrefix -}}
21-
22-
{{- if and (or (not $existingSecret) (eq $existingSecret "\"\"")) (eq $enabled "true") -}}
23-
{{- $requiredPasswords := list -}}
24-
25-
{{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "cassandra-password" -}}
26-
{{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
27-
28-
{{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
29-
30-
{{- end -}}
31-
{{- end -}}
32-
337
{{/*
348
Auxiliary function to get the right value for existingSecret.
359

‎charts/redis/charts/common/templates/validations/_mongodb.tpl

-46
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,6 @@ SPDX-License-Identifier: APACHE-2.0
44
*/}}
55

66
{{/* vim: set filetype=mustache: */}}
7-
{{/*
8-
Validate MongoDB&reg; required passwords are not empty.
9-
10-
Usage:
11-
{{ include "common.validations.values.mongodb.passwords" (dict "secret" "secretName" "subchart" false "context" $) }}
12-
Params:
13-
- secret - String - Required. Name of the secret where MongoDB&reg; values are stored, e.g: "mongodb-passwords-secret"
14-
- subchart - Boolean - Optional. Whether MongoDB&reg; is used as subchart or not. Default: false
15-
*/}}
16-
{{- define "common.validations.values.mongodb.passwords" -}}
17-
{{- $existingSecret := include "common.mongodb.values.auth.existingSecret" . -}}
18-
{{- $enabled := include "common.mongodb.values.enabled" . -}}
19-
{{- $authPrefix := include "common.mongodb.values.key.auth" . -}}
20-
{{- $architecture := include "common.mongodb.values.architecture" . -}}
21-
{{- $valueKeyRootPassword := printf "%s.rootPassword" $authPrefix -}}
22-
{{- $valueKeyUsername := printf "%s.username" $authPrefix -}}
23-
{{- $valueKeyDatabase := printf "%s.database" $authPrefix -}}
24-
{{- $valueKeyPassword := printf "%s.password" $authPrefix -}}
25-
{{- $valueKeyReplicaSetKey := printf "%s.replicaSetKey" $authPrefix -}}
26-
{{- $valueKeyAuthEnabled := printf "%s.enabled" $authPrefix -}}
27-
28-
{{- $authEnabled := include "common.utils.getValueFromKey" (dict "key" $valueKeyAuthEnabled "context" .context) -}}
29-
30-
{{- if and (or (not $existingSecret) (eq $existingSecret "\"\"")) (eq $enabled "true") (eq $authEnabled "true") -}}
31-
{{- $requiredPasswords := list -}}
32-
33-
{{- $requiredRootPassword := dict "valueKey" $valueKeyRootPassword "secret" .secret "field" "mongodb-root-password" -}}
34-
{{- $requiredPasswords = append $requiredPasswords $requiredRootPassword -}}
35-
36-
{{- $valueUsername := include "common.utils.getValueFromKey" (dict "key" $valueKeyUsername "context" .context) }}
37-
{{- $valueDatabase := include "common.utils.getValueFromKey" (dict "key" $valueKeyDatabase "context" .context) }}
38-
{{- if and $valueUsername $valueDatabase -}}
39-
{{- $requiredPassword := dict "valueKey" $valueKeyPassword "secret" .secret "field" "mongodb-password" -}}
40-
{{- $requiredPasswords = append $requiredPasswords $requiredPassword -}}
41-
{{- end -}}
42-
43-
{{- if (eq $architecture "replicaset") -}}
44-
{{- $requiredReplicaSetKey := dict "valueKey" $valueKeyReplicaSetKey "secret" .secret "field" "mongodb-replica-set-key" -}}
45-
{{- $requiredPasswords = append $requiredPasswords $requiredReplicaSetKey -}}
46-
{{- end -}}
47-
48-
{{- include "common.validations.values.multiple.empty" (dict "required" $requiredPasswords "context" .context) -}}
49-
50-
{{- end -}}
51-
{{- end -}}
52-
537
{{/*
548
Auxiliary function to get the right value for existingSecret.
559

0 commit comments

Comments
 (0)