forked from DevFW-CICD/stacks
Changed argocd path routing to domain
This commit is contained in:
parent
303d7b3a7e
commit
e17321de52
3 changed files with 5 additions and 8 deletions
|
@ -4,7 +4,6 @@ global:
|
||||||
configs:
|
configs:
|
||||||
params:
|
params:
|
||||||
server.insecure: true
|
server.insecure: true
|
||||||
server.basehref: /argocd
|
|
||||||
cm:
|
cm:
|
||||||
application.resourceTrackingMethod: annotation
|
application.resourceTrackingMethod: annotation
|
||||||
timeout.reconciliation: 60s
|
timeout.reconciliation: 60s
|
||||||
|
|
|
@ -4,8 +4,6 @@ metadata:
|
||||||
annotations:
|
annotations:
|
||||||
nginx.ingress.kubernetes.io/backend-protocol: HTTP
|
nginx.ingress.kubernetes.io/backend-protocol: HTTP
|
||||||
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
|
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
|
||||||
nginx.ingress.kubernetes.io/rewrite-target: /$2
|
|
||||||
nginx.ingress.kubernetes.io/use-regex: "true"
|
|
||||||
{{{ if eq .Env.CLUSTER_TYPE "osc" }}}
|
{{{ if eq .Env.CLUSTER_TYPE "osc" }}}
|
||||||
dns.gardener.cloud/class: garden
|
dns.gardener.cloud/class: garden
|
||||||
dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN }}}
|
dns.gardener.cloud/dnsnames: {{{ .Env.DOMAIN }}}
|
||||||
|
@ -16,7 +14,7 @@ metadata:
|
||||||
spec:
|
spec:
|
||||||
ingressClassName: nginx
|
ingressClassName: nginx
|
||||||
rules:
|
rules:
|
||||||
- host: {{{ .Env.DOMAIN }}}
|
- host: {{{ .Env.DOMAIN_ARGOCD }}}
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- backend:
|
- backend:
|
||||||
|
@ -24,9 +22,9 @@ spec:
|
||||||
name: argocd-server
|
name: argocd-server
|
||||||
port:
|
port:
|
||||||
number: 80
|
number: 80
|
||||||
path: /argocd(/|$)(.*)
|
path: /
|
||||||
pathType: ImplementationSpecific
|
pathType: Prefix
|
||||||
tls:
|
tls:
|
||||||
- hosts:
|
- hosts:
|
||||||
- {{{ .Env.DOMAIN }}}
|
- {{{ .Env.DOMAIN_ARGOCD }}}
|
||||||
secretName: argocd-net-tls
|
secretName: argocd-net-tls
|
||||||
|
|
|
@ -182,7 +182,7 @@ data:
|
||||||
- type: 'config'
|
- type: 'config'
|
||||||
instances:
|
instances:
|
||||||
- name: in-cluster
|
- name: in-cluster
|
||||||
url: https://{{{ .Env.DOMAIN }}}:443/argocd
|
url: https://{{{ .Env.DOMAIN_ARGOCD }}}:443
|
||||||
username: admin
|
username: admin
|
||||||
password: ${ARGOCD_ADMIN_PASSWORD}
|
password: ${ARGOCD_ADMIN_PASSWORD}
|
||||||
argoWorkflows:
|
argoWorkflows:
|
||||||
|
|
Loading…
Reference in a new issue