diff --git a/apps/argocd/templates/httproute.yaml b/apps/argocd/templates/httproute.yaml deleted file mode 100644 index 9c7e227..0000000 --- a/apps/argocd/templates/httproute.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: gateway.networking.k8s.io/v1 -kind: HTTPRoute -metadata: - name: argocd-server - namespace: {{ .Release.Namespace }} -spec: - parentRefs: - - name: traefik-gateway - namespace: traefik - sectionName: web - hostnames: - - {{ index .Values "argo-cd" "global" "domain" | quote }} - rules: - - matches: - - path: - type: PathPrefix - value: / - backendRefs: - - name: argocd-server - port: 80 diff --git a/apps/argocd/values.yaml b/apps/argocd/values.yaml index 106d1b9..4dab577 100644 --- a/apps/argocd/values.yaml +++ b/apps/argocd/values.yaml @@ -5,3 +5,25 @@ argo-cd: server: ingress: enabled: false + + extraObjects: + - apiVersion: gateway.networking.k8s.io/v1 + kind: HTTPRoute + metadata: + name: argocd-server + namespace: argocd + spec: + parentRefs: + - name: traefik-gateway + namespace: traefik + sectionName: websecure + hostnames: + - "argocd.noxxos.nl" + rules: + - matches: + - path: + type: PathPrefix + value: / + backendRefs: + - name: argocd-server + port: 80 diff --git a/apps/traefik/values.yaml b/apps/traefik/values.yaml index fb14792..e8d950f 100644 --- a/apps/traefik/values.yaml +++ b/apps/traefik/values.yaml @@ -20,12 +20,6 @@ traefik: ports: websecure: asDefault: true - traefik: - port: 9000 - expose: - default: true - exposedPort: 9000 - protocol: TCP providers: kubernetesCRD: @@ -66,7 +60,7 @@ traefik: spec: parentRefs: - name: traefik-gateway - sectionName: web + sectionName: websecure hostnames: - "traefik.noxxos.nl" rules: diff --git a/platform/components/02-argocd/post-install/httproute.yaml b/platform/components/02-argocd/post-install/httproute.yaml deleted file mode 100644 index e07e809..0000000 --- a/platform/components/02-argocd/post-install/httproute.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: gateway.networking.k8s.io/v1 -kind: HTTPRoute -metadata: - name: argocd-server - namespace: argocd -spec: - parentRefs: - - name: traefik-gateway - namespace: traefik - sectionName: websecure - hostnames: - - "argocd.noxxos.nl" - rules: - - matches: - - path: - type: PathPrefix - value: / - backendRefs: - - name: argocd-server - port: 80 diff --git a/platform/components/02-argocd/post-install/root-app.yaml b/platform/components/02-argocd/post-install/root-app.yaml index 48f0692..eee8ce6 100644 --- a/platform/components/02-argocd/post-install/root-app.yaml +++ b/platform/components/02-argocd/post-install/root-app.yaml @@ -19,8 +19,8 @@ spec: namespace: argocd syncPolicy: automated: - prune: false - selfHeal: false + prune: true + selfHeal: true syncOptions: - CreateNamespace=true - PruneLast=true