Merge pull request K0rdent#390 from zerospiel/incorrect_capi_enable

Fix incorrect condition to enable CAPI
eromanova · Sep 25, 2024 · c81b512 · c81b512
2 parents bcb3a7c + f6f5165
commit c81b512
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/internal/controller/management_controller.go b/internal/controller/management_controller.go
@@ -309,9 +309,13 @@ func (r *ManagementReconciler) enableAdditionalComponents(ctx context.Context, m
 
 	// Enable HMC capi operator only if it was not explicitly disabled in the config to
 	// support installation with existing cluster api operator
-	if v, ok := capiOperatorValues["enabled"].(bool); ok && v {
-		l.Info("Enabling cluster API operator")
-		capiOperatorValues["enabled"] = true
+	{
+		enabledV, enabledExists := capiOperatorValues["enabled"]
+		enabledValue, castedOk := enabledV.(bool)
+		if !enabledExists || !castedOk || enabledValue {
+			l.Info("Enabling cluster API operator")
+			capiOperatorValues["enabled"] = true
+		}
 	}
 	config["cluster-api-operator"] = capiOperatorValues