Charts CI

``` Updated: kubecost/cost-analyzer: - 2.2.4 redpanda/redpanda: - 5.8.4 speedscale/speedscale-operator: - 2.1.344 ```
rancher · May 10, 2024 · 8e96e75 · 8e96e75
1 parent 1680f28
commit 8e96e75
Show file tree

Hide file tree

Showing 14 changed files with 397 additions and 86 deletions.
diff --git a/assets/kubecost/cost-analyzer-2.2.3.tgz b/assets/kubecost/cost-analyzer-2.2.3.tgz
diff --git a/assets/kubecost/cost-analyzer-2.2.4.tgz b/assets/kubecost/cost-analyzer-2.2.4.tgz
diff --git a/assets/redpanda/redpanda-5.8.4.tgz b/assets/redpanda/redpanda-5.8.4.tgz
diff --git a/assets/speedscale/speedscale-operator-2.1.344.tgz b/assets/speedscale/speedscale-operator-2.1.344.tgz
diff --git a/charts/kubecost/cost-analyzer/Chart.yaml b/charts/kubecost/cost-analyzer/Chart.yaml
@@ -7,9 +7,9 @@ annotations:
   catalog.cattle.io/featured: "1"
   catalog.cattle.io/release-name: cost-analyzer
 apiVersion: v2
-appVersion: 2.2.3
+appVersion: 2.2.4
 description: A Helm chart that sets up Kubecost, Prometheus, and Grafana to monitor
   cloud costs.
 icon: https://partner-charts.rancher.io/assets/logos/kubecost.png
 name: cost-analyzer
-version: 2.2.3
+version: 2.2.4
diff --git a/charts/redpanda/redpanda/Chart.yaml b/charts/redpanda/redpanda/Chart.yaml
@@ -37,4 +37,4 @@ name: redpanda
 sources:
 - https://github.com/redpanda-data/helm-charts
 type: application
-version: 5.8.3
+version: 5.8.4
diff --git a/charts/redpanda/redpanda/README.md b/charts/redpanda/redpanda/README.md
@@ -3,7 +3,7 @@
 description: Find the default values and descriptions of settings in the Redpanda Helm chart.
 ---
 
