installer: combine private ingress and proxy into private-network
diff --git a/core/installer/values-tmpl/ingress-private.jsonschema b/core/installer/values-tmpl/ingress-private.jsonschema
deleted file mode 100644
index f42d895..0000000
--- a/core/installer/values-tmpl/ingress-private.jsonschema
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "type": "object",
- "properties": {
- },
- "additionalProperties": false
-}
diff --git a/core/installer/values-tmpl/private-network.jsonschema b/core/installer/values-tmpl/private-network.jsonschema
new file mode 100644
index 0000000..7f40a40
--- /dev/null
+++ b/core/installer/values-tmpl/private-network.jsonschema
@@ -0,0 +1,14 @@
+{
+ "type": "object",
+ "properties": {
+ "PrivateNetwork": {
+ "type": "object",
+ "properties": {
+ "Hostname": { "type": "string", "default": "10.1.0.1" },
+ "Username": { "type": "string", "default": "example" },
+ "IPSubnet": { "type": "string", "default": "10.1.0.1" }
+ }
+ }
+ },
+ "additionalProperties": false
+}
diff --git a/core/installer/values-tmpl/ingress-private.md b/core/installer/values-tmpl/private-network.md
similarity index 100%
rename from core/installer/values-tmpl/ingress-private.md
rename to core/installer/values-tmpl/private-network.md
diff --git a/core/installer/values-tmpl/tailscale-proxy.jsonschema b/core/installer/values-tmpl/tailscale-proxy.jsonschema
deleted file mode 100644
index 11f57c6..0000000
--- a/core/installer/values-tmpl/tailscale-proxy.jsonschema
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "type": "object",
- "properties": {
- "Username": { "type": "string", "default": "example" },
- "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.md b/core/installer/values-tmpl/tailscale-proxy.md
deleted file mode 100644
index 14a1db6..0000000
--- a/core/installer/values-tmpl/tailscale-proxy.md
+++ /dev/null
@@ -1,2 +0,0 @@
-hostname: {{ .Global.PCloudEnvName }}-{{ .Global.Id }}-internal-proxy
-loginServer: headscale.{{ .Global.Domain }}
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