From 1da6fde72f0032ffcb2b5c58f4068324159f8b4f Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 16 Mar 2023 17:04:13 +0000 Subject: [PATCH] trying to cross post ingresses --- k8s/infra/ingresses/templates/_helpers/ingress.yaml | 6 ++++-- .../ingresses/templates/{issuer.yaml => clusterissuer.yaml} | 2 +- k8s/infra/ingresses/templates/dummy-pod.yaml | 2 +- k8s/infra/ingresses/templates/reverse-proxy.yaml | 2 +- k8s/infra/ingresses/values.yaml | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) rename k8s/infra/ingresses/templates/{issuer.yaml => clusterissuer.yaml} (95%) diff --git a/k8s/infra/ingresses/templates/_helpers/ingress.yaml b/k8s/infra/ingresses/templates/_helpers/ingress.yaml index c637cc0..ff0e051 100644 --- a/k8s/infra/ingresses/templates/_helpers/ingress.yaml +++ b/k8s/infra/ingresses/templates/_helpers/ingress.yaml @@ -4,11 +4,11 @@ # Input: # prefix: str # service: str +# namespace: str # global: map (should be .global) # port: int = 80 # path: str = "/" # -# {{ if .global.tls.enabled }} --- @@ -16,10 +16,11 @@ apiVersion: cert-manager.io/v1 kind: Certificate metadata: name: "tls-{{.prefix}}.{{.global.domain}}" + namespace: {{ .namespace }} spec: secretName: "tls-{{.prefix}}.{{.global.domain}}" issuerRef: - kind: Issuer + kind: ClusterIssuer name: "{{ .global.tls.issuer }}" commonName: "{{.prefix}}.{{.global.domain}}" dnsNames: @@ -31,6 +32,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: "{{.prefix}}.{{.global.domain}}" + namespace: {{ .namespace }} spec: rules: - host: "{{.prefix}}.{{.global.domain}}" diff --git a/k8s/infra/ingresses/templates/issuer.yaml b/k8s/infra/ingresses/templates/clusterissuer.yaml similarity index 95% rename from k8s/infra/ingresses/templates/issuer.yaml rename to k8s/infra/ingresses/templates/clusterissuer.yaml index b50f951..e62346c 100644 --- a/k8s/infra/ingresses/templates/issuer.yaml +++ b/k8s/infra/ingresses/templates/clusterissuer.yaml @@ -1,7 +1,7 @@ {{ if .Values.global.tls.enabled }} --- apiVersion: cert-manager.io/v1 -kind: Issuer +kind: ClusterIssuer metadata: name: {{ .Values.global.tls.issuer }} spec: diff --git a/k8s/infra/ingresses/templates/dummy-pod.yaml b/k8s/infra/ingresses/templates/dummy-pod.yaml index 54a2445..d9ae835 100644 --- a/k8s/infra/ingresses/templates/dummy-pod.yaml +++ b/k8s/infra/ingresses/templates/dummy-pod.yaml @@ -41,4 +41,4 @@ spec: targetPort: 80 -{{ include "homelab.ingress" (dict "service" "dummy-app" "prefix" "demo" "global" $.Values.global)}} +{{ include "homelab.ingress" (dict "service" "dummy-app" "prefix" "demo" "global" $.Values.global "namespace" $.Release.Namespace)}} diff --git a/k8s/infra/ingresses/templates/reverse-proxy.yaml b/k8s/infra/ingresses/templates/reverse-proxy.yaml index 81c090c..c4d02df 100644 --- a/k8s/infra/ingresses/templates/reverse-proxy.yaml +++ b/k8s/infra/ingresses/templates/reverse-proxy.yaml @@ -22,6 +22,6 @@ spec: protocol: TCP targetPort: {{ $data.port }} -{{ include "homelab.ingress" (dict "service" (printf "reverse-proxy-%s" $prefix) "prefix" $prefix "global" $.Values.global)}} +{{ include "homelab.ingress" (dict "service" (printf "reverse-proxy-%s" $prefix) "prefix" $prefix "global" $.Values.global "namespace" $.Release.Namespace )}} {{ end }} \ No newline at end of file diff --git a/k8s/infra/ingresses/values.yaml b/k8s/infra/ingresses/values.yaml index bd8345e..a575a0c 100644 --- a/k8s/infra/ingresses/values.yaml +++ b/k8s/infra/ingresses/values.yaml @@ -2,6 +2,7 @@ reverseProxy: {} services: - prefix: "argocd.core" service: "argocd-server" + namespace: "argocd" global: {} acmeServer: "https://acme-staging-v02.api.letsencrypt.org/directory" skipTLSVerify: "false"