-![Version: 5.8.3](https://img.shields.io/badge/Version-5.8.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v24.1.1](https://img.shields.io/badge/AppVersion-v24.1.1-informational?style=flat-square)
+![Version: 5.8.4](https://img.shields.io/badge/Version-5.8.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v24.1.1](https://img.shields.io/badge/AppVersion-v24.1.1-informational?style=flat-square)
 
 This page describes the official Redpanda Helm Chart. In particular, this page describes the contents of the chart’s [`values.yaml` file](https://github.com/redpanda-data/helm-charts/blob/main/charts/redpanda/values.yaml). Each of the settings is listed and described on this page, along with any default values.
 

diff --git a/charts/redpanda/redpanda/templates/_helpers.go.tpl b/charts/redpanda/redpanda/templates/_helpers.go.tpl
@@ -52,64 +52,6 @@
 {{- end -}}
 {{- end -}}
 
-{{- define "redpanda.StatefulSetPodLabelsSelector" -}}
-{{- $dot := (index .a 0) -}}
-{{- $existing := (index .a 1) -}}
-{{- range $_ := (list 1) -}}
-{{- if (and $dot.Release.IsUpgrade (ne $existing (coalesce nil))) -}}
-{{- if (gt (int (get (fromJson (include "_shims.len" (dict "a" (list $existing.spec.selector.matchLabels) ))) "r")) 0) -}}
-{{- (dict "r" $existing.spec.selector.matchLabels) | toJson -}}
-{{- break -}}
-{{- end -}}
-{{- end -}}
-{{- $values := $dot.Values.AsMap -}}
-{{- $additionalSelectorLabels := (dict ) -}}
-{{- if (ne $values.statefulset.additionalSelectorLabels (coalesce nil)) -}}
-{{- $additionalSelectorLabels = $values.statefulset.additionalSelectorLabels -}}
-{{- end -}}
-{{- $component := (printf "%s-statefulset" (trimSuffix "-" (trunc 51 (get (fromJson (include "redpanda.Name" (dict "a" (list $dot) ))) "r")))) -}}
-{{- $defaults := (dict "app.kubernetes.io/component" $component "app.kubernetes.io/instance" $dot.Release.Name "app.kubernetes.io/name" (get (fromJson (include "redpanda.Name" (dict "a" (list $dot) ))) "r") ) -}}
-{{- (dict "r" (merge (dict ) $additionalSelectorLabels $defaults)) | toJson -}}
-{{- break -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "redpanda.StatefulSetPodLabels" -}}
-{{- $dot := (index .a 0) -}}
-{{- $existing := (index .a 1) -}}
-{{- range $_ := (list 1) -}}
-{{- if (and $dot.Release.IsUpgrade (ne $existing (coalesce nil))) -}}
-{{- if (gt (int (get (fromJson (include "_shims.len" (dict "a" (list $existing.spec.template.metadata.labels) ))) "r")) 0) -}}
-{{- (dict "r" $existing.spec.template.metadata.labels) | toJson -}}
-{{- break -}}
-{{- end -}}
-{{- end -}}
-{{- $values := $dot.Values.AsMap -}}
-{{- $statefulSetLabels := (dict ) -}}
-{{- if (ne $values.statefulset.podTemplate.labels (coalesce nil)) -}}
-{{- $statefulSetLabels = $values.statefulset.podTemplate.labels -}}
-{{- end -}}
-{{- $defaults := (dict "redpanda.com/poddisruptionbudget" (get (fromJson (include "redpanda.Fullname" (dict "a" (list $dot) ))) "r") ) -}}
-{{- (dict "r" (merge (dict ) $statefulSetLabels (get (fromJson (include "redpanda.StatefulSetPodLabelsSelector" (dict "a" (list $dot $existing) ))) "r") $defaults)) | toJson -}}
-{{- break -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "redpanda.StatefulSetPodAnnotations" -}}
-{{- $dot := (index .a 0) -}}
-{{- $configMapChecksum := (index .a 1) -}}
-{{- range $_ := (list 1) -}}
-{{- $values := $dot.Values.AsMap -}}
-{{- $configMapChecksumAnnotation := (dict "config.redpanda.com/checksum" $configMapChecksum ) -}}
-{{- if (ne $values.statefulset.podTemplate.annotations (coalesce nil)) -}}
-{{- (dict "r" (merge (dict ) $values.statefulset.podTemplate.annotations $configMapChecksumAnnotation)) | toJson -}}
-{{- break -}}
-{{- end -}}
-{{- (dict "r" (merge (dict ) $values.statefulset.annotations $configMapChecksumAnnotation)) | toJson -}}
-{{- break -}}
-{{- end -}}
-{{- end -}}
-
 {{- define "redpanda.ServiceAccountName" -}}
 {{- $dot := (index .a 0) -}}
 {{- range $_ := (list 1) -}}
@@ -226,6 +168,26 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "redpanda.PodSecurityContext" -}}
+{{- $dot := (index .a 0) -}}
+{{- range $_ := (list 1) -}}
+{{- $values := $dot.Values.AsMap -}}
+{{- $sc := (get (fromJson (include "_shims.ptr_Deref" (dict "a" (list $values.statefulset.podSecurityContext $values.statefulset.securityContext) ))) "r") -}}
+{{- (dict "r" (mustMergeOverwrite (dict ) (dict "fsGroup" $sc.fsGroup "fsGroupChangePolicy" $sc.fsGroupChangePolicy ))) | toJson -}}
+{{- break -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "redpanda.ContainerSecurityContext" -}}
+{{- $dot := (index .a 0) -}}
+{{- range $_ := (list 1) -}}
+{{- $values := $dot.Values.AsMap -}}
+{{- $sc := (get (fromJson (include "_shims.ptr_Deref" (dict "a" (list $values.statefulset.podSecurityContext $values.statefulset.securityContext) ))) "r") -}}
+{{- (dict "r" (mustMergeOverwrite (dict ) (dict "runAsUser" $sc.runAsUser "runAsGroup" (coalesce $sc.runAsGroup $sc.fsGroup) "allowPrivilegeEscalation" $sc.allowPriviledgeEscalation "runAsNonRoot" $sc.runAsNonRoot ))) | toJson -}}
+{{- break -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "redpanda.cleanForK8s" -}}
 {{- $in := (index .a 0) -}}
 {{- range $_ := (list 1) -}}

diff --git a/charts/redpanda/redpanda/templates/_helpers.tpl b/charts/redpanda/redpanda/templates/_helpers.tpl
@@ -289,23 +289,12 @@ than 1 core.
 {{- toJson (dict "bool" $result) -}}
 {{- end -}}
 
-# manage backward compatibility with renaming podSecurityContext to securityContext
 {{- define "pod-security-context" -}}
-fsGroup: {{ dig "podSecurityContext" "fsGroup" .Values.statefulset.securityContext.fsGroup .Values.statefulset }}
-fsGroupChangePolicy: {{ dig "securityContext" "fsGroupChangePolicy" "OnRootMismatch" .Values.statefulset }}
+{{- get ((include "redpanda.PodSecurityContext" (dict "a" (list .))) | fromJson) "r" | toYaml }}
 {{- end -}}
 
-# for backward compatibility, force a default on releases that didn't
-# set the podSecurityContext.runAsUser before
 {{- define "container-security-context" -}}
-runAsUser: {{ dig "podSecurityContext" "runAsUser" .Values.statefulset.securityContext.runAsUser .Values.statefulset }}
-runAsGroup: {{ dig "podSecurityContext" "fsGroup" .Values.statefulset.securityContext.fsGroup .Values.statefulset }}
-{{- if hasKey .Values.statefulset.securityContext "allowPrivilegeEscalation" }}
-allowPrivilegeEscalation: {{ dig "podSecurityContext" "allowPrivilegeEscalation" .Values.statefulset.securityContext.allowPrivilegeEscalation .Values.statefulset }}
-{{- end -}}
-{{- if hasKey .Values.statefulset.securityContext "runAsNonRoot" }}
-runAsNonRoot: {{ dig "podSecurityContext" "runAsNonRoot" .Values.statefulset.securityContext.runAsNonRoot .Values.statefulset }}
-{{- end -}}
+{{- get ((include "redpanda.ContainerSecurityContext" (dict "a" (list .))) | fromJson) "r" | toYaml }}
 {{- end -}}
 
 {{- define "admin-tls-curl-flags" -}}

diff --git a/charts/redpanda/redpanda/templates/_statefulset.go.tpl b/charts/redpanda/redpanda/templates/_statefulset.go.tpl
@@ -15,3 +15,61 @@
 {{- end -}}
 {{- end -}}
 
+{{- define "redpanda.StatefulSetPodLabelsSelector" -}}
+{{- $dot := (index .a 0) -}}
+{{- $existing := (index .a 1) -}}
+{{- range $_ := (list 1) -}}
+{{- if (and $dot.Release.IsUpgrade (ne $existing (coalesce nil))) -}}
+{{- if (gt (int (get (fromJson (include "_shims.len" (dict "a" (list $existing.spec.selector.matchLabels) ))) "r")) 0) -}}
+{{- (dict "r" $existing.spec.selector.matchLabels) | toJson -}}
+{{- break -}}
+{{- end -}}
+{{- end -}}
+{{- $values := $dot.Values.AsMap -}}
+{{- $additionalSelectorLabels := (dict ) -}}
+{{- if (ne $values.statefulset.additionalSelectorLabels (coalesce nil)) -}}
+{{- $additionalSelectorLabels = $values.statefulset.additionalSelectorLabels -}}
+{{- end -}}
+{{- $component := (printf "%s-statefulset" (trimSuffix "-" (trunc 51 (get (fromJson (include "redpanda.Name" (dict "a" (list $dot) ))) "r")))) -}}
+{{- $defaults := (dict "app.kubernetes.io/component" $component "app.kubernetes.io/instance" $dot.Release.Name "app.kubernetes.io/name" (get (fromJson (include "redpanda.Name" (dict "a" (list $dot) ))) "r") ) -}}
+{{- (dict "r" (merge (dict ) $additionalSelectorLabels $defaults)) | toJson -}}
+{{- break -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "redpanda.StatefulSetPodLabels" -}}
+{{- $dot := (index .a 0) -}}
+{{- $existing := (index .a 1) -}}
+{{- range $_ := (list 1) -}}
+{{- if (and $dot.Release.IsUpgrade (ne $existing (coalesce nil))) -}}
+{{- if (gt (int (get (fromJson (include "_shims.len" (dict "a" (list $existing.spec.template.metadata.labels) ))) "r")) 0) -}}
+{{- (dict "r" $existing.spec.template.metadata.labels) | toJson -}}
+{{- break -}}
+{{- end -}}
+{{- end -}}
+{{- $values := $dot.Values.AsMap -}}
+{{- $statefulSetLabels := (dict ) -}}
+{{- if (ne $values.statefulset.podTemplate.labels (coalesce nil)) -}}
+{{- $statefulSetLabels = $values.statefulset.podTemplate.labels -}}
+{{- end -}}
+{{- $defaults := (dict "redpanda.com/poddisruptionbudget" (get (fromJson (include "redpanda.Fullname" (dict "a" (list $dot) ))) "r") ) -}}
+{{- (dict "r" (merge (dict ) $statefulSetLabels (get (fromJson (include "redpanda.StatefulSetPodLabelsSelector" (dict "a" (list $dot $existing) ))) "r") $defaults (get (fromJson (include "redpanda.FullLabels" (dict "a" (list $dot) ))) "r"))) | toJson -}}
+{{- break -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "redpanda.StatefulSetPodAnnotations" -}}
+{{- $dot := (index .a 0) -}}
+{{- $configMapChecksum := (index .a 1) -}}
+{{- range $_ := (list 1) -}}
+{{- $values := $dot.Values.AsMap -}}
+{{- $configMapChecksumAnnotation := (dict "config.redpanda.com/checksum" $configMapChecksum ) -}}
+{{- if (ne $values.statefulset.podTemplate.annotations (coalesce nil)) -}}
+{{- (dict "r" (merge (dict ) $values.statefulset.podTemplate.annotations $configMapChecksumAnnotation)) | toJson -}}
+{{- break -}}
+{{- end -}}
+{{- (dict "r" (merge (dict ) $values.statefulset.annotations $configMapChecksumAnnotation)) | toJson -}}
+{{- break -}}
+{{- end -}}
+{{- end -}}
+