diff --git a/charts/apps/ingress/templates/reverse-proxy.yaml b/charts/apps/ingress/templates/reverse-proxy.yaml index da5dbb0..f2223a5 100644 --- a/charts/apps/ingress/templates/reverse-proxy.yaml +++ b/charts/apps/ingress/templates/reverse-proxy.yaml @@ -21,6 +21,7 @@ spec: - 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) -}} @@ -29,4 +30,28 @@ spec: {{ end }} +{{ if $data.useTailscale }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: tailscale-{{ $prefix }} + namespace: {{ $.Release.Namespace }} +spec: + ingressClassName: tailscale + tls: + - hosts: + - {{ $prefix }} + rules: + - http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: "reverse-proxy-{{$prefix}}" + port: + number: 80 +{{ end }} + {{ end }} \ No newline at end of file diff --git a/charts/apps/ingress/values-prod.yaml b/charts/apps/ingress/values-prod.yaml index fd475c3..b56ae80 100644 --- a/charts/apps/ingress/values-prod.yaml +++ b/charts/apps/ingress/values-prod.yaml @@ -13,6 +13,8 @@ reverseProxy: scrypted: ip: 10.0.10.7 port: 11080 + useTailscale: true + disableIngress: true overrides: group: "Cameras" services: @@ -27,10 +29,6 @@ services: group: "Admin" tailScaleServices: - # - name: dummy - # namespace: "dummy" - # selector: - # app: dummy - name: "argocd" namespace: plugin-argo-cd selector: