From 81eeb64efc5548ed46b369612b23abe401644670 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 17:48:57 +0200 Subject: [PATCH] [bitnami/argo-cd] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references (#33337) --- bitnami/argo-cd/CHANGELOG.md | 8 ++++++-- bitnami/argo-cd/Chart.lock | 8 ++++---- bitnami/argo-cd/Chart.yaml | 2 +- .../argo-cd/templates/applicationset/ingress-webhook.yaml | 6 +----- bitnami/argo-cd/templates/repo-server/hpa.yaml | 8 -------- bitnami/argo-cd/templates/server/hpa.yaml | 8 -------- bitnami/argo-cd/templates/server/ingress-grcp.yaml | 6 +----- bitnami/argo-cd/templates/server/ingress.yaml | 6 +----- 8 files changed, 14 insertions(+), 38 deletions(-) diff --git a/bitnami/argo-cd/CHANGELOG.md b/bitnami/argo-cd/CHANGELOG.md index 6890ab5bdb..ac574fc96f 100644 --- a/bitnami/argo-cd/CHANGELOG.md +++ b/bitnami/argo-cd/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 7.3.6 (2025-04-22) +## 7.3.7 (2025-05-06) -* [bitnami/argo-cd] Release 7.3.6 ([#33128](https://github.com/bitnami/charts/pull/33128)) +* [bitnami/argo-cd] chore: :recycle: :arrow_up: Update common and remove k8s < 1.23 references ([#33337](https://github.com/bitnami/charts/pull/33337)) + +## 7.3.6 (2025-04-22) + +* [bitnami/argo-cd] Release 7.3.6 (#33128) ([5468fc3](https://github.com/bitnami/charts/commit/5468fc3144ea9ccc2733c21b030cf5c0c11474ef)), closes [#33128](https://github.com/bitnami/charts/issues/33128) ## 7.3.5 (2025-04-09) diff --git a/bitnami/argo-cd/Chart.lock b/bitnami/argo-cd/Chart.lock index 74f46ccf9e..7f18fd5033 100644 --- a/bitnami/argo-cd/Chart.lock +++ b/bitnami/argo-cd/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: redis repository: oci://registry-1.docker.io/bitnamicharts - version: 20.13.0 + version: 20.13.4 - name: common repository: oci://registry-1.docker.io/bitnamicharts - version: 2.30.0 -digest: sha256:bc64425106f9a9228486b0ffd5fecdb140f2377a8bf253d4ce8dd4cd63f27609 -generated: "2025-04-22T17:17:27.672387804Z" + version: 2.31.0 +digest: sha256:f66e36628e6e3cd92e6f5ecd95854e5e3f8679a19f6e6176a912baa5ef5d2981 +generated: "2025-05-06T09:52:22.799690884+02:00" diff --git a/bitnami/argo-cd/Chart.yaml b/bitnami/argo-cd/Chart.yaml index 501588567a..18afb88a63 100644 --- a/bitnami/argo-cd/Chart.yaml +++ b/bitnami/argo-cd/Chart.yaml @@ -40,4 +40,4 @@ maintainers: name: argo-cd sources: - https://github.com/bitnami/charts/tree/main/bitnami/argo-cd -version: 7.3.6 +version: 7.3.7 diff --git a/bitnami/argo-cd/templates/applicationset/ingress-webhook.yaml b/bitnami/argo-cd/templates/applicationset/ingress-webhook.yaml index 27a358eb4e..d028371308 100644 --- a/bitnami/argo-cd/templates/applicationset/ingress-webhook.yaml +++ b/bitnami/argo-cd/templates/applicationset/ingress-webhook.yaml @@ -23,7 +23,7 @@ metadata: {{- end }} {{- end }} spec: - {{- if and .Values.applicationSet.webhook.ingress.ingressClassName (eq "true" (include "common.webhook.ingress.supportsIngressClassname" .)) }} + {{- if .Values.applicationSet.webhook.ingress.ingressClassName }} ingressClassName: {{ .Values.applicationSet.webhook.ingress.ingressClassName | quote }} {{- end }} rules: @@ -35,9 +35,7 @@ spec: {{- toYaml .Values.applicationSet.webhook.ingress.extraPaths | nindent 10 }} {{- end }} - path: {{ .Values.applicationSet.webhook.ingress.path }} - {{- if eq "true" (include "common.ingress.supportsPathType" .) }} pathType: {{ .Values.applicationSet.webhook.ingress.pathType }} - {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "argocd.server" .) "servicePort" (ternary "https" "http" .Values.applicationSet.webhook.ingress.tls) "context" $) | nindent 14 }} {{- end }} {{- range .Values.applicationSet.webhook.ingress.extraHosts }} @@ -45,9 +43,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" (include "argocd.server" $) "servicePort" (ternary "https" "http" $.Values.applicationSet.webhook.ingress.tls) "context" $) | nindent 14 }} {{- end }} tls: diff --git a/bitnami/argo-cd/templates/repo-server/hpa.yaml b/bitnami/argo-cd/templates/repo-server/hpa.yaml index 3a3606e0b4..7463e704bf 100644 --- a/bitnami/argo-cd/templates/repo-server/hpa.yaml +++ b/bitnami/argo-cd/templates/repo-server/hpa.yaml @@ -26,24 +26,16 @@ spec: - type: Resource resource: name: cpu - {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} - targetAverageUtilization: {{ .Values.repoServer.autoscaling.targetCPU }} - {{- else }} target: type: Utilization averageUtilization: {{ .Values.repoServer.autoscaling.targetCPU }} - {{- end }} {{- end }} {{- if .Values.repoServer.autoscaling.targetMemory }} - type: Resource resource: name: memory - {{- if semverCompare "<1.23-0" (include "common.capabilities.kubeVersion" .) }} - targetAverageUtilization: {{ .Values.repoServer.autoscaling.targetMemory }} - {{- else }} target: type: Utilization averageUtilization: {{ .Values.repoServer.autoscaling.targetMemory }} - {{- end }} {{- end }} {{- end }} diff --git a/bitnami/argo-cd/templates/server/hpa.yaml b/bitnami/argo-cd/templates/server/hpa.yaml index e26e31c2de..f09dae12e6 100644 --- a/bitnami/argo-cd/templates/server/hpa.yaml +++ b/bitnami/argo-cd/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/argo-cd/templates/server/ingress-grcp.yaml b/bitnami/argo-cd/templates/server/ingress-grcp.yaml index c9a2802715..1d6701ba99 100644 --- a/bitnami/argo-cd/templates/server/ingress-grcp.yaml +++ b/bitnami/argo-cd/templates/server/ingress-grcp.yaml @@ -22,7 +22,7 @@ metadata: {{- end }} {{- end }} spec: - {{- if and .Values.server.ingressGrpc.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }} + {{- if .Values.server.ingressGrpc.ingressClassName }} ingressClassName: {{ .Values.server.ingressGrpc.ingressClassName | quote }} {{- end }} rules: @@ -34,9 +34,7 @@ spec: {{- toYaml .Values.server.ingressGrpc.extraPaths | nindent 10 }} {{- end }} - path: {{ .Values.server.ingressGrpc.path }} - {{- if eq "true" (include "common.ingress.supportsPathType" .) }} pathType: {{ .Values.server.ingressGrpc.pathType }} - {{- end }} backend: {{- include "common.ingress.backend" (dict "serviceName" (include "argocd.server" .) "servicePort" (ternary "https" "http" .Values.server.ingressGrpc.tls) "context" $) | nindent 14 }} {{- end }} {{- range .Values.server.ingressGrpc.extraHosts }} @@ -44,9 +42,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" (include "argocd.server" $) "servicePort" (ternary "https" "http" $.Values.server.ingressGrpc.tls) "context" $) | nindent 14 }} {{- end }} {{- if .Values.server.ingressGrpc.extraRules }} diff --git a/bitnami/argo-cd/templates/server/ingress.yaml b/bitnami/argo-cd/templates/server/ingress.yaml index 3eeb44bdab..d57959398f 100644 --- a/bitnami/argo-cd/templates/server/ingress.yaml +++ b/bitnami/argo-cd/templates/server/ingress.yaml @@ -22,7 +22,7 @@ metadata: {{- end }} {{- 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: @@ -34,9 +34,7 @@ spec: {{- toYaml .Values.server.ingress.extraPaths | nindent 10 }} {{- end }} - 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" (include "argocd.server" .) "servicePort" (ternary "https" "http" .Values.server.ingress.tls) "context" $) | nindent 14 }} {{- end }} {{- range .Values.server.ingress.extraHosts }} @@ -44,9 +42,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" (include "argocd.server" $) "servicePort" (ternary "https" "http" $.Values.server.ingress.tls) "context" $) | nindent 14 }} {{- end }} {{- if .Values.server.ingress.extraRules }}