diff --git a/argocd/base/argo-cd-ingressroute.yaml b/argocd/base/argo-cd-ingressroute.yaml index 9eed12e..fd54a00 100644 --- a/argocd/base/argo-cd-ingressroute.yaml +++ b/argocd/base/argo-cd-ingressroute.yaml @@ -1,12 +1,21 @@ apiVersion: traefik.io/v1alpha1 kind: IngressRoute metadata: - name: argo-cd-ingressroute + name: argocd-server + namespace: argocd spec: routes: - - match: Host(`argocd.mziesel.nl`) - kind: Rule - services: - - name: argocd-server - port: 443 + - kind: Rule + match: Host(`argocd.mziesel.nl`) + priority: 10 + services: + - name: argocd-server + port: 80 + - kind: Rule + match: Host(`argocd.mziesel.nl`) && Header(`Content-Type`, `application/grpc`) + priority: 11 + services: + - name: argocd-server + port: 80 + scheme: h2c tls: {} diff --git a/argocd/kustomization.yaml b/argocd/kustomization.yaml index 0781f01..345ffb9 100644 --- a/argocd/kustomization.yaml +++ b/argocd/kustomization.yaml @@ -5,5 +5,6 @@ namespace: argocd resources: - https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/ha/install.yaml + - base/argo-cd-ingressroute.yaml - base/argo-cd-namespace.yaml - base/argo-cd-app-of-apps.yaml diff --git a/whoami/base/whoami-ingress.yaml b/whoami/base/whoami-ingress.yaml index 346b45b..e0930b4 100644 --- a/whoami/base/whoami-ingress.yaml +++ b/whoami/base/whoami-ingress.yaml @@ -19,6 +19,7 @@ spec: routes: - match: HostRegexp(`.*`) kind: Rule + priority: 9999 services: - name: whoami port: web @@ -31,6 +32,7 @@ spec: routes: - match: HostRegexp(`.*`) kind: Rule + priority: 9999 services: - name: whoami port: web