From ae7f7ca3d0ff2535933268988c942d2f62215974 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Fri, 25 Oct 2024 10:44:24 +0200 Subject: [PATCH] fix(clustertool): ensure dashboard ip is mandatory again and remove spegel ip --- clustertool/embed/generic/base/clusterenv.yaml | 8 ++------ clustertool/pkg/initfiles/clusterenv.go | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/clustertool/embed/generic/base/clusterenv.yaml b/clustertool/embed/generic/base/clusterenv.yaml index a296b8121f6..f48b615ae06 100644 --- a/clustertool/embed/generic/base/clusterenv.yaml +++ b/clustertool/embed/generic/base/clusterenv.yaml @@ -7,12 +7,8 @@ MASTER1IP: 192.168.20.210 GATEWAY: 192.168.20.1 # Defines the ip range metallb is allowed to use METALLB_RANGE: 192.168.20.211-192.168.20.219 -# (Optional) Sets the Kubernetes Dashboard IP. Has to be within METALLB_RANGE and not in use -# Comment out or set to "" to disable explosing KubernetesDashboard -# DASHBOARD_IP: 192.168.20.211 -# (Optional) Sets the IP on which a Spegel using loadbalancer service is made available -# Comment out or set to "" to disable explosing Spegel via Loadbalancer (still available using nodePort by default) -#SPEGEL_IP: 192.168.20.212 +# Sets the Kubernetes Dashboard IP. Has to be within METALLB_RANGE and not in use +DASHBOARD_IP: 192.168.20.211 # Used to automatically generate a sshkey-pair for FluxCD # Has to start with ssh:// GITHUB_REPOSITORY: "" diff --git a/clustertool/pkg/initfiles/clusterenv.go b/clustertool/pkg/initfiles/clusterenv.go index 1b366fdbf1f..c25207193c5 100644 --- a/clustertool/pkg/initfiles/clusterenv.go +++ b/clustertool/pkg/initfiles/clusterenv.go @@ -228,6 +228,7 @@ func CheckEnvVariables() { "VIP", "MASTER1IP_IP", "MASTER1IP_NETMASK", + "DASHBOARD_IP", "GATEWAY", "METALLB_RANGE", "PODNET",