From 5f7cffa797750e86d66eb14bc199cba66264cc0f Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 16 Mar 2023 16:54:26 +0000 Subject: [PATCH] using macro to define ingress --- .../ingresses/templates/_helpers/ingress.yaml | 54 +++++++++++++++++++ k8s/infra/ingresses/templates/dummy-pod.yaml | 22 ++------ .../ingresses/templates/reverse-proxy.yaml | 43 +-------------- 3 files changed, 58 insertions(+), 61 deletions(-) create mode 100644 k8s/infra/ingresses/templates/_helpers/ingress.yaml diff --git a/k8s/infra/ingresses/templates/_helpers/ingress.yaml b/k8s/infra/ingresses/templates/_helpers/ingress.yaml new file mode 100644 index 0000000..c637cc0 --- /dev/null +++ b/k8s/infra/ingresses/templates/_helpers/ingress.yaml @@ -0,0 +1,54 @@ +{{- define "homelab.ingress" }} + +# +# Input: +# prefix: str +# service: str +# global: map (should be .global) +# port: int = 80 +# path: str = "/" +# +# + +{{ if .global.tls.enabled }} +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: "tls-{{.prefix}}.{{.global.domain}}" +spec: + secretName: "tls-{{.prefix}}.{{.global.domain}}" + issuerRef: + kind: Issuer + name: "{{ .global.tls.issuer }}" + commonName: "{{.prefix}}.{{.global.domain}}" + dnsNames: + - "{{.prefix}}.{{.global.domain}}" +{{ end }} + +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: "{{.prefix}}.{{.global.domain}}" +spec: + rules: + - host: "{{.prefix}}.{{.global.domain}}" + http: + paths: + - backend: + service: + name: "{{.service}}" + port: + number: {{.port | default 80}} + path: {{ .path | default "/" }} + pathType: Prefix + {{ if .global.tls.enabled }} + tls: + - secretName: "tls-{{.prefix}}.{{.global.domain}}" + hosts: + - "{{.prefix}}.{{.global.domain}}" + {{ end }} + + +{{- end -}} \ No newline at end of file diff --git a/k8s/infra/ingresses/templates/dummy-pod.yaml b/k8s/infra/ingresses/templates/dummy-pod.yaml index 3d4fae8..54a2445 100644 --- a/k8s/infra/ingresses/templates/dummy-pod.yaml +++ b/k8s/infra/ingresses/templates/dummy-pod.yaml @@ -39,22 +39,6 @@ spec: - name: http port: 80 targetPort: 80 ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: dummy-app - labels: - name: dummy-app -spec: - rules: - - host: "demo.{{ .Values.global.domain }}" - http: - paths: - - pathType: Prefix - path: "/" - backend: - service: - name: dummy-app - port: - number: 80 + + +{{ include "homelab.ingress" (dict "service" "dummy-app" "prefix" "demo" "global" $.Values.global)}} diff --git a/k8s/infra/ingresses/templates/reverse-proxy.yaml b/k8s/infra/ingresses/templates/reverse-proxy.yaml index 67d3376..81c090c 100644 --- a/k8s/infra/ingresses/templates/reverse-proxy.yaml +++ b/k8s/infra/ingresses/templates/reverse-proxy.yaml @@ -22,47 +22,6 @@ 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 -metadata: - name: "reverse-proxy-{{$prefix}}" - annotations: - homelab/ingress-type: "reverse-proxy" -spec: - rules: - - host: "{{$prefix}}.{{$.Values.global.domain}}" - http: - paths: - - backend: - service: - name: "reverse-proxy-{{$prefix}}" - port: - number: 80 - path: / - pathType: Prefix - {{ if $.Values.global.tls.enabled }} - tls: - - secretName: "tls-{{$prefix}}.{{$.Values.global.domain}}" - hosts: - - "{{$prefix}}.{{$.Values.global.domain}}" - {{ end }} +{{ include "homelab.ingress" (dict "service" (printf "reverse-proxy-%s" $prefix) "prefix" $prefix "global" $.Values.global)}} {{ end }} \ No newline at end of file