installer: combine private ingress and proxy into private-network
diff --git a/core/installer/welcome/env.go b/core/installer/welcome/env.go
index 3d3e332..bafa813 100644
--- a/core/installer/welcome/env.go
+++ b/core/installer/welcome/env.go
@@ -542,27 +542,19 @@
}
}
{
- app, err := appsRepo.Find("ingress-private")
- if err != nil {
- return err
- }
- if err := appManager.Install(*app, nsGen, emptySuffixGen, map[string]any{}); err != nil {
- return err
- }
- }
- {
- app, err := appsRepo.Find("tailscale-proxy")
+ app, err := appsRepo.Find("private-network")
if err != nil {
return err
}
if err := appManager.Install(*app, nsGen, emptySuffixGen, map[string]any{
- "Hostname": "private-network-proxy",
- "Username": "private-network-proxy",
- "IPSubnet": "10.1.0.0/24",
+ "PrivateNetwork": map[string]any{
+ "Hostname": "private-network-proxy",
+ "Username": "private-network-proxy",
+ "IPSubnet": "10.1.0.0/24",
+ },
}); err != nil {
return err
}
- // TODO(giolekva): headscale accept routes
}
{
app, err := appsRepo.Find("certificate-issuer-public")