Merge pull request 'Weekly Helm Update' (#319) from 20240731_MjgxNjgK…

… into master Reviewed-on: https://gitea.obmondo.com/EnableIT/KubeAid/pulls/319
Obmondo · Aug 1, 2024 · 1ddcd2a · 1ddcd2a
2 parents fd1cc33 + 9983e99
commit 1ddcd2a
Show file tree

Hide file tree

Showing 306 changed files with 10,058 additions and 3,455 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,32 @@
+# Helm Charts Changelog
+
+All releases and the changes included in them (pulled from git commits added since last release) will be detailed in this file.
+
+
+## 20240731
+- Updated: argo-cd from version 7.3.4 to 7.3.11
+- Updated: aws-ebs-csi-driver from version 2.32.0 to 2.33.0
+- Updated: aws-efs-csi-driver from version 3.0.6 to 3.0.7
+- Updated: cert-manager from version v1.15.1 to v1.15.2
+- Updated: cilium from version 1.15.6 to 1.16.0
+- Updated: cloudnative-pg from version 0.21.5 to 0.21.6
+- Updated: dokuwiki from version 16.2.6 to 16.2.10
+- Updated: external-dns from version 8.1.0 to 8.3.3
+- Updated: fluent-bit from version 0.46.11 to 0.47.5
+- Updated: gitlab-runner from version 0.66.0 to 0.67.1
+- Updated: matomo from version 7.3.7 to 8.0.5
+- Updated: mattermost-team-edition from version 6.6.58 to 6.6.60
+- Updated: metallb from version 6.3.7 to 6.3.9
+- Updated: oncall from version 1.8.1 to 1.8.8
+- Updated: opencost from version 1.40.0 to 1.41.0
+- Updated: opensearch-dashboards from version 2.19.0 to 2.19.1
+- Updated: rabbitmq-cluster-operator from version 4.3.13 to 4.3.16
+- Updated: redmine from version 28.2.7 to 29.0.3
+- Updated: reloader from version 1.0.116 to 1.0.119
+- Updated: rook-ceph from version v1.14.8 to v1.14.9
+- Updated: rook-ceph-cluster from version v1.14.4 to v1.14.9
+- Updated: sealed-secrets from version 2.16.0 to 2.16.1
+- Updated: sonarqube from version 10.6.0+3033 to 10.6.1+3163
+- Updated: tigera-operator from version v3.28.0 to v3.28.1
+- Updated: traefik from version 29.0.0 to 30.0.2
+- Updated: velero from version 7.1.0 to 7.1.4
diff --git a/argocd-helm-charts/argo-cd/Chart.yaml b/argocd-helm-charts/argo-cd/Chart.yaml
@@ -7,5 +7,5 @@ dependencies:
     # 2.3v argocd failes with remote value files
     # 3.35.4v helm chart fails also with bad path of the values files (this is the last release for 2.2.x argocd)
     # please stick to 3.29.5, why ? cause its a tested and the last working helm chart version
-    version: "7.3.4"
+    version: "7.3.11"
     repository: https://argoproj.github.io/argo-helm
diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/Chart.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/Chart.yaml
@@ -1,12 +1,12 @@
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: Bump argo-cd to v2.11.4
+      description: Bump argo-cd to v2.11.7
   artifacthub.io/signKey: |
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
 apiVersion: v2
-appVersion: v2.11.4
+appVersion: v2.11.7
 dependencies:
 - condition: redis-ha.enabled
   name: redis-ha
@@ -28,4 +28,4 @@ name: argo-cd
 sources:
 - https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd
 - https://github.com/argoproj/argo-cd
-version: 7.3.4
+version: 7.3.11
diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/README.md b/argocd-helm-charts/argo-cd/charts/argo-cd/README.md
@@ -278,6 +278,31 @@ For full list of changes please check ArtifactHub [changelog].
 
 Highlighted versions provide information about additional steps that should be performed by user when upgrading to newer version.
 
+### 7.0.0
+
+We changed the type of `.Values.configs.clusterCredentials` from `list` to `object`.
+If you used the value, please migrate like below.
+
+```yaml
+# before
+configs:
+  clusterCredentials:
+    - mycluster:
+      server: https://mycluster.example.com
+      labels: {}
+      annotations: {}
+      # ...
+
+# after
+configs:
+  clusterCredentials:
+    mycluster:
+      server: https://mycluster.example.com
+      labels: {}
+      annotations: {}
+      # ...
+```
+
 ### 6.10.0
 
 This version introduces authentication for Redis to mitigate GHSA-9766-5277-j5hr.

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/NOTES.txt b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/NOTES.txt
@@ -1,6 +1,6 @@
 In order to access the server UI you have the following options:
 
-1. kubectl port-forward service/{{ include "argo-cd.fullname" . }}-server -n {{ .Release.Namespace }} 8080:443
+1. kubectl port-forward service/{{ include "argo-cd.fullname" . }}-server -n {{ include  "argo-cd.namespace" . }} 8080:443
 
     and then open the browser on http://localhost:8080 and accept the certificate
 
@@ -12,7 +12,7 @@ In order to access the server UI you have the following options:
 {{ if eq (toString (index .Values.configs.cm "admin.enabled")) "true" -}}
 After reaching the UI the first time you can login with username: admin and the random password generated during the installation. You can find the password by running:
 
-kubectl -n {{ .Release.Namespace }} get secret argocd-initial-admin-secret -o jsonpath="{.data.password}" | base64 -d
+kubectl -n {{ include  "argo-cd.namespace" . }} get secret argocd-initial-admin-secret -o jsonpath="{.data.password}" | base64 -d
 
 (You should delete the initial secret afterwards as suggested by the Getting Started Guide: https://argo-cd.readthedocs.io/en/stable/getting_started/#4-login-using-the-cli)
 {{ else if or (index .Values.configs.cm "dex.config") (index .Values.configs.cm "oidc.config") -}}

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/_helpers.tpl b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/_helpers.tpl
@@ -99,7 +99,7 @@ Create the name of the Redis secret-init service account to use
 */}}
 {{- define "argo-cd.redisSecretInit.serviceAccountName" -}}
 {{- if .Values.redisSecretInit.serviceAccount.create -}}
