charts: headscale global/app config
diff --git a/charts/headscale/templates/headscale.yaml b/charts/headscale/templates/headscale.yaml
index db3a81e..b71362d 100644
--- a/charts/headscale/templates/headscale.yaml
+++ b/charts/headscale/templates/headscale.yaml
@@ -1,18 +1,3 @@
-# apiVersion: cert-manager.io/v1
-# kind: Certificate
-# metadata:
-# name: headscale.{{ .Values.domain }}
-# namespace: {{ .Release.Namespace }}
-# annotations:
-# helm.sh/resource-policy: keep
-# spec:
-# dnsNames:
-# - 'headscale.{{ .Values.domain }}'
-# issuerRef:
-# name: {{ .Values.certificateIssuer }}
-# kind: ClusterIssuer
-# secretName: cert-headscale.{{ .Values.domain }}
-# ---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
@@ -25,10 +10,10 @@
ingressClassName: {{ .Values.ingressClassName }}
tls:
- hosts:
- - headscale.{{ .Values.domain }}
- secretName: cert-headscale.{{ .Values.domain }}
+ - {{ .Values.domain }}
+ secretName: cert-{{ .Values.domain }}
rules:
- - host: headscale.{{ .Values.domain }}
+ - host: {{ .Values.domain }}
http:
paths:
- path: /
@@ -38,35 +23,6 @@
name: headscale
port:
name: http
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- annotations:
- acme.cert-manager.io/http01-edit-in-place: "true"
- cert-manager.io/cluster-issuer: {{ .Values.certificateIssuer}}
- nginx.ingress.kubernetes.io/ssl-redirect: "true"
- nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
- name: ingress-grpc
- namespace: {{ .Release.Namespace }}
-spec:
- ingressClassName: {{ .Values.ingressClassName }}
- tls:
- - hosts:
- - grpc.headscale.{{ .Values.domain }}
- secretName: cert-headscale.{{ .Values.domain }}
- rules:
- - host: grpc.headscale.{{ .Values.domain }}
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: headscale
- port:
- name: grpc
----
apiVersion: v1
kind: Service
metadata:
@@ -81,10 +37,6 @@
port: 80
targetPort: http
protocol: TCP
- - name: grpc
- port: 50443
- targetPort: grpc
- protocol: TCP
---
apiVersion: v1
kind: PersistentVolumeClaim
diff --git a/charts/headscale/values.yaml b/charts/headscale/values.yaml
index 60a25d0..76af449 100644
--- a/charts/headscale/values.yaml
+++ b/charts/headscale/values.yaml
@@ -6,4 +6,4 @@
size: 5Gi
ingressClassName: pcloud-ingress-public
certificateIssuer: lekva-public
-domain: lekva.me
+domain: headscale.example.com
diff --git a/core/installer/values-tmpl/headscale.yaml b/core/installer/values-tmpl/headscale.yaml
index 82e8712..807ed63 100644
--- a/core/installer/values-tmpl/headscale.yaml
+++ b/core/installer/values-tmpl/headscale.yaml
@@ -2,7 +2,7 @@
kind: HelmRelease
metadata:
name: headscale
- namespace: {{ .Values.NamespacePrefix }}app-headscale
+ namespace: {{ .Global.NamespacePrefix }}app-headscale
spec:
chart:
spec:
@@ -10,7 +10,7 @@
sourceRef:
kind: GitRepository
name: pcloud
- namespace: {{ .Values.Id }}
+ namespace: {{ .Global.Id }}
interval: 1m0s
values:
image:
@@ -20,5 +20,5 @@
storage:
size: 5Gi
ingressClassName: pcloud-ingress-public
- certificateIssuer: lekva-public
- domain: {{ .Values.Domain }}
+ certificateIssuer: {{ .Global.Id }}-public
+ domain: {{ .Values.Subdomain }}.{{ .Global.Doman }}