From c090c7a3d752ed548e7834535d7c51cd96e0e81d Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 3 Feb 2024 14:00:48 -0500 Subject: [PATCH] gl router --- .../ingresses/templates/reverse-proxy.yaml | 18 +++++++++++++++--- k8s/apps/ingresses/values-prod.yaml | 6 ++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/k8s/apps/ingresses/templates/reverse-proxy.yaml b/k8s/apps/ingresses/templates/reverse-proxy.yaml index cdbd13b..a407b4f 100644 --- a/k8s/apps/ingresses/templates/reverse-proxy.yaml +++ b/k8s/apps/ingresses/templates/reverse-proxy.yaml @@ -8,8 +8,12 @@ subsets: - addresses: - ip: "{{ $data.ip }}" ports: - - port: {{ $data.port }} + - port: {{ $data.port | default 80 }} protocol: TCP + {{ range $p := ($data.additionalPorts | default [] )}} + - port: "{{ $p.port }}" + protocol: "{{ $p.protocol | default 'TCP' }}" + {{ end }}` --- apiVersion: v1 kind: Service @@ -20,11 +24,19 @@ spec: ports: - port: 80 protocol: TCP - targetPort: {{ $data.port }} - + targetPort: {{ $data.port | default 80 }} + {{ range $p := ($data.additionalPorts | default [])}} + - port: "{{ $p.port }}" + protocol: "{{ $p.protocol | default 'TCP' }}" + targetPort: "{{ $p.port }}" + name: "{{ $p.name | default $p.port }}" + {{ end }}` +{{ 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/k8s/apps/ingresses/values-prod.yaml b/k8s/apps/ingresses/values-prod.yaml index 31ecefd..e0b4e8f 100644 --- a/k8s/apps/ingresses/values-prod.yaml +++ b/k8s/apps/ingresses/values-prod.yaml @@ -21,8 +21,14 @@ reverseProxy: icon: https://basement.home.sosnovsky.ca/static/icons/favicon.ico scrypted: + disableIngress: true ip: "192.168.0.200" port: "11080" + glroutermetrics: + disableIngress: true + ip: "192.168.8.1" + port: "11080" + cloudflare: enabled: true \ No newline at end of file