[no ci] wip

edgelesssys · Nov 2, 2023 · 7b27ee4 · 7b27ee4
1 parent ed4e9f3
commit 7b27ee4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/bootstrapper/internal/kubernetes/k8sapi/k8sutil.go b/bootstrapper/internal/kubernetes/k8sapi/k8sutil.go
@@ -222,6 +222,7 @@ func (k *KubernetesUtil) WaitForCilium(ctx context.Context, log *logger.Logger)
 // FixCilium fixes https://github.com/cilium/cilium/issues/19958
 // Instead of a rollout restart of the Cilium DaemonSet, it only restarts the local Cilium Pod.
 func (k *KubernetesUtil) FixCilium(ctx context.Context) error {
+	return nil
 	// get cilium container id
 	out, err := exec.CommandContext(ctx, "/run/state/bin/crictl", "ps", "--name", "cilium-agent", "-q").CombinedOutput()
 	if err != nil {

diff --git a/cli/internal/helm/loader.go b/cli/internal/helm/loader.go
@@ -148,7 +148,7 @@ func (i *chartLoader) loadReleases(conformanceMode bool, helmWaitMode WaitMode,
 	}
 	conServicesRelease.Values = mergeMaps(conServicesRelease.Values, svcVals)
 
-	releases := releaseApplyOrder{ciliumRelease, conServicesRelease, certManagerRelease}
+	releases := releaseApplyOrder{ /*ciliumRelease,*/ conServicesRelease, certManagerRelease}
 	if i.config.DeployCSIDriver() {
 		csiRelease, err := i.loadRelease(csiInfo, helmWaitMode)
 		if err != nil {