installer: combine private ingress and proxy into private-network
diff --git a/core/installer/values-tmpl/tailscale-proxy.yaml b/core/installer/values-tmpl/tailscale-proxy.yaml
index 904f850..047c196 100644
--- a/core/installer/values-tmpl/tailscale-proxy.yaml
+++ b/core/installer/values-tmpl/tailscale-proxy.yaml
@@ -16,9 +16,9 @@
namespace: {{ .Global.Id }}
interval: 1m0s
values:
- hostname: {{ .Values.Hostname}}
+ hostname: {{ .Values.PrivateNetwork.Hostname}}
apiServer: http://headscale-api.{{ .Global.Id }}-app-headscale.svc.cluster.local
loginServer: https://headscale.{{ .Global.Domain }} # TODO(gio): take headscale subdomain from configuration
- ipSubnet: {{ .Values.IPSubnet }}
- username: {{ .Values.Username }}
+ ipSubnet: {{ .Values.PrivateNetwork.IPSubnet }}
+ username: {{ .Values.PrivateNetwork.Username }} # TODO(gio): maybe install headscale-user chart separately?
preAuthKeySecret: headscale-preauth-key