Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/gitops-runtime/tests/argo-api-gateway_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/gitops-runtime/tests/event-reporters_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/gitops-runtime/tests/external_argocd_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions charts/gitops-runtime/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 /
Expand All @@ -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
Expand Down Expand Up @@ -264,7 +264,7 @@ sealed-secrets:
#-----------------------------------------------------------------------------------------------------------------------
argo-cd:
enabled: true
fullnameOverride: argocd
fullnameOverride: argo-cd
notifications:
enabled: false
redis:
Expand Down