From fbea017d59365f0a68e16d1e82a62f484a5929c6 Mon Sep 17 00:00:00 2001 From: bjarneo Date: Fri, 30 Jun 2023 09:00:51 +0200 Subject: [PATCH 1/2] fix: change to the correct property for dex server Signed-off-by: bjarneo --- docs/operator-manual/argocd-cmd-params-cm.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/operator-manual/argocd-cmd-params-cm.yaml b/docs/operator-manual/argocd-cmd-params-cm.yaml index f45b9bf44f548..98ab491ec5b1b 100644 --- a/docs/operator-manual/argocd-cmd-params-cm.yaml +++ b/docs/operator-manual/argocd-cmd-params-cm.yaml @@ -10,7 +10,7 @@ data: repo.server: "argocd-repo-server:8081" # Dex server address (default "http://argocd-dex-server:5556") - dex.server: "http://argocd-dex-server:5556" + server.dex.server: "http://argocd-dex-server:5556" # Redis server hostname and port (e.g. argocd-redis:6379) redis.server: "argocd-redis:6379" @@ -183,4 +183,4 @@ data: # Set the logging level. One of: debug|info|warn|error (default "info") notificationscontroller.log.level: "info" # Set the logging format. One of: text|json (default "text") - notificationscontroller.log.format: "text" \ No newline at end of file + notificationscontroller.log.format: "text" From 78c032dfc63c6cb21953081e1ca63ce4ad0a8395 Mon Sep 17 00:00:00 2001 From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Date: Fri, 30 Jun 2023 09:57:07 -0400 Subject: [PATCH 2/2] Update argocd-cmd-params-cm.yaml Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --- docs/operator-manual/argocd-cmd-params-cm.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/operator-manual/argocd-cmd-params-cm.yaml b/docs/operator-manual/argocd-cmd-params-cm.yaml index 98ab491ec5b1b..6f0cbd518a63a 100644 --- a/docs/operator-manual/argocd-cmd-params-cm.yaml +++ b/docs/operator-manual/argocd-cmd-params-cm.yaml @@ -9,9 +9,6 @@ data: # Repo server address. (default "argocd-repo-server:8081") repo.server: "argocd-repo-server:8081" - # Dex server address (default "http://argocd-dex-server:5556") - server.dex.server: "http://argocd-dex-server:5556" - # Redis server hostname and port (e.g. argocd-redis:6379) redis.server: "argocd-redis:6379" # Enable compression for data sent to Redis with the required compression algorithm. (default 'gzip') @@ -86,6 +83,8 @@ data: server.repo.server.plaintext: "false" # Perform strict validation of TLS certificates when connecting to repo server server.repo.server.strict.tls: "false" + # Dex server address (default "http://argocd-dex-server:5556") + server.dex.server: "http://argocd-dex-server:5556" # Use a plaintext client (non-TLS) to connect to dex server server.dex.server.plaintext: "false" # Perform strict validation of TLS certificates when connecting to dex server