diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index fb6952c1..28e09add 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.4.14 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 5.5.15 +version: 5.5.16 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -22,4 +22,5 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Added]: Make labels for repoServer and notification service accounts configurable" + - "[Fixed]: Notification controller strategy must be always Recreate" + - "[Removed]: Notification controller securityContext in favor of global.securityContext" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 3439300e..1d83e566 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -981,7 +981,6 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide | notifications.secret.annotations | object | `{}` | key:value pairs of annotations to be added to the secret | | notifications.secret.create | bool | `true` | Whether helm chart creates controller secret | | notifications.secret.items | object | `{}` | Generic key:value pairs to be inserted into the secret | -| notifications.securityContext | object | `{"runAsNonRoot":true}` | Pod Security Context | | notifications.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | | notifications.serviceAccount.create | bool | `true` | Specifies whether a service account should be created | | notifications.serviceAccount.labels | object | `{}` | Labels applied to created service account | @@ -990,7 +989,6 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide | notifications.templates | object | `{}` | The notification template is used to generate the notification content | | notifications.tolerations | list | `[]` | [Tolerations] for use with node taints | | notifications.triggers | object | `{}` | The trigger defines the condition when the notification should be sent | -| notifications.updateStrategy | object | `{"type":"Recreate"}` | The deployment strategy to use to replace existing pods with new ones | ### Using AWS ALB Ingress Controller With GRPC diff --git a/charts/argo-cd/templates/argocd-notifications/deployment.yaml b/charts/argo-cd/templates/argocd-notifications/deployment.yaml index a1eab679..40c3e076 100644 --- a/charts/argo-cd/templates/argocd-notifications/deployment.yaml +++ b/charts/argo-cd/templates/argocd-notifications/deployment.yaml @@ -2,12 +2,12 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: {{ template "argo-cd.notifications.fullname" . }} + name: {{ include "argo-cd.notifications.fullname" . }} labels: {{- include "argo-cd.labels" (dict "context" . "component" .Values.notifications.name "name" .Values.notifications.name) | nindent 4 }} spec: strategy: - {{- .Values.notifications.updateStrategy | toYaml | nindent 4 }} + type: Recreate selector: matchLabels: {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }} @@ -25,12 +25,15 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} spec: - {{- with .Values.notifications.imagePullSecrets | default .Values.global.imagePullSecrets }} + {{- with .Values.notifications.imagePullSecrets | default .Values.global.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} - {{- end }} + {{- end }} + {{- with .Values.global.securityContext }} + securityContext: + {{- toYaml . | nindent 8 }} + {{- end }} serviceAccountName: {{ include "argo-cd.notificationsServiceAccountName" . }} - securityContext: {{- toYaml (mergeOverwrite (deepCopy .Values.global.securityContext) .Values.notifications.securityContext) | nindent 8 }} containers: - name: {{ .Values.notifications.name }} image: {{ default .Values.global.image.repository .Values.notifications.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.notifications.image.tag }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index a3f90e7c..7e21a545 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -2231,10 +2231,6 @@ notifications: # -- [Node selector] nodeSelector: {} - # -- The deployment strategy to use to replace existing pods with new ones - updateStrategy: - type: Recreate - # -- Define user-defined context ## For more information: https://argocd-notifications.readthedocs.io/en/stable/templates/#defining-user-defined-context context: {} @@ -2336,10 +2332,6 @@ notifications: # -- Labels to be applied to the controller Pods podLabels: {} - # -- Pod Security Context - securityContext: - runAsNonRoot: true - # -- Container Security Context containerSecurityContext: {}