From 0f018c002edcc1e0878b1ad3dfc2ed589bec40b6 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 22 Apr 2025 17:33:35 -0400 Subject: [PATCH] ingress --- charts/apps/certs/templates/es-store.yaml | 2 +- .../templates/_helpers/ingress.domain.tls.tpl | 43 ++++++ .../templates/_helpers/ingress.domain.tpl | 12 ++ .../ingress/templates/_helpers/ingress.tpl | 122 ++++++++++++++++++ .../apps/ingress/templates/reverse-proxy.yaml | 32 +++++ charts/apps/ingress/values-dev.yaml | 9 ++ charts/apps/ingress/values.yaml | 4 +- .../templates/argocd-appset.yml | 2 +- 8 files changed, 223 insertions(+), 3 deletions(-) create mode 100644 charts/apps/ingress/templates/_helpers/ingress.domain.tls.tpl create mode 100644 charts/apps/ingress/templates/_helpers/ingress.domain.tpl create mode 100644 charts/apps/ingress/templates/_helpers/ingress.tpl create mode 100644 charts/apps/ingress/templates/reverse-proxy.yaml diff --git a/charts/apps/certs/templates/es-store.yaml b/charts/apps/certs/templates/es-store.yaml index 2695b4d..89981f5 100644 --- a/charts/apps/certs/templates/es-store.yaml +++ b/charts/apps/certs/templates/es-store.yaml @@ -38,7 +38,7 @@ subjects: apiVersion: external-secrets.io/v1beta1 kind: ClusterSecretStore metadata: - name: store + name: "k8s-ns-{{ .Release.Namespace }}" namespace: "{{ .Release.Namespace }}" spec: provider: diff --git a/charts/apps/ingress/templates/_helpers/ingress.domain.tls.tpl b/charts/apps/ingress/templates/_helpers/ingress.domain.tls.tpl new file mode 100644 index 0000000..a8a3ff8 --- /dev/null +++ b/charts/apps/ingress/templates/_helpers/ingress.domain.tls.tpl @@ -0,0 +1,43 @@ +{{ define "homelab.ingress.domain.tls"}} +{{ if (.useWildCard | default .global.dns.tls.useWildCard) }} +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: "tls-{{.prefix}}.{{ .domain }}" + namespace: {{ .namespace }} +spec: + refreshInterval: 1h + secretStoreRef: + kind: ClusterSecretStore + name: k8s-ns-certs + target: + name: tls-{{.prefix}}.{{ .domain }} + creationPolicy: Owner + deletionPolicy: Delete + data: + - secretKey: tls.crt + remoteRef: + key: cloudflare-wildcard.{{ .domain }} + property: tls.crt + - secretKey: tls.key + remoteRef: + key: cloudflare-wildcard.{{ .domain }} + property: tls.key +{{ else }} +--- +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: "tls-{{.prefix}}.{{ .domain }}" + namespace: {{ .namespace }} +spec: + secretName: "tls-{{.prefix}}.{{ .domain }}" + issuerRef: + kind: ClusterIssuer + name: "{{ .global.tls.issuer }}" + commonName: "{{.prefix}}.{{ .domain }}" + dnsNames: + - "{{.prefix}}.{{ .domain }}" +{{ end }} +{{ end }} \ No newline at end of file diff --git a/charts/apps/ingress/templates/_helpers/ingress.domain.tpl b/charts/apps/ingress/templates/_helpers/ingress.domain.tpl new file mode 100644 index 0000000..d68e839 --- /dev/null +++ b/charts/apps/ingress/templates/_helpers/ingress.domain.tpl @@ -0,0 +1,12 @@ +{{- define "homelab.ingress.domain" -}} + {{- $rootPrefix := empty .leadPrefix | ternary "" (printf "%s." .leadPrefix) -}} + {{- if .useSecondaryDomain -}} +{{$rootPrefix}}{{.global.secondaryDomain}} + {{- else -}} + {{- if .useDirectPrefix -}} +{{$rootPrefix}}{{.global.domain}} + {{- else -}} +{{$rootPrefix}}{{.global.rootSubDomain}}.{{.global.domain}} + {{- end -}} + {{- end -}} +{{- end -}} \ No newline at end of file diff --git a/charts/apps/ingress/templates/_helpers/ingress.tpl b/charts/apps/ingress/templates/_helpers/ingress.tpl new file mode 100644 index 0000000..d1b85d8 --- /dev/null +++ b/charts/apps/ingress/templates/_helpers/ingress.tpl @@ -0,0 +1,122 @@ +{{- define "homelab.ingress" }} + +# +# Input: = {{ . | toJson }} +# prefix: str = {{ .prefix }} +# service: str = {{ .service }} +# namespace: str = {{ .namespace }} +# global: map (should be .global) = {{ .global | toJson }} +# port: int = 80 = {{ .port }} +# path: str = "/" = {{ .path }} +# useWildCard: bool = False = {{ .useWildCard }} +# middleware: str = "https-redirect" = {{ .middleware }} +# useSecondaryDomain: bool = False = {{ .useSecondaryDomain }} +# useDirectPrefix: bool = False = {{ .useDirectPrefix }} +# widget: bool = False = {{ .widget | toJson }} +# + + +{{- $splitPrefix := splitList "." .prefix -}} +{{- $prefix := first $splitPrefix -}} +{{- $leadPrefix := join "." (rest $splitPrefix) -}} + +{{- $_ := set . "prefix" $prefix -}} +{{- $_ := set . "leadPrefix" $leadPrefix -}} + +{{- $domain := (include "homelab.ingress.domain" .) -}} + +{{- $_ := set . "domain" $domain -}} + +# .domain = {{ .domain }} +# .prefix = {{ .prefix }} +{{ if .global.tls.enabled }} +{{ include "homelab.ingress.domain.tls" . }} +{{ end }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: "{{.prefix}}.{{ $domain }}" + namespace: {{ .namespace }} + annotations: + homelab-ingress/managing-app-namespace: "apps-ingresses" + traefik.ingress.kubernetes.io/router.middlewares: {{ .middleware | default "apps-ingresses-https-redirect"}}@kubernetescrd + gethomepage.dev/enabled: "true" + gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" + gethomepage.dev/siteMonitor: 'http://{{.service}}.{{ .namespace }}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}{{ .health | default "" }}' + {{ if .description}} + gethomepage.dev/description: "{{ .description }}" + {{ end }} + gethomepage.dev/group: {{ .group | default "Unassigned" }} + {{ if .icon }} + gethomepage.dev/icon: "{{.icon}}" + {{ else }} + gethomepage.dev/icon: "homepage.png" + {{ end }} + {{ if .widget }} + {{ range $k, $v := .widget }} + gethomepage.dev/widget.{{$k}}: {{ $v | quote }} + {{ end }} + {{ end }} + {{ range $k, $v := (.annotations | default (dict )) }} + {{ $k }}: {{ $v }} + {{ end }} +spec: + rules: + - host: "{{.prefix}}.{{ $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}}.{{ $domain }}" + hosts: + - "{{.prefix}}.{{ $domain }}" + {{ end }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: "{{.prefix}}.internal" + namespace: {{ .namespace }} + annotations: + homelab-ingress/managing-app-namespace: "apps-ingresses" + gethomepage.dev/enabled: "true" + gethomepage.dev/name: "{{.prefix}}@{{.namespace}}" + gethomepage.dev/siteMonitor: 'http://{{.service}}.{{ .namespace }}.svc.cluster.local:{{.port | default 80}}{{ .path | default "/" }}{{ .health | default "" }}' + {{ if .description}} + gethomepage.dev/description: "{{ .description }}" + {{ end }} + gethomepage.dev/group: Internal({{ .group | default "Unassigned" }}) + {{ if .icon }} + gethomepage.dev/icon: "{{.icon}}" + {{ else }} + gethomepage.dev/icon: "homepage.png" + {{ end }} + {{ if .widget }} + {{- range $k, $v := .widget }} + gethomepage.dev/widget.{{$k}}: {{ $v | quote }} + {{- end }} + {{ end }} + {{ range $k, $v := (.annotations | default (dict )) }} + {{ $k }}: {{ $v }} + {{ end }} +spec: + rules: + - host: "{{.prefix}}.k3sapp.internal" + http: + paths: + - backend: + service: + name: "{{.service}}" + port: + number: {{.port | default 80}} + path: {{ .path | default "/" }} + pathType: Prefix +{{- end -}} \ No newline at end of file diff --git a/charts/apps/ingress/templates/reverse-proxy.yaml b/charts/apps/ingress/templates/reverse-proxy.yaml new file mode 100644 index 0000000..da5dbb0 --- /dev/null +++ b/charts/apps/ingress/templates/reverse-proxy.yaml @@ -0,0 +1,32 @@ +{{ range $prefix, $data := .Values.reverseProxy }} +--- +apiVersion: v1 +kind: Endpoints +metadata: + name: "reverse-proxy-{{$prefix}}" +subsets: +- addresses: + - ip: "{{ $data.ip }}" + ports: + - port: {{ $data.port | default 80 }} + protocol: TCP +--- +apiVersion: v1 +kind: Service +metadata: + name: "reverse-proxy-{{$prefix}}" +spec: + type: ClusterIP + ports: + - port: 80 + protocol: TCP + targetPort: {{ $data.port | default 80 }} +{{ if (not $data.disableIngress) }} +{{- $ingressDef := (dict "service" (printf "reverse-proxy-%s" $prefix) "prefix" $prefix "global" $.Values.global "namespace" $.Release.Namespace "group" "Reverse Proxies" ) -}} +{{- $ingressDef := (merge ($data.overrides | default (dict)) $ingressDef) -}} + +{{ include "homelab.ingress" $ingressDef}} + +{{ end }} + +{{ end }} \ No newline at end of file diff --git a/charts/apps/ingress/values-dev.yaml b/charts/apps/ingress/values-dev.yaml index e69de29..430db83 100644 --- a/charts/apps/ingress/values-dev.yaml +++ b/charts/apps/ingress/values-dev.yaml @@ -0,0 +1,9 @@ + + +reverseProxy: + home: + port: "8123" + ip: "192.168.0.20" + yellow: + port: "8123" + ip: "192.168.0.23" \ No newline at end of file diff --git a/charts/apps/ingress/values.yaml b/charts/apps/ingress/values.yaml index dd474fa..16e869e 100644 --- a/charts/apps/ingress/values.yaml +++ b/charts/apps/ingress/values.yaml @@ -7,4 +7,6 @@ global: domain: "local" root: "k3s" tls: - enabled: false \ No newline at end of file + enabled: false + +reverseProxy: {} \ No newline at end of file diff --git a/charts/infrastructure/templates/argocd-appset.yml b/charts/infrastructure/templates/argocd-appset.yml index f0fecba..6cffe66 100644 --- a/charts/infrastructure/templates/argocd-appset.yml +++ b/charts/infrastructure/templates/argocd-appset.yml @@ -23,7 +23,7 @@ spec: destination: namespace: "{{`{{path.basename}}`}}" server: https://kubernetes.default.svc - project: main + project: main`` revisionHistoryLimit: 10 source: path: '{{`{{path}}`}}'