Merge pull request #484 from wizhaoredhat/fix_plugin_ds_node_selector

Fix Plugin Config Daemon node selector
k8snetworkplumbingwg · Sep 28, 2023 · 532df8a · 532df8a
2 parents 22c7a2e + 48b2aeb
commit 532df8a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/bindata/manifests/plugins/sriov-device-plugin.yaml b/bindata/manifests/plugins/sriov-device-plugin.yaml
@@ -26,8 +26,9 @@ spec:
     spec:
       hostNetwork: true
       nodeSelector:
-        kubernetes.io/os: linux
-        node-role.kubernetes.io/worker:
+        {{- range $key, $value := .NodeSelectorField }}
+          {{ $key }}: {{ $value }}
+        {{- end }}
       tolerations:
       - operator: Exists
       serviceAccountName: sriov-device-plugin
@@ -76,7 +77,7 @@ spec:
           hostPath:
             path: /var/lib/kubelet/plugins_registry
         - name: config-volume
-          configMap: 
+          configMap:
             name: device-plugin-config
         - name: device-info
           hostPath:

diff --git a/controllers/helper.go b/controllers/helper.go
@@ -56,3 +56,8 @@ func formatJSON(str string) (string, error) {
 	}
 	return prettyJSON.String(), nil
 }
+
+func GetDefaultNodeSelector() map[string]string {
+	return map[string]string{"node-role.kubernetes.io/worker": "",
+		"kubernetes.io/os": "linux"}
+}
diff --git a/controllers/sriovnetworknodepolicy_controller.go b/controllers/sriovnetworknodepolicy_controller.go
@@ -371,6 +371,7 @@ func (r *SriovNetworkNodePolicyReconciler) syncPluginDaemonObjs(ctx context.Cont
 	data.Data["ReleaseVersion"] = os.Getenv("RELEASEVERSION")
 	data.Data["ResourcePrefix"] = os.Getenv("RESOURCE_PREFIX")
 	data.Data["ImagePullSecrets"] = GetImagePullSecrets()
+	data.Data["NodeSelectorField"] = GetDefaultNodeSelector()
 
 	objs, err := renderDsForCR(constants.PluginPath, &data)
 	if err != nil {

diff --git a/controllers/sriovoperatorconfig_controller.go b/controllers/sriovoperatorconfig_controller.go
@@ -154,9 +154,6 @@ func (r *SriovOperatorConfigReconciler) syncPluginDaemonSet(ctx context.Context,
 
 	names := []string{"sriov-cni", "sriov-device-plugin"}
 
-	if len(dc.Spec.ConfigDaemonNodeSelector) == 0 {
-		return nil
-	}
 	for _, name := range names {
 		err := r.Client.Get(ctx, types.NamespacedName{Name: name, Namespace: namespace}, ds)
 		if err != nil {
@@ -166,7 +163,11 @@ func (r *SriovOperatorConfigReconciler) syncPluginDaemonSet(ctx context.Context,
 			logger.Error(err, "Couldn't get daemonset", "name", name)
 			return err
 		}
-		ds.Spec.Template.Spec.NodeSelector = dc.Spec.ConfigDaemonNodeSelector
+		if len(dc.Spec.ConfigDaemonNodeSelector) == 0 {
+			ds.Spec.Template.Spec.NodeSelector = GetDefaultNodeSelector()
+		} else {
+			ds.Spec.Template.Spec.NodeSelector = dc.Spec.ConfigDaemonNodeSelector
+		}
 		err = r.Client.Update(ctx, ds)
 		if err != nil {
 			logger.Error(err, "Couldn't update daemonset", "name", name)