From 9fb3f8f88fa5515866a8db3c50fee79f2ff852ac Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 16 Mar 2023 16:40:19 +0000 Subject: [PATCH] compressed all ingresses to one ns --- .../{reverse-proxy => ingresses}/.helmignore | 0 .../{reverse-proxy => ingresses}/Chart.yaml | 0 .../templates/dummy-pod.yaml | 0 .../templates/issuer.yaml} | 2 +- .../templates/reverse-proxy.yaml | 24 +++++++++++++++++++ .../values-dev.yaml | 0 .../values-prod.yaml | 2 ++ .../{tls-certs => ingresses}/values.yaml | 1 + k8s/infra/reverse-proxy/values.yaml | 1 - k8s/infra/tls-certs/Chart.lock | 3 --- k8s/infra/tls-certs/Chart.yaml | 6 ----- k8s/infra/tls-certs/values-dev.yaml | 0 k8s/infra/tls-certs/values-prod.yaml | 2 -- 13 files changed, 28 insertions(+), 13 deletions(-) rename k8s/infra/{reverse-proxy => ingresses}/.helmignore (100%) rename k8s/infra/{reverse-proxy => ingresses}/Chart.yaml (100%) rename k8s/infra/{reverse-proxy => ingresses}/templates/dummy-pod.yaml (100%) rename k8s/infra/{tls-certs/templates/cluster-issuer.yaml => ingresses/templates/issuer.yaml} (95%) rename k8s/infra/{reverse-proxy => ingresses}/templates/reverse-proxy.yaml (57%) rename k8s/infra/{reverse-proxy => ingresses}/values-dev.yaml (100%) rename k8s/infra/{reverse-proxy => ingresses}/values-prod.yaml (58%) rename k8s/infra/{tls-certs => ingresses}/values.yaml (85%) delete mode 100644 k8s/infra/reverse-proxy/values.yaml delete mode 100644 k8s/infra/tls-certs/Chart.lock delete mode 100644 k8s/infra/tls-certs/Chart.yaml delete mode 100644 k8s/infra/tls-certs/values-dev.yaml delete mode 100644 k8s/infra/tls-certs/values-prod.yaml diff --git a/k8s/infra/reverse-proxy/.helmignore b/k8s/infra/ingresses/.helmignore similarity index 100% rename from k8s/infra/reverse-proxy/.helmignore rename to k8s/infra/ingresses/.helmignore diff --git a/k8s/infra/reverse-proxy/Chart.yaml b/k8s/infra/ingresses/Chart.yaml similarity index 100% rename from k8s/infra/reverse-proxy/Chart.yaml rename to k8s/infra/ingresses/Chart.yaml diff --git a/k8s/infra/reverse-proxy/templates/dummy-pod.yaml b/k8s/infra/ingresses/templates/dummy-pod.yaml similarity index 100% rename from k8s/infra/reverse-proxy/templates/dummy-pod.yaml rename to k8s/infra/ingresses/templates/dummy-pod.yaml diff --git a/k8s/infra/tls-certs/templates/cluster-issuer.yaml b/k8s/infra/ingresses/templates/issuer.yaml similarity index 95% rename from k8s/infra/tls-certs/templates/cluster-issuer.yaml rename to k8s/infra/ingresses/templates/issuer.yaml index e62346c..b50f951 100644 --- a/k8s/infra/tls-certs/templates/cluster-issuer.yaml +++ b/k8s/infra/ingresses/templates/issuer.yaml @@ -1,7 +1,7 @@ {{ if .Values.global.tls.enabled }} --- apiVersion: cert-manager.io/v1 -kind: ClusterIssuer +kind: Issuer metadata: name: {{ .Values.global.tls.issuer }} spec: diff --git a/k8s/infra/reverse-proxy/templates/reverse-proxy.yaml b/k8s/infra/ingresses/templates/reverse-proxy.yaml similarity index 57% rename from k8s/infra/reverse-proxy/templates/reverse-proxy.yaml rename to k8s/infra/ingresses/templates/reverse-proxy.yaml index a84ce92..ae92f11 100644 --- a/k8s/infra/reverse-proxy/templates/reverse-proxy.yaml +++ b/k8s/infra/ingresses/templates/reverse-proxy.yaml @@ -22,6 +22,23 @@ spec: protocol: TCP targetPort: {{ $data.port }} + +{{ if $.Values.global.tls.enabled }} +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: "tls-{{$prefix}}.{{$.Values.global.domain}}" +spec: + secretName: "tls-{{$prefix}}.{{$.Values.global.domain}}" + issuerRef: + kind: Issuer + name: {{ .Values.global.tls.issuer }} + commonName: "{{$prefix}}.{{$.Values.global.domain}}" + dnsNames: + - "{{$prefix}}.{{$.Values.global.domain}}" +{{ end }} + --- apiVersion: networking.k8s.io/v1 kind: Ingress @@ -41,4 +58,11 @@ spec: number: 80 path: / pathType: Prefix + {{ if $.Values.global.tls.enabled }} + tls: + - secretName: "tls-{{$prefix}}.{{$.Values.global.domain}}" + hosts: + - "tls-{{$prefix}}.{{$.Values.global.domain}}" + {{ end }} + {{ end }} \ No newline at end of file diff --git a/k8s/infra/reverse-proxy/values-dev.yaml b/k8s/infra/ingresses/values-dev.yaml similarity index 100% rename from k8s/infra/reverse-proxy/values-dev.yaml rename to k8s/infra/ingresses/values-dev.yaml diff --git a/k8s/infra/reverse-proxy/values-prod.yaml b/k8s/infra/ingresses/values-prod.yaml similarity index 58% rename from k8s/infra/reverse-proxy/values-prod.yaml rename to k8s/infra/ingresses/values-prod.yaml index 5809887..602e0d5 100644 --- a/k8s/infra/reverse-proxy/values-prod.yaml +++ b/k8s/infra/ingresses/values-prod.yaml @@ -5,3 +5,5 @@ reverseProxy: yellow: port: "8123" ip: "192.168.0.23" +acmeServer: "https://acme-v02.api.letsencrypt.org/directory" +skipTLSVerify: true diff --git a/k8s/infra/tls-certs/values.yaml b/k8s/infra/ingresses/values.yaml similarity index 85% rename from k8s/infra/tls-certs/values.yaml rename to k8s/infra/ingresses/values.yaml index 8d068a4..2758a93 100644 --- a/k8s/infra/tls-certs/values.yaml +++ b/k8s/infra/ingresses/values.yaml @@ -1,3 +1,4 @@ +reverseProxy: {} global: {} acmeServer: "https://acme-staging-v02.api.letsencrypt.org/directory" skipTLSVerify: "false" diff --git a/k8s/infra/reverse-proxy/values.yaml b/k8s/infra/reverse-proxy/values.yaml deleted file mode 100644 index a2fcf37..0000000 --- a/k8s/infra/reverse-proxy/values.yaml +++ /dev/null @@ -1 +0,0 @@ -reverseProxy: {} diff --git a/k8s/infra/tls-certs/Chart.lock b/k8s/infra/tls-certs/Chart.lock deleted file mode 100644 index 90a20ba..0000000 --- a/k8s/infra/tls-certs/Chart.lock +++ /dev/null @@ -1,3 +0,0 @@ -dependencies: [] -digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726 -generated: "2023-03-16T16:26:05.800530121Z" diff --git a/k8s/infra/tls-certs/Chart.yaml b/k8s/infra/tls-certs/Chart.yaml deleted file mode 100644 index 85c9fb0..0000000 --- a/k8s/infra/tls-certs/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: cert-manager -description: An infra service for homelab -type: application -version: 0.1.0 -dependencies: [] diff --git a/k8s/infra/tls-certs/values-dev.yaml b/k8s/infra/tls-certs/values-dev.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/k8s/infra/tls-certs/values-prod.yaml b/k8s/infra/tls-certs/values-prod.yaml deleted file mode 100644 index 4a9fb7f..0000000 --- a/k8s/infra/tls-certs/values-prod.yaml +++ /dev/null @@ -1,2 +0,0 @@ -acmeServer: "https://acme-v02.api.letsencrypt.org/directory" -skipTLSVerify: true