env: create tailscale-proxy for ingress-private IP with new env
diff --git a/core/installer/values-tmpl/headscale.yaml b/core/installer/values-tmpl/headscale.yaml
index 5b63d7e..c6c04a2 100644
--- a/core/installer/values-tmpl/headscale.yaml
+++ b/core/installer/values-tmpl/headscale.yaml
@@ -34,6 +34,7 @@
ipAddressPool: {{ .Global.Id }}-headscale
api:
port: 8585
+ rootDomain: {{ .Global.Domain }}
image:
repository: giolekva/headscale-api
tag: latest
diff --git a/core/installer/values-tmpl/tailscale-proxy.jsonschema b/core/installer/values-tmpl/tailscale-proxy.jsonschema
index 9452893..11f57c6 100644
--- a/core/installer/values-tmpl/tailscale-proxy.jsonschema
+++ b/core/installer/values-tmpl/tailscale-proxy.jsonschema
@@ -2,7 +2,8 @@
"type": "object",
"properties": {
"Username": { "type": "string", "default": "example" },
- "IPSubnet": { "type": "string", "default": "10.1.0.1" }
+ "IPSubnet": { "type": "string", "default": "10.1.0.1" },
+ "HostnameSuffix": { "type": "string", "default": "10.1.0.1" }
},
"additionalProperties": false
}
diff --git a/core/installer/values-tmpl/tailscale-proxy.yaml b/core/installer/values-tmpl/tailscale-proxy.yaml
index 5ceae75..1774f1e 100644
--- a/core/installer/values-tmpl/tailscale-proxy.yaml
+++ b/core/installer/values-tmpl/tailscale-proxy.yaml
@@ -9,14 +9,14 @@
namespace: {{ .Global.NamespacePrefix }}app-headscale
chart:
spec:
- chart: charts/tailscale
+ chart: charts/tailscale-proxy
sourceRef:
kind: GitRepository
name: pcloud
namespace: {{ .Global.Id }}
interval: 1m0s
values:
- hostname: {{ .Global.PCloudEnvName }}-{{ .Global.Id }}-internal-proxy
+ hostname: {{ .Global.Id }}-{{ .Values.HostnameSuffix }}
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 }}