From 480f446f220b844878cf4c50b9baa4ba6094228d Mon Sep 17 00:00:00 2001 From: Wim Fournier Date: Tue, 23 May 2023 09:31:46 +0200 Subject: [PATCH] remove enabled key Signed-off-by: Wim Fournier --- .../templates/argocd-application-controller/statefulset.yaml | 2 +- .../argo-cd/templates/argocd-applicationset/deployment.yaml | 2 +- charts/argo-cd/templates/argocd-notifications/deployment.yaml | 2 +- charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 4 ++-- charts/argo-cd/templates/argocd-server/deployment.yaml | 4 ++-- charts/argo-cd/templates/dex/deployment.yaml | 4 ++-- charts/argo-cd/templates/redis/deployment.yaml | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml b/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml index 2b63c189..1abda8bb 100644 --- a/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml +++ b/charts/argo-cd/templates/argocd-application-controller/statefulset.yaml @@ -257,7 +257,7 @@ spec: {{- toYaml .Values.controller.resources | nindent 10 }} {{- if .Values.controller.containerSecurityContext.enabled }} securityContext: - {{- toYaml .Values.controller.containerSecurityContext | nindent 10 }} + {{- omit .Values.controller.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- end }} workingDir: /home/argocd volumeMounts: diff --git a/charts/argo-cd/templates/argocd-applicationset/deployment.yaml b/charts/argo-cd/templates/argocd-applicationset/deployment.yaml index ec876b55..09ce6d77 100644 --- a/charts/argo-cd/templates/argocd-applicationset/deployment.yaml +++ b/charts/argo-cd/templates/argocd-applicationset/deployment.yaml @@ -184,7 +184,7 @@ spec: {{- toYaml .Values.applicationSet.resources | nindent 12 }} {{- if .Values.applicationSet.containerSecurityContext.enabled }} securityContext: - {{- toYaml .Values.applicationSet.containerSecurityContext | nindent 12 }} + {{- omit .Values.applicationSet.containerSecurityContext "enabled" | toYaml | nindent 12 }} {{- end }} volumeMounts: {{- with .Values.applicationSet.extraVolumeMounts }} diff --git a/charts/argo-cd/templates/argocd-notifications/deployment.yaml b/charts/argo-cd/templates/argocd-notifications/deployment.yaml index f9d84d88..0fe996b3 100644 --- a/charts/argo-cd/templates/argocd-notifications/deployment.yaml +++ b/charts/argo-cd/templates/argocd-notifications/deployment.yaml @@ -82,7 +82,7 @@ spec: {{- toYaml .Values.notifications.resources | nindent 12 }} {{- if .Values.notifications.containerSecurityContext.enabled }} securityContext: - {{- toYaml .Values.notifications.containerSecurityContext | nindent 12 }} + {{- omit .Values.notifications.containerSecurityContext "enabled" | toYaml | nindent 12 }} {{- end }} workingDir: /app volumeMounts: diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml index cef0a50d..9a307e72 100755 --- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml @@ -275,7 +275,7 @@ spec: {{- toYaml .Values.repoServer.resources | nindent 10 }} {{- if .Values.repoServer.containerSecurityContext.enabled }} securityContext: - {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }} + {{- omit .Values.repoServer.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- end }} {{- with .Values.repoServer.lifecycle }} lifecycle: @@ -300,7 +300,7 @@ spec: {{- if .Values.repoServer.containerSecurityContext.enabled }} {{- with .Values.repoServer.containerSecurityContext }} securityContext: - {{- toYaml . | nindent 10 }} + {{- omit . "enabled" | toYaml | nindent 10 }} {{- end }} {{- end }} volumeMounts: diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index 9e795477..59fed738 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -336,7 +336,7 @@ spec: {{- toYaml .Values.server.resources | nindent 10 }} {{- if .Values.repoServer.containerSecurityContext.enabled }} securityContext: - {{- toYaml .Values.repoServer.containerSecurityContext | nindent 10 }} + {{- omit .Values.repoServer.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- end }} {{- with .Values.server.lifecycle }} lifecycle: @@ -350,7 +350,7 @@ spec: {{- toYaml .Values.server.extensions.resources | nindent 10 }} {{- if .Values.server.extensions.containerSecurityContext.enabled }} securityContext: - {{- toYaml .Values.server.extensions.containerSecurityContext | nindent 10 }} + {{- omit .Values.server.extensions.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- end }} volumeMounts: - name: extensions diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml index aedfa152..2a8597c8 100755 --- a/charts/argo-cd/templates/dex/deployment.yaml +++ b/charts/argo-cd/templates/dex/deployment.yaml @@ -119,7 +119,7 @@ spec: {{- toYaml .Values.dex.resources | nindent 10 }} {{- if .Values.dex.containerSecurityContext.enabled }} securityContext: - {{- toYaml .Values.dex.containerSecurityContext | nindent 10 }} + {{- omit .Values.dex.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- end }} volumeMounts: {{- with .Values.dex.volumeMounts }} @@ -152,7 +152,7 @@ spec: {{- toYaml .Values.dex.resources | nindent 10 }} {{- if .Values.dex.containerSecurityContext.enabled }} securityContext: - {{- toYaml .Values.dex.containerSecurityContext | nindent 10 }} + {{- omit .Values.dex.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- end}} {{- with .Values.dex.initContainers }} {{- tpl (toYaml .) $ | nindent 6 }} diff --git a/charts/argo-cd/templates/redis/deployment.yaml b/charts/argo-cd/templates/redis/deployment.yaml index 26347c8e..cc1a2d1a 100755 --- a/charts/argo-cd/templates/redis/deployment.yaml +++ b/charts/argo-cd/templates/redis/deployment.yaml @@ -77,7 +77,7 @@ spec: {{- toYaml .Values.redis.resources | nindent 10 }} {{- if .Values.redis.containerSecurityContext.enabled }} securityContext: - {{- toYaml .Values.redis.containerSecurityContext | nindent 10 }} + {{- omit .Values.redis.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- end }} {{- with .Values.redis.volumeMounts }} volumeMounts: @@ -103,7 +103,7 @@ spec: {{- toYaml .Values.redis.exporter.resources | nindent 10 }} {{- if .Values.redis.exporter.containerSecurityContext.enabled }} securityContext: - {{- toYaml .Values.redis.exporter.containerSecurityContext | nindent 10 }} + {{- omit .Values.redis.exporter.containerSecurityContext "enabled" | toYaml | nindent 10 }} {{- end }} {{- end }} {{- with .Values.redis.extraContainers }}