From 3dc1f8e114ce5a787d21308d0072683712c264e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n=20Garc=C3=ADa?= Date: Tue, 6 May 2025 15:17:12 +0200 Subject: [PATCH] [bitnami/spring-cloud-dataflow] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references (#33438) --- bitnami/spring-cloud-dataflow/CHANGELOG.md | 6 +++++- bitnami/spring-cloud-dataflow/Chart.lock | 10 +++++----- bitnami/spring-cloud-dataflow/Chart.yaml | 2 +- .../templates/prometheus-proxy/hpa.yaml | 8 -------- .../spring-cloud-dataflow/templates/server/hpa.yaml | 8 -------- .../templates/server/ingress.yaml | 6 +----- .../spring-cloud-dataflow/templates/skipper/hpa.yaml | 8 -------- 7 files changed, 12 insertions(+), 36 deletions(-) diff --git a/bitnami/spring-cloud-dataflow/CHANGELOG.md b/bitnami/spring-cloud-dataflow/CHANGELOG.md index 06e63d1b8a..6e3cdfb9e3 100644 --- a/bitnami/spring-cloud-dataflow/CHANGELOG.md +++ b/bitnami/spring-cloud-dataflow/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog +## 37.0.1 (2025-05-06) + +* [bitnami/spring-cloud-dataflow] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33438](https://github.com/bitnami/charts/pull/33438)) + ## 37.0.0 (2025-04-29) -* [bitnami/spring-cloud-dataflow] Major 37.0.0: Upgrade MariaDB to 11.4.x ([#33243](https://github.com/bitnami/charts/pull/33243)) +* [bitnami/spring-cloud-dataflow] Major 37.0.0: Upgrade MariaDB to 11.4.x (#33243) ([f3400ee](https://github.com/bitnami/charts/commit/f3400eecb2f39db9aec724fdd61cb279b4c9e6d3)), closes [#33243](https://github.com/bitnami/charts/issues/33243) ## 36.0.1 (2025-04-28) diff --git a/bitnami/spring-cloud-dataflow/Chart.lock b/bitnami/spring-cloud-dataflow/Chart.lock index 522b618678..3c70d94b1d 100644 --- a/bitnami/spring-cloud-dataflow/Chart.lock +++ b/bitnami/spring-cloud-dataflow/Chart.lock @@ -1,15 +1,15 @@ dependencies: - name: rabbitmq repository: oci://registry-1.docker.io/bitnamicharts - version: 16.0.0 + version: 16.0.1 - name: mariadb repository: oci://registry-1.docker.io/bitnamicharts version: 20.5.3 - name: kafka repository: oci://registry-1.docker.io/bitnamicharts - version: 32.2.1 + version: 32.2.2 - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.30.0 -digest: sha256:6d31b38885cd491a0b5fbbf102b986b7043c1811df8850edce74de154af57435 -generated: "2025-04-28T08:50:44.204869788Z" + version: 2.31.0 +digest: sha256:4da3111ba700f9c4b4fc9a9a6f7dba1386a0ca5ed5f73fb38b3d342ce35af10a +generated: "2025-05-06T11:07:03.915688194+02:00" diff --git a/bitnami/spring-cloud-dataflow/Chart.yaml b/bitnami/spring-cloud-dataflow/Chart.yaml index 50e78454ae..e3cdf6cbc6 100644 --- a/bitnami/spring-cloud-dataflow/Chart.yaml +++ b/bitnami/spring-cloud-dataflow/Chart.yaml @@ -52,4 +52,4 @@ maintainers: name: spring-cloud-dataflow sources: - https://github.com/bitnami/charts/tree/main/bitnami/spring-cloud-dataflow -version: 37.0.0 +version: 37.0.1 diff --git a/bitnami/spring-cloud-dataflow/templates/prometheus-proxy/hpa.yaml b/bitnami/spring-cloud-dataflow/templates/prometheus-proxy/hpa.yaml index c4034f2ce1..010e53fc5d 100644 --- a/bitnami/spring-cloud-dataflow/templates/prometheus-proxy/hpa.yaml +++ b/bitnami/spring-cloud-dataflow/templates/prometheus-proxy/hpa.yaml @@ -26,24 +26,16 @@ spec: - type: Resource resource: name: cpu - {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} - targetAverageUtilization: {{ .Values.metrics.autoscaling.targetCPU }} - {{- else }} target: type: Utilization averageUtilization: {{ .Values.metrics.autoscaling.targetCPU }} - {{- end }} {{- end }} {{- if .Values.metrics.autoscaling.targetMemory }} - type: Resource resource: name: memory - {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} - targetAverageUtilization: {{ .Values.metrics.autoscaling.targetMemory }} - {{- else }} target: type: Utilization averageUtilization: {{ .Values.metrics.autoscaling.targetMemory }} - {{- end }} {{- end }} {{- end }} diff --git a/bitnami/spring-cloud-dataflow/templates/server/hpa.yaml b/bitnami/spring-cloud-dataflow/templates/server/hpa.yaml index b789bfd2b7..349a8552f3 100644 --- a/bitnami/spring-cloud-dataflow/templates/server/hpa.yaml +++ b/bitnami/spring-cloud-dataflow/templates/server/hpa.yaml @@ -26,24 +26,16 @@ spec: - type: Resource resource: name: cpu - {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} - targetAverageUtilization: {{ .Values.server.autoscaling.targetCPU }} - {{- else }} target: type: Utilization averageUtilization: {{ .Values.server.autoscaling.targetCPU }} - {{- end }} {{- end }} {{- if .Values.server.autoscaling.targetMemory }} - type: Resource resource: name: memory - {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} - targetAverageUtilization: {{ .Values.server.autoscaling.targetMemory }} - {{- else }} target: type: Utilization averageUtilization: {{ .Values.server.autoscaling.targetMemory }} - {{- end }} {{- end }} {{- end }} diff --git a/bitnami/spring-cloud-dataflow/templates/server/ingress.yaml b/bitnami/spring-cloud-dataflow/templates/server/ingress.yaml index 8700ac5cb9..f56fe4a898 100644 --- a/bitnami/spring-cloud-dataflow/templates/server/ingress.yaml +++ b/bitnami/spring-cloud-dataflow/templates/server/ingress.yaml @@ -20,7 +20,7 @@ metadata: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: - {{- if and .Values.server.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }} + {{- if .Values.server.ingress.ingressClassName }} ingressClassName: {{ .Values.server.ingress.ingressClassName | quote }} {{- end }} rules: @@ -29,9 +29,7 @@ spec: http: paths: - path: {{ .Values.server.ingress.path }} - {{- if eq "true" (include "common.ingress.supportsPathType" .) }} pathType: {{ .Values.server.ingress.pathType }} - {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-server" (include "common.names.fullname" .)) "servicePort" "http" "context" $) | nindent 14 }} {{- if .Values.server.ingress.extraPaths }} {{- include "common.tplvalues.render" (dict "value" .Values.server.ingress.extraPaths "context" $) | nindent 10 }} @@ -42,9 +40,7 @@ spec: http: paths: - path: {{ default "/" .path }} - {{- if eq "true" (include "common.ingress.supportsPathType" $) }} pathType: {{ default "ImplementationSpecific" .pathType }} - {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-server" (include "common.names.fullname" $)) "servicePort" "http" "context" $) | nindent 14 }} {{- end }} {{- if .Values.server.ingress.extraRules }} diff --git a/bitnami/spring-cloud-dataflow/templates/skipper/hpa.yaml b/bitnami/spring-cloud-dataflow/templates/skipper/hpa.yaml index 526e1b26a4..59467bfcde 100644 --- a/bitnami/spring-cloud-dataflow/templates/skipper/hpa.yaml +++ b/bitnami/spring-cloud-dataflow/templates/skipper/hpa.yaml @@ -28,24 +28,16 @@ spec: - type: Resource resource: name: cpu - {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} - targetAverageUtilization: {{ .Values.skipper.autoscaling.targetCPU }} - {{- else }} target: type: Utilization averageUtilization: {{ .Values.skipper.autoscaling.targetCPU }} - {{- end }} {{- end }} {{- if .Values.skipper.autoscaling.targetMemory }} - type: Resource resource: name: memory - {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} - targetAverageUtilization: {{ .Values.skipper.autoscaling.targetMemory }} - {{- else }} target: type: Utilization averageUtilization: {{ .Values.skipper.autoscaling.targetMemory }} - {{- end }} {{- end }} {{- end }}