From 3c2ca2cdbe4ea6f6a93b7399bbe9fe5d6b5c136d Mon Sep 17 00:00:00 2001 From: Aikawa Date: Tue, 12 Apr 2022 23:28:04 +0900 Subject: [PATCH] chore(argocd): update notification notifiers' comment (#1222) * Revert "feat(argo-cd): Add ability to set Notification Services (#1220)" This reverts commit 7932e5a460890fc116a887db9c53270546dc3e42. Signed-off-by: yu-croco * chore(argocd): update comment to clarify usecase Signed-off-by: yu-croco --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/README.md | 3 +-- .../argo-cd/templates/argocd-notifications/configmap.yaml | 3 --- charts/argo-cd/values.yaml | 8 +------- 4 files changed, 4 insertions(+), 14 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 7dbf4364..a0f22751 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.3.3 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 4.5.2 +version: 4.5.3 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png keywords: @@ -21,4 +21,4 @@ dependencies: condition: redis-ha.enabled annotations: artifacthub.io/changes: | - - "[Feat]: Add ability to set Notification Services" + - "[Changed]: update comment to clarify usecase" diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index a8ef799a..05c0dd5d 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -764,7 +764,7 @@ NAME: my-release | notifications.metrics.serviceMonitor.selector | object | `{}` | Prometheus ServiceMonitor selector | | notifications.name | string | `"notifications-controller"` | Notifications controller name string | | notifications.nodeSelector | object | `{}` | [Node selector] | -| notifications.notifiers | object | See [values.yaml] | Configures notification services | +| notifications.notifiers | object | See [values.yaml] | Configures notification services such as slack, email or custom webhook | | notifications.podAnnotations | object | `{}` | Annotations to be applied to the controller Pods | | notifications.podLabels | object | `{}` | Labels to be applied to the controller Pods | | notifications.resources | object | `{}` | Resource limits and requests for the controller | @@ -776,7 +776,6 @@ NAME: my-release | 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.name | string | `"argocd-notifications-controller"` | The name of the service account to use. | -| notifications.services | object | `{}` | The notification services such as slack, email or custom webhook. This will be stored on `notifications.cm.name` ConfigMap. | | notifications.subscriptions | list | `[]` | Contains centrally managed global application subscriptions | | notifications.templates | object | `{}` | The notification template is used to generate the notification content | | notifications.tolerations | list | `[]` | [Tolerations] for use with node taints | diff --git a/charts/argo-cd/templates/argocd-notifications/configmap.yaml b/charts/argo-cd/templates/argocd-notifications/configmap.yaml index aa129895..df1c9a6c 100644 --- a/charts/argo-cd/templates/argocd-notifications/configmap.yaml +++ b/charts/argo-cd/templates/argocd-notifications/configmap.yaml @@ -24,7 +24,4 @@ data: {{- with .Values.notifications.triggers }} {{- toYaml . | nindent 2 }} {{- end }} - {{- with .Values.notifications.services }} - {{- toYaml . | nindent 2 }} - {{- end }} {{- end }} diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 58fb5dfe..91fdb231 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -2188,7 +2188,7 @@ notifications: # interval: 30s # scrapeTimeout: 10s - # -- Configures notification services + # -- Configures notification services such as slack, email or custom webhook # @default -- See [values.yaml] ## For more information: https://argocd-notifications.readthedocs.io/en/stable/services/overview/ notifiers: {} @@ -2580,9 +2580,3 @@ notifications: # -- [Node selector] nodeSelector: {} - - # -- The notification services such as slack, email or custom webhook. This will be stored on `notifications.cm.name` ConfigMap. - ## For more information: https://argocd-notifications.readthedocs.io/en/stable/services/overview/ - services: {} - # service.slack: | - # token: $slack-token