From d542b1e426145ad50790364f78c86dbef9df9380 Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Sat, 2 Apr 2022 20:44:48 +0200
Subject: [PATCH] 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                                    | 5 +++--
 .../argocd-notifications/bots/slack/deployment.yaml          | 2 +-
 .../templates/argocd-notifications/bots/slack/role.yaml      | 2 +-
 .../argocd-notifications/bots/slack/rolebinding.yaml         | 2 +-
 .../templates/argocd-notifications/bots/slack/service.yaml   | 2 +-
 .../argocd-notifications/bots/slack/serviceaccount.yaml      | 2 +-
 charts/argo-cd/values.yaml                                   | 2 +-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index c1a6b3ac..7b0020fb 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.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"
diff --git a/charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml b/charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml
index d223a539..0741d2b3 100644
--- a/charts/argo-cd/templates/argocd-notifications/bots/slack/deployment.yaml
+++ b/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:
diff --git a/charts/argo-cd/templates/argocd-notifications/bots/slack/role.yaml b/charts/argo-cd/templates/argocd-notifications/bots/slack/role.yaml
index edc77213..26df5b9c 100644
--- a/charts/argo-cd/templates/argocd-notifications/bots/slack/role.yaml
+++ b/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:
diff --git a/charts/argo-cd/templates/argocd-notifications/bots/slack/rolebinding.yaml b/charts/argo-cd/templates/argocd-notifications/bots/slack/rolebinding.yaml
index 340a8850..80813f5e 100644
--- a/charts/argo-cd/templates/argocd-notifications/bots/slack/rolebinding.yaml
+++ b/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:
diff --git a/charts/argo-cd/templates/argocd-notifications/bots/slack/service.yaml b/charts/argo-cd/templates/argocd-notifications/bots/slack/service.yaml
index 631576f5..5cbbd2b1 100644
--- a/charts/argo-cd/templates/argocd-notifications/bots/slack/service.yaml
+++ b/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:
diff --git a/charts/argo-cd/templates/argocd-notifications/bots/slack/serviceaccount.yaml b/charts/argo-cd/templates/argocd-notifications/bots/slack/serviceaccount.yaml
index c2d54310..bdffa2cf 100644
--- a/charts/argo-cd/templates/argocd-notifications/bots/slack/serviceaccount.yaml
+++ b/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 }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 8a54cf4c..14cdf057 100755
--- a/charts/argo-cd/values.yaml
+++ b/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