hack: fix janitor to properly set kubeconfig and log an error

kubernetes-sigs · Feb 6, 2024 · cb271af · cb271af
1 parent ce6b82b
commit cb271af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/hack/clean-ci.sh b/hack/clean-ci.sh
@@ -58,5 +58,8 @@ function wait_for_ipam_reachable() {
 }
 wait_for_ipam_reachable
 
+# Set kubeconfig for IPAM cleanup
+export KUBECONFIG="${E2E_IPAM_KUBECONFIG}"
+
 # Run e2e tests
 make clean-ci
diff --git a/hack/tools/janitor/main.go b/hack/tools/janitor/main.go
@@ -92,7 +92,10 @@ func run(ctx context.Context) error {
 	defer vSphereClients.logout(ctx)
 
 	// Create controller-runtime client for IPAM.
-	restConfig := ctrl.GetConfigOrDie()
+	restConfig, err := ctrl.GetConfig()
+	if err != nil {
+		return errors.Wrap(err, "unable to get kubeconfig")
+	}
 	ipamClient, err := client.New(restConfig, client.Options{Scheme: ipamScheme})
 	if err != nil {
 		return errors.Wrap(err, "creating IPAM client")