Merge pull request #3846 from sairameshv/OCPBUGS-17433

OCPBUGS-17433: Sync featuregate controller during the node config controller sync
openshift · Aug 11, 2023 · 63d7be1 · 63d7be1
2 parents 4048c66 + 1b56ad7
commit 63d7be1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/controller/kubelet-config/kubelet_config_features.go b/pkg/controller/kubelet-config/kubelet_config_features.go
@@ -196,7 +196,7 @@ func generateKubeConfigIgnFromFeatures(cc *mcfgv1.ControllerConfig, templatesDir
 	if err != nil {
 		return nil, err
 	}
-	if nodeConfig != nil {
+	if nodeConfig != nil && role == ctrlcommon.MachineConfigPoolWorker {
 		updateOriginalKubeConfigwithNodeConfig(nodeConfig, originalKubeConfig)
 	}
 

diff --git a/pkg/controller/kubelet-config/kubelet_config_nodes.go b/pkg/controller/kubelet-config/kubelet_config_nodes.go
@@ -177,6 +177,14 @@ func (ctrl *Controller) syncNodeConfigHandler(key string) error {
 		}
 	}
 
+	// syncing the featuregate controller
+	features, err := ctrl.featLister.Get(ctrlcommon.ClusterFeatureInstanceName)
+	if err == nil {
+		err := ctrl.syncFeatureHandler(features.Name)
+		if err != nil {
+			return fmt.Errorf("could not sync featuregate controller %v, err: %w", features, err)
+		}
+	}
 	return nil
 }