diff --git a/template/stacks/core/argocd/manifests/argocd-server-ingress.yaml b/template/stacks/core/argocd/manifests/argocd-server-ingress.yaml index 7a95a9b..5abc4cc 100644 --- a/template/stacks/core/argocd/manifests/argocd-server-ingress.yaml +++ b/template/stacks/core/argocd/manifests/argocd-server-ingress.yaml @@ -7,7 +7,7 @@ metadata: cert-manager.io/cluster-issuer: main {{{ if eq .Env.CLUSTER_TYPE "osc" }}} dns.gardener.cloud/class: garden - dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN }}} + dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN_ARGOCD }}} dns.gardener.cloud/ttl: "600" {{{ end }}} name: argocd-server @@ -15,7 +15,7 @@ metadata: spec: ingressClassName: nginx rules: - - host: {{{ .Env.DOMAIN }}} + - host: argocd.{{{ .Env.DOMAIN_ARGOCD }}} http: paths: - backend: @@ -27,5 +27,5 @@ spec: pathType: Prefix tls: - hosts: - - {{{ .Env.DOMAIN }}} + - {{{ .Env.DOMAIN_ARGOCD }}} secretName: argocd-net-tls diff --git a/template/stacks/core/argocd/values.yaml b/template/stacks/core/argocd/values.yaml index a5cee37..26ac60e 100644 --- a/template/stacks/core/argocd/values.yaml +++ b/template/stacks/core/argocd/values.yaml @@ -1,5 +1,5 @@ global: - domain: {{{ .Env.DOMAIN }}} + domain: {{{ .Env.DOMAIN_ARGOCD }}} configs: params: @@ -21,7 +21,7 @@ configs: clusters: - "*" accounts.provider-argocd: apiKey - url: https://{{{ .Env.DOMAIN }}}/argocd + url: https://{{{ .Env.DOMAIN_ARGOCD }}}/argocd rbac: policy.csv: 'g, provider-argocd, role:admin'