fix(argo-cd): Fix server.config.url and slack service account (#1208)

* fix(argo-cd): Set 'server.config.url' to empty string

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* fix(argo-cd): Do not create slack service account

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

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.4.0
+version: 4.4.1
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -21,4 +21,5 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Ability to use external/existing Redis (eg. a managed cloud service)"
+    - "[Fixed]: Set 'server.config.url' to empty string so logout function can calculate the right redirect URL"
+    - "[Fixed]: Do not create slack service account when notifications controller is disabled"

charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml

@@ -1,4 +1,4 @@
-{{ if .Values.notifications.bots.slack.enabled }}
+{{ if and .Values.notifications.enabled .Values.notifications.bots.slack.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:

charts/argo-cd/templates/argocd-notifications/bots/slack/role.yaml

@@ -1,4 +1,4 @@
-{{ if .Values.notifications.bots.slack.enabled }}
+{{ if and .Values.notifications.enabled .Values.notifications.bots.slack.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:

charts/argo-cd/templates/argocd-notifications/bots/slack/rolebinding.yaml

@@ -1,4 +1,4 @@
-{{ if .Values.notifications.bots.slack.enabled }}
+{{ if and .Values.notifications.enabled .Values.notifications.bots.slack.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:

charts/argo-cd/templates/argocd-notifications/bots/slack/service.yaml

@@ -1,4 +1,4 @@
-{{ if .Values.notifications.bots.slack.enabled }}
+{{ if and .Values.notifications.enabled .Values.notifications.bots.slack.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

charts/argo-cd/templates/argocd-notifications/bots/slack/serviceaccount.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.notifications.bots.slack.serviceAccount.create }}
+{{- if and .Values.notifications.enabled .Values.notifications.bots.slack.enabled .Values.notifications.bots.slack.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.notifications.bots.slack.serviceAccount.automountServiceAccountToken }}

charts/argo-cd/values.yaml

@@ -1152,7 +1152,7 @@ server:
   # @default -- See [values.yaml]
   config:
     # Argo CD's externally facing base URL (optional). Required when configuring SSO
-    url: https://argocd.example.com
+    url: ""
     # Argo CD instance label key
     application.instanceLabelKey: argocd.argoproj.io/instance