From bdc418e0d8c16edef592e2d7bffe30299772549d Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Sun, 7 Nov 2021 05:30:13 +0000 Subject: [PATCH] Updated proxy Signed-off-by: Marcus Noble --- manifests/auth-proxy/ingress.yaml | 22 +++++------ manifests/auth-proxy/non-auth-proxy.yaml | 48 +++++++++++++++++++++++- 2 files changed, 58 insertions(+), 12 deletions(-) diff --git a/manifests/auth-proxy/ingress.yaml b/manifests/auth-proxy/ingress.yaml index e988624..7144281 100644 --- a/manifests/auth-proxy/ingress.yaml +++ b/manifests/auth-proxy/ingress.yaml @@ -13,7 +13,6 @@ spec: - downloads.cluster.fun - argo.cluster.fun - code.cluster.fun - - home.cluster.fun - adguard.cluster.fun - podify.cluster.fun - jackett.cluster.fun @@ -21,6 +20,7 @@ spec: - radarr.cluster.fun - sonarr.cluster.fun - transmission.cluster.fun + - tekton.cluster.fun secretName: auth-proxy-ingress rules: - host: downloads.cluster.fun @@ -53,16 +53,6 @@ spec: name: auth-proxy port: name: http - - host: home.cluster.fun - http: - paths: - - path: / - pathType: ImplementationSpecific - backend: - service: - name: auth-proxy - port: - name: http - host: adguard.cluster.fun http: paths: @@ -133,3 +123,13 @@ spec: name: auth-proxy port: name: http + - host: tekton.cluster.fun + http: + paths: + - path: / + pathType: ImplementationSpecific + backend: + service: + name: auth-proxy + port: + name: http diff --git a/manifests/auth-proxy/non-auth-proxy.yaml b/manifests/auth-proxy/non-auth-proxy.yaml index 84f534b..1c7e912 100644 --- a/manifests/auth-proxy/non-auth-proxy.yaml +++ b/manifests/auth-proxy/non-auth-proxy.yaml @@ -8,7 +8,9 @@ metadata: data: mapping.json: | { - "tekton-el.auth-proxy.svc": "tekton-el.cluster.local" + "tekton-el.auth-proxy.svc": "tekton-el.cluster.local", + "home.auth-proxy.svc": "home.cluster.local", + "home.cluster.fun": "home.cluster.local" } --- @@ -99,3 +101,47 @@ spec: app: proxy type: ClusterIP --- +apiVersion: v1 +kind: Service +metadata: + name: home + namespace: auth-proxy + labels: + app: proxy +spec: + ports: + - name: http + port: 80 + protocol: TCP + targetPort: 8080 + selector: + app: proxy + type: ClusterIP +--- + + +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: non-auth-proxy + namespace: auth-proxy + annotations: + cert-manager.io/cluster-issuer: letsencrypt + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" +spec: + ingressClassName: nginx + tls: + - hosts: + - home.cluster.fun + secretName: non-auth-proxy-ingress + rules: + - host: home.cluster.fun + http: + paths: + - path: / + pathType: ImplementationSpecific + backend: + service: + name: home + port: + name: http