From f12659cca7aaa2f243d41730406fbe74f56d1631 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Sat, 23 Nov 2024 20:02:50 -0600 Subject: [PATCH] switch ingress --- .../deployment/argocd/templates/ingress.yaml | 15 +++++---------- clusters/cl01tl/deployment/argocd/values.yaml | 8 ++++++-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/clusters/cl01tl/deployment/argocd/templates/ingress.yaml b/clusters/cl01tl/deployment/argocd/templates/ingress.yaml index 08e987b84..736d6b565 100644 --- a/clusters/cl01tl/deployment/argocd/templates/ingress.yaml +++ b/clusters/cl01tl/deployment/argocd/templates/ingress.yaml @@ -1,26 +1,21 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: argocd-local + name: argocd-tailscale namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: argocd-local + app.kubernetes.io/name: argocd-tailscale app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/version: {{ .Chart.AppVersion }} app.kubernetes.io/component: web app.kubernetes.io/part-of: {{ .Release.Name }} - annotations: - traefik.ingress.kubernetes.io/router.entrypoints: websecure - traefik.ingress.kubernetes.io/router.tls: "true" - cert-manager.io/cluster-issuer: letsencrypt-issuer spec: - ingressClassName: traefik + ingressClassName: tailscale tls: - hosts: - - argocd.alexlebens.net - secretName: argocd-tls-secret + - argocd-cl01tl rules: - - host: argocd.alexlebens.net + - host: argocd-cl01tl http: paths: - path: / diff --git a/clusters/cl01tl/deployment/argocd/values.yaml b/clusters/cl01tl/deployment/argocd/values.yaml index eb8bf0675..706ab917d 100644 --- a/clusters/cl01tl/deployment/argocd/values.yaml +++ b/clusters/cl01tl/deployment/argocd/values.yaml @@ -33,8 +33,12 @@ argo-cd: ingress: enabled: true controller: generic - ingressClassName: tailscale - hostname: argocd-cl01tl + ingressClassName: traefik + annotations: + traefik.ingress.kubernetes.io/router.entrypoints: websecure + traefik.ingress.kubernetes.io/router.tls: "true" + cert-manager.io/cluster-issuer: letsencrypt-issuer + hostname: argocd.alexlebens.net tls: true metrics: enabled: true