From cd2dd7c4fee7750d0757b017d3e5eefac8d01988 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Thu, 3 Apr 2025 18:55:37 +0200 Subject: [PATCH] fix(clustertool): correct bootstrap issue with nginx vs traefik and kps instead of operator --- clustertool/pkg/gencmd/bootstrap.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/clustertool/pkg/gencmd/bootstrap.go b/clustertool/pkg/gencmd/bootstrap.go index d3aad69e18c..2c7703acaa1 100644 --- a/clustertool/pkg/gencmd/bootstrap.go +++ b/clustertool/pkg/gencmd/bootstrap.go @@ -96,8 +96,7 @@ func RunBootstrap(args []string) { // Pulled directly from upstream, due to this being very complex and important {filepath.Join(helper.ClusterPath, "/kubernetes/kube-system/cilium/app"), false, true}, {filepath.Join(helper.ClusterPath, "/kubernetes/kube-system/kubelet-csr-approver/app"), false, true}, - {filepath.Join(helper.ClusterPath, "/kubernetes/system/traefik-crds/app"), false, false}, - {filepath.Join(helper.ClusterPath, "/kubernetes/system/prometheus-operator/app"), false, false}, + {filepath.Join(helper.ClusterPath, "/kubernetes/system/kube-prometheus-stack/app"), false, false}, } fluxhandler.InstallCharts(baseCharts, HelmRepos, true) @@ -154,7 +153,6 @@ func RunBootstrap(args []string) { prioCharts := []fluxhandler.HelmChart{ {filepath.Join(helper.ClusterPath, "/kubernetes/system/spegel/app"), false, true}, {filepath.Join(helper.ClusterPath, "/kubernetes/system/cert-manager/app"), false, false}, - {filepath.Join(helper.ClusterPath, "/kubernetes/system/kyverno/app"), false, false}, {filepath.Join(helper.ClusterPath, "/kubernetes/system/kubernetes-reflector/app"), false, false}, } fluxhandler.InstallCharts(prioCharts, HelmRepos, false) @@ -205,7 +203,8 @@ func RunBootstrap(args []string) { log.Info().Msg("Bootstrap: Installing included applications") postCharts := []fluxhandler.HelmChart{ - {filepath.Join(helper.ClusterPath, "/kubernetes/core/traefik/app"), false, true}, + {filepath.Join(helper.ClusterPath, "/kubernetes/networking/nginx-internal/app"), false, true}, + {filepath.Join(helper.ClusterPath, "/kubernetes/networking/nginx-external/app"), false, true}, {filepath.Join(helper.ClusterPath, "/kubernetes/core/blocky/app"), false, true}, {filepath.Join(helper.ClusterPath, "/kubernetes/apps/kubernetes-dashboard/app"), false, true}, }