diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index c07899a5..d43a0fda 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -1466,7 +1466,6 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide | notifications.secret.items | object | `{}` | Generic key:value pairs to be inserted into the secret | | notifications.secret.labels | object | `{}` | key:value pairs of labels to be added to the secret | | notifications.secret.name | string | `"argocd-notifications-secret"` | notifications controller Secret name | -| notifications.secret.useExistingSecret | bool | `false` | Whether to use existing secret. If true, assumes that the existing secret name is notifications.secret.name | | notifications.serviceAccount.annotations | object | `{}` | Annotations applied to created service account | | notifications.serviceAccount.automountServiceAccountToken | bool | `true` | Automount API credentials for the Service Account | | notifications.serviceAccount.create | bool | `true` | Create notifications controller service account | diff --git a/charts/argo-cd/templates/argocd-configs/argocd-notifications-secret.yaml b/charts/argo-cd/templates/argocd-configs/argocd-notifications-secret.yaml index 3d5543dd..9c261c6a 100644 --- a/charts/argo-cd/templates/argocd-configs/argocd-notifications-secret.yaml +++ b/charts/argo-cd/templates/argocd-configs/argocd-notifications-secret.yaml @@ -1,4 +1,4 @@ -{{- if and (not .Values.notifications.secret.useExistingSecret) .Values.notifications.enabled .Values.notifications.secret.create }} +{{- if and .Values.notifications.enabled .Values.notifications.secret.create }} apiVersion: v1 kind: Secret metadata: diff --git a/charts/argo-cd/templates/argocd-notifications/clusterrole.yaml b/charts/argo-cd/templates/argocd-notifications/clusterrole.yaml index 292ac303..edb957f3 100644 --- a/charts/argo-cd/templates/argocd-notifications/clusterrole.yaml +++ b/charts/argo-cd/templates/argocd-notifications/clusterrole.yaml @@ -38,7 +38,6 @@ rules: verbs: - get {{- end }} - {{- if or .Values.notifications.secret.create .Values.notifications.secret.useExistingSecret }} - apiGroups: - "" resourceNames: @@ -47,5 +46,4 @@ rules: - secrets verbs: - get - {{- end }} {{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index df65d163..a281d019 100644 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -3017,14 +3017,12 @@ notifications: secret: # -- Whether helm chart creates notifications controller secret + ## If true, will create a secret with the name below. Otherwise, will assume existence of a secret with that name. create: true # -- notifications controller Secret name name: "argocd-notifications-secret" - # -- Whether to use existing secret. If true, assumes that the existing secret name is notifications.secret.name - useExistingSecret: false - # -- key:value pairs of annotations to be added to the secret annotations: {}