-    {{ default (include "argo-cd.redisSecretInit.fullname" .) .Values.redis.serviceAccount.name }}
+    {{ default (include "argo-cd.redisSecretInit.fullname" .) .Values.redisSecretInit.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.redisSecretInit.serviceAccount.name }}
 {{- end -}}

diff --git a/...elm-charts/argo-cd/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/...elm-charts/argo-cd/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -208,10 +208,22 @@ spec:
                 name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
                 {{- if .Values.externalRedis.host }}
                 key: redis-password
-                optional: true
                 {{- else }}
                 key: auth
                 {{- end }}
+                optional: true
+          - name: REDIS_SENTINEL_USERNAME
+            valueFrom:
+              secretKeyRef:
+                name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
+                key: redis-sentinel-username
+                optional: true
+          - name: REDIS_SENTINEL_PASSWORD
+            valueFrom:
+              secretKeyRef:
+                name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
+                key: redis-sentinel-password
+                optional: true
           - name: ARGOCD_DEFAULT_CACHE_EXPIRATION
             valueFrom:
               configMapKeyRef:

diff --git a/...charts/argo-cd/charts/argo-cd/templates/argocd-application-controller/prometheusrule.yaml b/...charts/argo-cd/charts/argo-cd/templates/argocd-application-controller/prometheusrule.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
   name: {{ template "argo-cd.controller.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.controller.metrics.rules.namespace | quote }}
+  namespace: {{ default (include  "argo-cd.namespace" .) .Values.controller.metrics.rules.namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
     {{- if .Values.controller.metrics.rules.selector }}

diff --git a/...charts/argo-cd/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml b/...charts/argo-cd/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "argo-cd.controller.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.controller.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include  "argo-cd.namespace" .) .Values.controller.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
     {{- with .Values.controller.metrics.serviceMonitor.selector }}

diff --git a/...lm-charts/argo-cd/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml b/...lm-charts/argo-cd/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml
@@ -205,12 +205,12 @@ spec:
             valueFrom:
               secretKeyRef:
                 name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
-                optional: true
                 {{- if .Values.externalRedis.host }}
                 key: redis-password
                 {{- else }}
                 key: auth
                 {{- end }}
+                optional: true
           - name: REDIS_SENTINEL_USERNAME
             valueFrom:
               secretKeyRef:

diff --git a/...cd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-applicationset/servicemonitor.yaml b/...cd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-applicationset/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "argo-cd.applicationSet.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.applicationSet.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include  "argo-cd.namespace" .) .Values.applicationSet.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.applicationSet.name "name" .Values.applicationSet.name) | nindent 4 }}
     {{- with .Values.applicationSet.metrics.serviceMonitor.selector }}

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-configs/cluster-secrets.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "argo-cd.name" $ }}-cluster-{{ $cluster_key }}
-  namespace: {{ $.Release.Namespace | quote }}
+  namespace: {{ include  "argo-cd.namespace" $ | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}
     {{- with $cluster_value.labels }}

diff --git a/...charts/argo-cd/charts/argo-cd/templates/argocd-configs/repository-credentials-secret.yaml b/...charts/argo-cd/charts/argo-cd/templates/argocd-configs/repository-credentials-secret.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: argocd-repo-creds-{{ $repo_cred_key }}
-  namespace: {{ $.Release.Namespace | quote }}
+  namespace: {{ include  "argo-cd.namespace" $ | quote }}
   labels:
     argocd.argoproj.io/secret-type: repo-creds
     {{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-configs/repository-secret.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-configs/repository-secret.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: argocd-repo-{{ $repo_key }}
-  namespace: {{ $.Release.Namespace | quote }}
+  namespace: {{ include  "argo-cd.namespace" $ | quote }}
   labels:
     argocd.argoproj.io/secret-type: repository
     {{- include "argo-cd.labels" (dict "context" $) | nindent 4 }}

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-notifications/servicemonitor.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-notifications/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "argo-cd.notifications.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.notifications.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include  "argo-cd.namespace" .) .Values.notifications.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" .Values.notifications.name) | nindent 4 }}
     {{- with .Values.notifications.metrics.serviceMonitor.selector }}

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "argo-cd.repoServer.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.repoServer.metrics.serviceMonitor.namespace | default }}
+  namespace: {{ default (include  "argo-cd.namespace" .) .Values.repoServer.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
     {{- with .Values.repoServer.metrics.serviceMonitor.selector }}

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-server/servicemonitor.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "argo-cd.server.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.server.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include  "argo-cd.namespace" .) .Values.server.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
     {{- with .Values.server.metrics.serviceMonitor.selector }}

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/dex/servicemonitor.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/dex/servicemonitor.yaml
@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "argo-cd.dex.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.dex.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include  "argo-cd.namespace" .) .Values.dex.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.dex.name "name" .Values.dex.name) | nindent 4 }}
     {{- with .Values.dex.metrics.serviceMonitor.selector }}

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/redis-secret-init/job.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/redis-secret-init/job.yaml
@@ -3,7 +3,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ include "argo-cd.redisSecretInit.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include  "argo-cd.namespace" . | quote }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/redis-secret-init/role.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/redis-secret-init/role.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.redisSecretInit.name "name" .Values.redisSecretInit.name) | nindent 4 }}
   name: {{ include "argo-cd.redisSecretInit.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include  "argo-cd.namespace" . | quote }}
 rules:
   - apiGroups:
       - ""

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/redis-secret-init/rolebinding.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/redis-secret-init/rolebinding.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.redisSecretInit.name "name" .Values.redisSecretInit.name) | nindent 4 }}
   name: {{ include "argo-cd.redisSecretInit.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include  "argo-cd.namespace" . | quote }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/redis-secret-init/serviceaccount.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/redis-secret-init/serviceaccount.yaml
@@ -1,10 +1,10 @@
-{{- if and .Values.redisSecretInit.enabled (not .Values.externalRedis.host) }}
+{{- if and .Values.redisSecretInit.enabled .Values.redisSecretInit.serviceAccount.create (not .Values.externalRedis.host) }}
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.redisSecretInit.serviceAccount.automountServiceAccountToken }}
 metadata:
   name: {{ include "argo-cd.redisSecretInit.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include  "argo-cd.namespace" . | quote }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-delete-policy": before-hook-creation

diff --git a/argocd-helm-charts/argo-cd/charts/argo-cd/templates/redis/servicemonitor.yaml b/argocd-helm-charts/argo-cd/charts/argo-cd/templates/redis/servicemonitor.yaml
@@ -4,7 +4,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "argo-cd.redis.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.redis.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include  "argo-cd.namespace" .) .Values.redis.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.redis.name "name" .Values.redis.name) | nindent 4 }}
     {{- with .Values.redis.metrics.serviceMonitor.selector }}

diff --git a/argocd-helm-charts/argo-cd/requirements.lock b/argocd-helm-charts/argo-cd/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: argo-cd
   repository: https://argoproj.github.io/argo-helm
-  version: 7.3.4
-digest: sha256:233414ae5809fc82127c2fb3d105a91ea0c6dae54985ce9581e8bf913a4ea925
-generated: "2024-07-09T02:54:19.015770931+05:30"
+  version: 7.3.11
+digest: sha256:50201611354d2274d3685d1fd6ac9391cbbe3853626a68d232ddb89fee1e2610
+generated: "2024-07-31T20:36:24.494739235+05:30"
diff --git a/argocd-helm-charts/aws-ebs-csi-driver/Chart.lock b/argocd-helm-charts/aws-ebs-csi-driver/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: aws-ebs-csi-driver
   repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
-  version: 2.32.0
-digest: sha256:2f8dec72efd33661312c3fbc1f6d8a1f65e529991d95c1ae194a281ad55fd270
-generated: "2024-07-09T02:53:15.918149377+05:30"
+  version: 2.33.0
+digest: sha256:6993db6d49a6f2e79f067f49c96375e650a343fa61732eb8c29226d2fbce2dec
+generated: "2024-07-31T20:37:04.632039601+05:30"
diff --git a/argocd-helm-charts/aws-ebs-csi-driver/Chart.yaml b/argocd-helm-charts/aws-ebs-csi-driver/Chart.yaml
@@ -3,5 +3,5 @@ name: aws-ebs-csi-driver
 version: 1.0.0
 dependencies:
   - name: aws-ebs-csi-driver
-    version: 2.32.0
+    version: 2.33.0
     repository: https://kubernetes-sigs.github.io/aws-ebs-csi-driver
diff --git a/argocd-helm-charts/aws-ebs-csi-driver/charts/aws-ebs-csi-driver/CHANGELOG.md b/argocd-helm-charts/aws-ebs-csi-driver/charts/aws-ebs-csi-driver/CHANGELOG.md
@@ -1,4 +1,10 @@
 # Helm chart
+## v2.33.0
+* Bump driver version to `v1.33.0`
+* Bump CSI sidecar container versions
+* Add fix for enableLinux node parameter ([#2078](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/2078), [@ElijahQuinones](https://github.com/ElijahQuinones))
+* Fix dnsConfig indentation in controller template file ([#2084](https://github.com/kubernetes-sigs/aws-ebs-csi-driver/pull/2084), [@cHiv0rz](https://github.com/cHiv0rz))
+
 ## v2.32.0
 * Bump driver version to `v1.32.0`
 * Bump CSI sidecar container versions

diff --git a/argocd-helm-charts/aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml b/argocd-helm-charts/aws-ebs-csi-driver/charts/aws-ebs-csi-driver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.32.0
+appVersion: 1.33.0
 description: A Helm chart for AWS EBS CSI Driver
 home: https://github.com/kubernetes-sigs/aws-ebs-csi-driver
 keywords:
@@ -13,4 +13,4 @@ maintainers:
 name: aws-ebs-csi-driver
 sources:
 - https://github.com/kubernetes-sigs/aws-ebs-csi-driver
-version: 2.32.0
+version: 2.33.0
diff --git a/argocd-helm-charts/aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/_node.tpl b/argocd-helm-charts/aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/_node.tpl
@@ -1,5 +1,5 @@
 {{- define "node" }}
-{{- if or (eq (default true .Values.node.enableLinux) true) }}
+{{- if .Values.node.enableLinux }}
 ---
 kind: DaemonSet
 apiVersion: apps/v1

diff --git a/argocd-helm-charts/aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/controller.yaml b/argocd-helm-charts/aws-ebs-csi-driver/charts/aws-ebs-csi-driver/templates/controller.yaml
@@ -513,7 +513,7 @@ spec:
         {{- with .Values.controller.volumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-  {{- if .Values.controller.dnsConfig }}
-  dnsConfig:
-    {{- toYaml .Values.controller.dnsConfig | nindent 4 }}
-  {{- end }}
+      {{- if .Values.controller.dnsConfig }}
+      dnsConfig:
+        {{- toYaml .Values.controller.dnsConfig | nindent 8 }}
+      {{- end }}