Merge pull request #237 from chr15p/master-taints-fix2

add enableTaints option to enable taint support in the crd

Author: k8s-ci-robot

api/v1/nodefeaturediscovery_types.go

@@ -70,6 +70,12 @@ type NodeFeatureDiscoverySpec struct {
 	// as annotations, extended resources and taints) from the cluster nodes.
 	// +optional
 	PruneOnDelete bool `json:"prunerOnDelete"`
+
+	// EnableTaints enables the enable the experimental tainting feature
+	// This allows keeping nodes with specialized hardware away from running general workload i
+	// and instead leave them for workloads that need the specialized hardware.
+	// +optional
+	EnableTaints bool `json:"enableTaints"`
 }
 
 // OperandSpec describes configuration options for the operand

config/crd/bases/nfd.kubernetes.io_nodefeaturediscoveries.yaml

@@ -36,6 +36,12 @@ spec:
           spec:
             description: NodeFeatureDiscoverySpec defines the desired state of NodeFeatureDiscovery
             properties:
+              enableTaints:
+                description: EnableTaints enables the enable the experimental tainting
+                  feature This allows keeping nodes with specialized hardware away
+                  from running general workload i and instead leave them for workloads
+                  that need the specialized hardware.
+                type: boolean
               extraLabelNs:
                 description: ExtraLabelNs defines the list of of allowed extra label
                   namespaces By default, only allow labels in the default `feature.node.kubernetes.io`

config/samples/nfd.kubernetes.io_v1_nodefeaturediscovery.yaml

@@ -5,6 +5,8 @@ metadata:
   namespace: node-feature-discovery-operator
 spec:
   instance: "" # instance is empty by default
+  ## NOTE: Taints support is experimental.
+  #enableTaints: true
   #labelWhiteList: ""
   #extraLabelNs:
   #  - "example.com"

deploy/helm/nfd-operator/crds/nfd-api-crds.yaml

@@ -37,6 +37,12 @@ spec:
           spec:
             description: NodeFeatureDiscoverySpec defines the desired state of NodeFeatureDiscovery
             properties:
+              enableTaints:
+                description: EnableTaints enables the enable the experimental tainting
+                  feature This allows keeping nodes with specialized hardware away
+                  from running general workload i and instead leave them for workloads
+                  that need the specialized hardware.
+                type: boolean
               extraLabelNs:
                 description: ExtraLabelNs defines the list of of allowed extra label
                   namespaces By default, only allow labels in the default `feature.node.kubernetes.io`
@@ -691,4 +697,4 @@ spec:
         - spec
         type: object
     served: true
-    storage: true
+    storage: true

internal/deployment/deployment.go

@@ -224,6 +224,10 @@ func getArgs(nfdInstance *nfdv1.NodeFeatureDiscovery) []string {
 		args = append(args, fmt.Sprintf("--label-whitelist=%s", nfdInstance.Spec.LabelWhiteList))
 	}
 
+	if nfdInstance.Spec.EnableTaints {
+		args = append(args, "--enable-taints")
+	}
+
 	return args
 }