Skip to content

Commit d3f8a2f

Browse files
merllmerll
authored
chore(chart-deps): update rabbitmq-cluster-operator to version 3.20.1 (#1969)
1 parent 8b379fa commit d3f8a2f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+7636
-6846
lines changed

‎chart/chart-index/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ dependencies:
7878
repository: https://grafana.github.io/helm-charts
7979
- name: rabbitmq-cluster-operator
8080
alias: rabbitmq
81-
version: 3.10.10
81+
version: 3.20.1
8282
repository: https://charts.bitnami.com/bitnami
8383
- name: sealed-secrets
8484
version: 2.17.1

‎charts/rabbitmq/.helmignore

+2
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@
1919
.project
2020
.idea/
2121
*.tmproj
22+
# img folder
23+
img/

‎charts/rabbitmq/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.14.1
5-
digest: sha256:5ccbe5f1fe4459864a8c9d7329c400b678666b6cfb1450818a830bda81995bc3
6-
generated: "2024-01-09T14:08:31.622307312Z"
4+
version: 2.18.0
5+
digest: sha256:f489ae7394a4eceb24fb702901483c67a5b4fff605f19d5e2545e3a6778e1280
6+
generated: "2024-03-05T15:31:47.119308256+01:00"

‎charts/rabbitmq/Chart.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
annotations:
22
category: Infrastructure
33
images: |
4-
- name: rabbitmq-cluster-operator
5-
image: docker.io/bitnami/rabbitmq-cluster-operator:2.6.0-debian-11-r3
64
- name: rabbitmq
7-
image: docker.io/bitnami/rabbitmq:3.12.12-debian-11-r0
5+
image: docker.io/bitnami/rabbitmq:3.12.13-debian-12-r2
6+
- name: rabbitmq-cluster-operator
7+
image: docker.io/bitnami/rabbitmq-cluster-operator:2.7.0-debian-12-r8
88
- name: rmq-default-credential-updater
9-
image: docker.io/bitnami/rmq-default-credential-updater:1.0.4-debian-11-r5
9+
image: docker.io/bitnami/rmq-default-credential-updater:1.0.4-debian-12-r14
1010
- name: rmq-messaging-topology-operator
11-
image: docker.io/bitnami/rmq-messaging-topology-operator:1.12.2-debian-11-r1
11+
image: docker.io/bitnami/rmq-messaging-topology-operator:1.13.0-debian-12-r7
1212
licenses: Apache-2.0
1313
apiVersion: v2
14-
appVersion: 2.6.0
14+
appVersion: 2.7.0
1515
dependencies:
1616
- name: common
1717
repository: oci://registry-1.docker.io/bitnamicharts
@@ -32,7 +32,7 @@ kubeVersion: '>= 1.19.0-0'
3232
maintainers:
3333
- name: VMware, Inc.
3434
url: https://github.com/bitnami/charts
35-
name: rabbitmq
35+
name: rabbitmq-cluster-operator
3636
sources:
3737
- https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq-cluster-operator
38-
version: 3.10.10
38+
version: 3.20.1

‎charts/rabbitmq/README.md

+256-178
Large diffs are not rendered by default.

‎charts/rabbitmq/charts/common/.helmignore

+2
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@
2020
.idea/
2121
*.tmproj
2222
.vscode/
23+
# img folder
24+
img/

‎charts/rabbitmq/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.14.1
5+
appVersion: 2.18.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
2222
type: library
23-
version: 2.14.1
23+
version: 2.18.0

‎charts/rabbitmq/charts/common/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ helm install test mychart --set path.to.value00="",path.to.value01=""
220220

221221
## License
222222

223-
Copyright © 2023 VMware, Inc.
223+
Copyright © 2024 Broadcom. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
224224

225225
Licensed under the Apache License, Version 2.0 (the "License");
226226
you may not use this file except in compliance with the License.

‎charts/rabbitmq/charts/common/templates/_compatibility.tpl

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{{/*
2+
Copyright VMware, Inc.
3+
SPDX-License-Identifier: APACHE-2.0
4+
*/}}
5+
6+
{{/* vim: set filetype=mustache: */}}
7+
8+
{{/*
9+
Return true if the detected platform is Openshift
10+
Usage:
11+
{{- include "common.compatibility.isOpenshift" . -}}
12+
*/}}
13+
{{- define "common.compatibility.isOpenshift" -}}
14+
{{- if .Capabilities.APIVersions.Has "security.openshift.io/v1" -}}
15+
{{- true -}}
16+
{{- end -}}
17+
{{- end -}}
18+
19+
{{/*
20+
Render a compatible securityContext depending on the platform. By default it is maintained as it is. In other platforms like Openshift we remove default user/group values that do not work out of the box with the restricted-v1 SCC
21+
Usage:
22+
{{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.containerSecurityContext "context" $) -}}
23+
*/}}
24+
{{- define "common.compatibility.renderSecurityContext" -}}
25+
{{- $adaptedContext := .secContext -}}
26+
{{- if .context.Values.global.compatibility -}}
27+
{{- if .context.Values.global.compatibility.openshift -}}
28+
{{- if or (eq .context.Values.global.compatibility.openshift.adaptSecurityContext "force") (and (eq .context.Values.global.compatibility.openshift.adaptSecurityContext "auto") (include "common.compatibility.isOpenshift" .context)) -}}
29+
{{/* Remove incompatible user/group values that do not work in Openshift out of the box */}}
30+
{{- $adaptedContext = omit $adaptedContext "fsGroup" "runAsUser" "runAsGroup" -}}
31+
{{- end -}}
32+
{{- end -}}
33+
{{- end -}}
34+
{{- omit $adaptedContext "enabled" | toYaml -}}
35+
{{- end -}}

‎charts/rabbitmq/charts/common/templates/_resources.tpl

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{{/*
2+
Copyright VMware, Inc.
3+
SPDX-License-Identifier: APACHE-2.0
4+
*/}}
5+
6+
{{/* vim: set filetype=mustache: */}}
7+
8+
{{/*
9+
Return a resource request/limit object based on a given preset.
10+
These presets are for basic testing and not meant to be used in production
11+
{{ include "common.resources.preset" (dict "type" "nano") -}}
12+
*/}}
13+
{{- define "common.resources.preset" -}}
14+
{{/* The limits are the requests increased by 50% (except ephemeral-storage)*/}}
15+
{{- $presets := dict
16+
"nano" (dict
17+
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
18+
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "1024Mi")
19+
)
20+
"micro" (dict
21+
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
22+
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "1024Mi")
23+
)
24+
"small" (dict
25+
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
26+
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "1024Mi")
27+
)
28+
"medium" (dict
29+
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
30+
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "1024Mi")
31+
)
32+
"large" (dict
33+
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
34+
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "1024Mi")
35+
)
36+
"xlarge" (dict
37+
"requests" (dict "cpu" "2.0" "memory" "4096Mi" "ephemeral-storage" "50Mi")
38+
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "1024Mi")
39+
)
40+
"2xlarge" (dict
41+
"requests" (dict "cpu" "4.0" "memory" "8192Mi" "ephemeral-storage" "50Mi")
42+
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "1024Mi")
43+
)
44+
}}
45+
{{- if hasKey $presets .type -}}
46+
{{- index $presets .type | toYaml -}}
47+
{{- else -}}
48+
{{- printf "ERROR: Preset key '%s' invalid. Allowed values are %s" .type (join "," (keys $presets)) | fail -}}
49+
{{- end -}}
50+
{{- end -}}

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

