From cdadc03d3d4c232253c2a9ae0d5148a3d1c4a64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n=20Garc=C3=ADa?= Date: Wed, 7 May 2025 10:43:39 +0200 Subject: [PATCH] [bitnami/redis-cluster] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references (#33429) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [bitnami/redis-cluster] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references Signed-off-by: Javier J. Salmerón García * Update CHANGELOG.md Signed-off-by: Bitnami Bot * chore: :fire: Remove k8s psp version check Signed-off-by: Javier J. Salmerón García * Update CHANGELOG.md Signed-off-by: Bitnami Bot --------- Signed-off-by: Javier J. Salmerón García Signed-off-by: Bitnami Bot Co-authored-by: Bitnami Bot --- bitnami/redis-cluster/CHANGELOG.md | 6 ++++- bitnami/redis-cluster/Chart.lock | 6 ++--- bitnami/redis-cluster/Chart.yaml | 2 +- bitnami/redis-cluster/templates/_helpers.tpl | 22 ------------------- .../templates/networkpolicy.yaml | 2 +- .../redis-cluster/templates/redis-role.yaml | 2 +- .../templates/redis-statefulset.yaml | 2 -- 7 files changed, 11 insertions(+), 31 deletions(-) diff --git a/bitnami/redis-cluster/CHANGELOG.md b/bitnami/redis-cluster/CHANGELOG.md index 1d72f4c803..74160ac86c 100644 --- a/bitnami/redis-cluster/CHANGELOG.md +++ b/bitnami/redis-cluster/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog +## 12.0.1 (2025-05-07) + +* [bitnami/redis-cluster] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33429](https://github.com/bitnami/charts/pull/33429)) + ## 12.0.0 (2025-05-06) -* [bitnami/redis-cluster] Release 12.0.0 ([#33456](https://github.com/bitnami/charts/pull/33456)) +* [bitnami/redis-cluster] Release 12.0.0 (#33456) ([583c0b6](https://github.com/bitnami/charts/commit/583c0b6e1a1377f8ea387597c623ac490a329822)), closes [#33456](https://github.com/bitnami/charts/issues/33456) ## 11.5.4 (2025-04-30) diff --git a/bitnami/redis-cluster/Chart.lock b/bitnami/redis-cluster/Chart.lock index 3a0ab63b8e..da4c8b7507 100644 --- a/bitnami/redis-cluster/Chart.lock +++ b/bitnami/redis-cluster/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.30.0 -digest: sha256:46afdf79eae69065904d430f03f7e5b79a148afed20aa45ee83ba88adc036169 -generated: "2025-02-20T04:17:15.59468396Z" + version: 2.31.0 +digest: sha256:c4c9af4e0ca23cf2c549e403b2a2bba2c53a3557cee23da09fa4cdf710044c2c +generated: "2025-05-06T11:00:09.805143561+02:00" diff --git a/bitnami/redis-cluster/Chart.yaml b/bitnami/redis-cluster/Chart.yaml index 2402836021..93e4b5cd85 100644 --- a/bitnami/redis-cluster/Chart.yaml +++ b/bitnami/redis-cluster/Chart.yaml @@ -35,4 +35,4 @@ maintainers: name: redis-cluster sources: - https://github.com/bitnami/charts/tree/main/bitnami/redis-cluster -version: 12.0.0 +version: 12.0.1 \ No newline at end of file diff --git a/bitnami/redis-cluster/templates/_helpers.tpl b/bitnami/redis-cluster/templates/_helpers.tpl index ff5dd268da..fb391d92b2 100644 --- a/bitnami/redis-cluster/templates/_helpers.tpl +++ b/bitnami/redis-cluster/templates/_helpers.tpl @@ -40,28 +40,6 @@ Return the proper Docker Image Registry Secret Names {{- include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.metrics.image) "global" .Values.global) -}} {{- end -}} -{{/* -Return the appropriate apiVersion for networkpolicy. -*/}} -{{- define "networkPolicy.apiVersion" -}} -{{- if semverCompare ">=1.4-0, <1.7-0" .Capabilities.KubeVersion.GitVersion -}} -{{- print "extensions/v1beta1" -}} -{{- else -}} -{{- print "networking.k8s.io/v1" -}} -{{- end -}} -{{- end -}} - -{{/* -Return the appropriate apiGroup for PodSecurityPolicy. -*/}} -{{- define "podSecurityPolicy.apiGroup" -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -{{- print "policy" -}} -{{- else -}} -{{- print "extensions" -}} -{{- end -}} -{{- end -}} - {{/* Return true if a TLS secret object should be created */}} diff --git a/bitnami/redis-cluster/templates/networkpolicy.yaml b/bitnami/redis-cluster/templates/networkpolicy.yaml index 68f8ee2fa0..14e082f45c 100644 --- a/bitnami/redis-cluster/templates/networkpolicy.yaml +++ b/bitnami/redis-cluster/templates/networkpolicy.yaml @@ -5,7 +5,7 @@ SPDX-License-Identifier: APACHE-2.0 {{- if .Values.networkPolicy.enabled }} kind: NetworkPolicy -apiVersion: {{ template "networkPolicy.apiVersion" . }} +apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} metadata: name: {{ template "common.names.fullname" . }} namespace: {{ include "common.names.namespace" . | quote }} diff --git a/bitnami/redis-cluster/templates/redis-role.yaml b/bitnami/redis-cluster/templates/redis-role.yaml index f948cc7596..ab88d4f55c 100644 --- a/bitnami/redis-cluster/templates/redis-role.yaml +++ b/bitnami/redis-cluster/templates/redis-role.yaml @@ -15,7 +15,7 @@ metadata: {{- end }} rules: {{- if and (include "common.capabilities.psp.supported" .) .Values.podSecurityPolicy.create }} - - apiGroups: ['{{ template "podSecurityPolicy.apiGroup" . }}'] + - apiGroups: ['policy'] resources: ['podsecuritypolicies'] verbs: ['use'] resourceNames: [{{ template "common.names.fullname" . }}] diff --git a/bitnami/redis-cluster/templates/redis-statefulset.yaml b/bitnami/redis-cluster/templates/redis-statefulset.yaml index 74b655b5b2..c731327645 100644 --- a/bitnami/redis-cluster/templates/redis-statefulset.yaml +++ b/bitnami/redis-cluster/templates/redis-statefulset.yaml @@ -43,9 +43,7 @@ spec: {{- end }} spec: hostNetwork: {{ .Values.redis.hostNetwork }} - {{- if semverCompare ">= 1.13" (include "common.capabilities.kubeVersion" .) }} enableServiceLinks: false - {{- end }} {{- include "redis-cluster.imagePullSecrets" . | nindent 6 }} {{- if .Values.podSecurityContext.enabled }} securityContext: {{- include "common.compatibility.renderSecurityContext" (dict "secContext" .Values.podSecurityContext "context" $) | nindent 8 }}