From dd417264096a34a31e8a65454df30d3ceaf84dd5 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 10 Nov 2025 19:28:12 +0300 Subject: [PATCH 1/5] feat: set fullnameoverride for argocd --- charts/gitops-runtime/tests/argo-api-gateway_test.yaml | 4 ++-- charts/gitops-runtime/tests/event-reporters_test.yaml | 4 ++-- charts/gitops-runtime/values.yaml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/gitops-runtime/tests/argo-api-gateway_test.yaml b/charts/gitops-runtime/tests/argo-api-gateway_test.yaml index d6a06e73..1f02ef8b 100644 --- a/charts/gitops-runtime/tests/argo-api-gateway_test.yaml +++ b/charts/gitops-runtime/tests/argo-api-gateway_test.yaml @@ -10,13 +10,13 @@ tests: asserts: - equal: path: data["argocd.server"] - value: argocd-server:80 + value: argo-cd-server:80 - equal: path: data["redis.server"] value: runtime-redis:6379 - equal: path: data["repo.server"] - value: argocd-repo-server:8081 + value: argo-cd-repo-server:8081 - it: Argo Api Gateway Deployment should have valid matchLabel selectors template: argo-gateway/deployment.yaml diff --git a/charts/gitops-runtime/tests/event-reporters_test.yaml b/charts/gitops-runtime/tests/event-reporters_test.yaml index f9b3c91f..c86c5526 100644 --- a/charts/gitops-runtime/tests/event-reporters_test.yaml +++ b/charts/gitops-runtime/tests/event-reporters_test.yaml @@ -37,13 +37,13 @@ tests: asserts: - equal: path: data["argocd.server"] - value: argocd-server:80 + value: argo-cd-server:80 - equal: path: data["redis.server"] value: runtime-redis:6379 - equal: path: data["repo.server"] - value: argocd-repo-server:8081 + value: argo-cd-repo-server:8081 - it: Runtime Reporter ConfigMap should have valid redis-ha url template: event-reporters/runtime-event-reporter/configmap.yaml diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 0bf3291f..bba55403 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -94,7 +94,7 @@ global: password: "" # -- ArgoCD password referenced by an existing secret passwordSecretKeyRef: - name: argocd-initial-admin-secret + name: argo-cd-initial-admin-secret key: password # If `auth.type=token` is set # -- ArgoCD token in plain text @@ -106,7 +106,7 @@ global: # name: argocd-token # key: token # -- Service name of the ArgoCD server - svc: argocd-server + svc: argo-cd-server # -- Port of the ArgoCD server port: 80 # -- Set if Argo CD is running behind reverse proxy under subpath different from / @@ -115,7 +115,7 @@ global: rootpath: '' repoServer: # -- Service name of the ArgoCD repo server - svc: argocd-repo-server + svc: argo-cd-repo-server # -- Port of the ArgoCD repo server port: 8081 # -- Configuration for external Argo Rollouts @@ -264,7 +264,7 @@ sealed-secrets: #----------------------------------------------------------------------------------------------------------------------- argo-cd: enabled: true - fullnameOverride: argocd + fullnameOverride: argo-cd notifications: enabled: false redis: From e5bbb2bde5a0de092d13e40e8ce718993d0d0566 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 10 Nov 2025 19:36:18 +0300 Subject: [PATCH 2/5] Revert "feat: set fullnameoverride for argocd" This reverts commit 771870dd0702272a389dd161957dedbbd7cc045d. --- charts/gitops-runtime/tests/argo-api-gateway_test.yaml | 4 ++-- charts/gitops-runtime/tests/event-reporters_test.yaml | 4 ++-- charts/gitops-runtime/values.yaml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/gitops-runtime/tests/argo-api-gateway_test.yaml b/charts/gitops-runtime/tests/argo-api-gateway_test.yaml index 1f02ef8b..d6a06e73 100644 --- a/charts/gitops-runtime/tests/argo-api-gateway_test.yaml +++ b/charts/gitops-runtime/tests/argo-api-gateway_test.yaml @@ -10,13 +10,13 @@ tests: asserts: - equal: path: data["argocd.server"] - value: argo-cd-server:80 + value: argocd-server:80 - equal: path: data["redis.server"] value: runtime-redis:6379 - equal: path: data["repo.server"] - value: argo-cd-repo-server:8081 + value: argocd-repo-server:8081 - it: Argo Api Gateway Deployment should have valid matchLabel selectors template: argo-gateway/deployment.yaml diff --git a/charts/gitops-runtime/tests/event-reporters_test.yaml b/charts/gitops-runtime/tests/event-reporters_test.yaml index c86c5526..f9b3c91f 100644 --- a/charts/gitops-runtime/tests/event-reporters_test.yaml +++ b/charts/gitops-runtime/tests/event-reporters_test.yaml @@ -37,13 +37,13 @@ tests: asserts: - equal: path: data["argocd.server"] - value: argo-cd-server:80 + value: argocd-server:80 - equal: path: data["redis.server"] value: runtime-redis:6379 - equal: path: data["repo.server"] - value: argo-cd-repo-server:8081 + value: argocd-repo-server:8081 - it: Runtime Reporter ConfigMap should have valid redis-ha url template: event-reporters/runtime-event-reporter/configmap.yaml diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index bba55403..0bf3291f 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -94,7 +94,7 @@ global: password: "" # -- ArgoCD password referenced by an existing secret passwordSecretKeyRef: - name: argo-cd-initial-admin-secret + name: argocd-initial-admin-secret key: password # If `auth.type=token` is set # -- ArgoCD token in plain text @@ -106,7 +106,7 @@ global: # name: argocd-token # key: token # -- Service name of the ArgoCD server - svc: argo-cd-server + svc: argocd-server # -- Port of the ArgoCD server port: 80 # -- Set if Argo CD is running behind reverse proxy under subpath different from / @@ -115,7 +115,7 @@ global: rootpath: '' repoServer: # -- Service name of the ArgoCD repo server - svc: argo-cd-repo-server + svc: argocd-repo-server # -- Port of the ArgoCD repo server port: 8081 # -- Configuration for external Argo Rollouts @@ -264,7 +264,7 @@ sealed-secrets: #----------------------------------------------------------------------------------------------------------------------- argo-cd: enabled: true - fullnameOverride: argo-cd + fullnameOverride: argocd notifications: enabled: false redis: From a6bf3ceade526883c798df56fc1920132086c1d2 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 10 Nov 2025 19:37:34 +0300 Subject: [PATCH 3/5] feat: set fullnameoverride for argocd --- charts/gitops-runtime/tests/argo-api-gateway_test.yaml | 4 ++-- charts/gitops-runtime/tests/event-reporters_test.yaml | 4 ++-- charts/gitops-runtime/values.yaml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/gitops-runtime/tests/argo-api-gateway_test.yaml b/charts/gitops-runtime/tests/argo-api-gateway_test.yaml index d6a06e73..1f02ef8b 100644 --- a/charts/gitops-runtime/tests/argo-api-gateway_test.yaml +++ b/charts/gitops-runtime/tests/argo-api-gateway_test.yaml @@ -10,13 +10,13 @@ tests: asserts: - equal: path: data["argocd.server"] - value: argocd-server:80 + value: argo-cd-server:80 - equal: path: data["redis.server"] value: runtime-redis:6379 - equal: path: data["repo.server"] - value: argocd-repo-server:8081 + value: argo-cd-repo-server:8081 - it: Argo Api Gateway Deployment should have valid matchLabel selectors template: argo-gateway/deployment.yaml diff --git a/charts/gitops-runtime/tests/event-reporters_test.yaml b/charts/gitops-runtime/tests/event-reporters_test.yaml index f9b3c91f..c86c5526 100644 --- a/charts/gitops-runtime/tests/event-reporters_test.yaml +++ b/charts/gitops-runtime/tests/event-reporters_test.yaml @@ -37,13 +37,13 @@ tests: asserts: - equal: path: data["argocd.server"] - value: argocd-server:80 + value: argo-cd-server:80 - equal: path: data["redis.server"] value: runtime-redis:6379 - equal: path: data["repo.server"] - value: argocd-repo-server:8081 + value: argo-cd-repo-server:8081 - it: Runtime Reporter ConfigMap should have valid redis-ha url template: event-reporters/runtime-event-reporter/configmap.yaml diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 0bf3291f..bba55403 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -94,7 +94,7 @@ global: password: "" # -- ArgoCD password referenced by an existing secret passwordSecretKeyRef: - name: argocd-initial-admin-secret + name: argo-cd-initial-admin-secret key: password # If `auth.type=token` is set # -- ArgoCD token in plain text @@ -106,7 +106,7 @@ global: # name: argocd-token # key: token # -- Service name of the ArgoCD server - svc: argocd-server + svc: argo-cd-server # -- Port of the ArgoCD server port: 80 # -- Set if Argo CD is running behind reverse proxy under subpath different from / @@ -115,7 +115,7 @@ global: rootpath: '' repoServer: # -- Service name of the ArgoCD repo server - svc: argocd-repo-server + svc: argo-cd-repo-server # -- Port of the ArgoCD repo server port: 8081 # -- Configuration for external Argo Rollouts @@ -264,7 +264,7 @@ sealed-secrets: #----------------------------------------------------------------------------------------------------------------------- argo-cd: enabled: true - fullnameOverride: argocd + fullnameOverride: argo-cd notifications: enabled: false redis: From 09e1ae06ebcf4bd368d1ee1be37c8e1fdc9079d7 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 10 Nov 2025 19:43:15 +0300 Subject: [PATCH 4/5] feat: set fullnameoverride for argocd --- charts/gitops-runtime/tests/external_argocd_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitops-runtime/tests/external_argocd_test.yaml b/charts/gitops-runtime/tests/external_argocd_test.yaml index eb34ce5d..fada4afd 100644 --- a/charts/gitops-runtime/tests/external_argocd_test.yaml +++ b/charts/gitops-runtime/tests/external_argocd_test.yaml @@ -121,7 +121,7 @@ tests: valueFrom: secretKeyRef: key: password - name: argocd-initial-admin-secret + name: argo-cd-initial-admin-secret - it: app-proxy Deployment should have valid ARGO_CD_PASSWORD env var set via passwordSecretKeyRef override values: From 1f44b91ad761e168e8c1376a9949b94cd945b962 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Mon, 10 Nov 2025 22:40:46 +0300 Subject: [PATCH 5/5] feat: set fullnameoverride for argocd --- charts/gitops-runtime/tests/external_argocd_test.yaml | 2 +- charts/gitops-runtime/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gitops-runtime/tests/external_argocd_test.yaml b/charts/gitops-runtime/tests/external_argocd_test.yaml index fada4afd..eb34ce5d 100644 --- a/charts/gitops-runtime/tests/external_argocd_test.yaml +++ b/charts/gitops-runtime/tests/external_argocd_test.yaml @@ -121,7 +121,7 @@ tests: valueFrom: secretKeyRef: key: password - name: argo-cd-initial-admin-secret + name: argocd-initial-admin-secret - it: app-proxy Deployment should have valid ARGO_CD_PASSWORD env var set via passwordSecretKeyRef override values: diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index bba55403..8d68efde 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -94,7 +94,7 @@ global: password: "" # -- ArgoCD password referenced by an existing secret passwordSecretKeyRef: - name: argo-cd-initial-admin-secret + name: argocd-initial-admin-secret key: password # If `auth.type=token` is set # -- ArgoCD token in plain text