+64-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,70 @@ 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.bitnami.com/containers/how-to/understand-rolling-tags-containers/
16+
+info https://docs.bitnami.com/tutorials/understand-rolling-tags-containers
1717
{{- end }}
18+
{{- end -}}
19+
20+
{{/*
21+
Warning about not setting the resource object in all deployments.
22+
Usage:
23+
{{ include "common.warnings.resources" (dict "sections" (list "path1" "path2") context $) }}
24+
Example:
25+
{{- include "common.warnings.resources" (dict "sections" (list "csiProvider.provider" "server" "volumePermissions" "") "context" $) }}
26+
The list in the example assumes that the following values exist:
27+
- csiProvider.provider.resources
28+
- server.resources
29+
- volumePermissions.resources
30+
- resources
31+
*/}}
32+
{{- define "common.warnings.resources" -}}
33+
{{- $values := .context.Values -}}
34+
{{- $printMessage := false -}}
35+
{{ $affectedSections := list -}}
36+
{{- range .sections -}}
37+
{{- if eq . "" -}}
38+
{{/* Case where the resources section is at the root (one main deployment in the chart) */}}
39+
{{- if not (index $values "resources") -}}
40+
{{- $affectedSections = append $affectedSections "resources" -}}
41+
{{- $printMessage = true -}}
42+
{{- end -}}
43+
{{- else -}}
44+
{{/* Case where the are multiple resources sections (more than one main deployment in the chart) */}}
45+
{{- $keys := split "." . -}}
46+
{{/* We iterate through the different levels until arriving to the resource section. Example: a.b.c.resources */}}
47+
{{- $section := $values -}}
48+
{{- range $keys -}}
49+
{{- $section = index $section . -}}
50+
{{- end -}}
51+
{{- if not (index $section "resources") -}}
52+
{{/* If the section has enabled=false or replicaCount=0, do not include it */}}
53+
{{- if and (hasKey $section "enabled") -}}
54+
{{- if index $section "enabled" -}}
55+
{{/* enabled=true */}}
56+
{{- $affectedSections = append $affectedSections (printf "%s.resources" .) -}}
57+
{{- $printMessage = true -}}
58+
{{- end -}}
59+
{{- else if and (hasKey $section "replicaCount") -}}
60+
{{/* We need a casting to int because number 0 is not treated as an int by default */}}
61+
{{- if (gt (index $section "replicaCount" | int) 0) -}}
62+
{{/* replicaCount > 0 */}}
63+
{{- $affectedSections = append $affectedSections (printf "%s.resources" .) -}}
64+
{{- $printMessage = true -}}
65+
{{- end -}}
66+
{{- else -}}
67+
{{/* Default case, add it to the affected sections */}}
68+
{{- $affectedSections = append $affectedSections (printf "%s.resources" .) -}}
69+
{{- $printMessage = true -}}
70+
{{- end -}}
71+
{{- end -}}
72+
{{- end -}}
73+
{{- end -}}
74+
{{- if $printMessage }}
1875

76+
WARNING: There are "resources" sections in the chart not set. Using "resourcesPreset" is not recommended for production. For production installations, please set the following values according to your workload needs:
77+
{{- range $affectedSections }}
78+
- {{ . }}
79+
{{- end }}
80+
+info https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
81+
{{- end -}}
1982
{{- end -}}

0 commit comments

Comments
 (0)