From 8b28c6a826308dc26fcd0f06f0bdc3daea0387eb Mon Sep 17 00:00:00 2001
From: Hyeonmin Park <hyeonmin.park@kennysoft.kr>
Date: Tue, 2 Aug 2022 19:01:34 +0900
Subject: [PATCH] feat(argo-cd): Add entry and notes for admin.enabled (#1370)

* feat(argo-cd): Add entry and notes for admin.enabled

Signed-off-by: Hyeonmin Park <hyeonmin.park@kennysoft.kr>

* feat(argo-cd): Consider and add comments for server.config.dex.config

Signed-off-by: Hyeonmin Park <hyeonmin.park@kennysoft.kr>
---
 charts/argo-cd/Chart.yaml          |  5 +++--
 charts/argo-cd/templates/NOTES.txt | 10 ++++++++--
 charts/argo-cd/values.yaml         | 18 +++++++++++++++++-
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 0f0aa535..0bf77577 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.4.8
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 4.10.4
+version: 4.10.5
 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: |
-    - "[Changed]: Update to app version 2.4.8"
+    - [Added]: Add entry and notes for admin.enabled
+    - [Added]: Add comments for server.config.dex.config
diff --git a/charts/argo-cd/templates/NOTES.txt b/charts/argo-cd/templates/NOTES.txt
index 34cdaaca..ceb40d66 100644
--- a/charts/argo-cd/templates/NOTES.txt
+++ b/charts/argo-cd/templates/NOTES.txt
@@ -1,6 +1,6 @@
 {{- if or .Values.configs.repositoryCredentials .Values.server.config.repositories }}
-WARNING: You are using configs.repositoryCredentials and/or server.config.repositories parameter that are DEPRECATED
-Instead, use configs.repositoryTemplates and/or configs.repositories parameters
+WARNING: You are using `configs.repositoryCredentials` and/or `server.config.repositories` parameter that are DEPRECATED
+Instead, use `configs.repositoryTemplates` and/or `configs.repositories` parameters
 Read More about here: https://argo-cd.readthedocs.io/en/latest/operator-manual/declarative-setup/#legacy-behaviour
 
 {{- end}}
@@ -15,8 +15,14 @@ In order to access the server UI you have the following options:
       - Add the `--insecure` flag to `server.extraArgs` in the values file and terminate SSL at your ingress: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ingress.md#option-2-multiple-ingress-objects-and-hosts
 
 
+{{ if eq (index .Values.server.config "admin.enabled") "true" -}}
 After reaching the UI the first time you can login with username: admin and the random password generated during the installation. You can find the password by running:
 
 kubectl -n {{ .Release.Namespace }} get secret argocd-initial-admin-secret -o jsonpath="{.data.password}" | base64 -d
 
 (You should delete the initial secret afterwards as suggested by the Getting Started Guide: https://github.com/argoproj/argo-cd/blob/master/docs/getting_started.md#4-login-using-the-cli)
+{{ else if or (index .Values.server.config "dex.config") (index .Values.server.config "oidc.config") -}}
+After reaching the UI the first time you can login using Dex or OIDC.
+{{ else -}}
+After reaching the UI the first time you cannot login with username and password since you've disabled it. You should enable admin back or configure Dex via `server.config.dex.config` or OIDC via `server.config.oidc.config`.
+{{ end -}}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index dfe758a1..4966cc30 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -1213,7 +1213,7 @@ server:
     # Argo CD instance label key
     application.instanceLabelKey: argocd.argoproj.io/instance
 
-    # Enabled logs RBAC enforcement
+    # Enable logs RBAC enforcement
     # Ref: https://argo-cd.readthedocs.io/en/latest/operator-manual/upgrading/2.3-2.4/#enable-logs-rbac-enforcement
     server.rbac.log.enforce.enable: "false"
 
@@ -1234,6 +1234,22 @@ server:
     #     url: https://argoproj.github.io/argo-helm
     #     name: argo
 
+    # admin.enabled indicates whether the admin user is enabled. It is enabled by default.
+    # https://argo-cd.readthedocs.io/en/latest/faq/#how-to-disable-admin-user
+    admin.enabled: "true"
+
+    # dex.config: |
+    #   connectors:
+    #     # GitHub example
+    #     - type: github
+    #       id: github
+    #       name: GitHub
+    #       config:
+    #         clientID: aabbccddeeff00112233
+    #         clientSecret: $dex.github.clientSecret # Alternatively $<some_K8S_secret>:dex.github.clientSecret
+    #         orgs:
+    #         - name: your-github-org
+
     # oidc.config: |
     #   name: AzureAD
     #   issuer: https://login.microsoftonline.com/TENANT_ID/v2.0