Address reviewer requested changes

Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
Mellanox · Jul 4, 2023 · 52eeae6 · 52eeae6
1 parent d1c2b99
commit 52eeae6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/deployment/network-operator/templates/upgrade-crd.yaml b/deployment/network-operator/templates/upgrade-crd.yaml
@@ -77,7 +77,7 @@ spec:
               kubectl apply -f /crds/sriov-network-operator;
         {{- end }}
         {{- if .Values.nfd.enabled }}
-              if ! kubectl get crd | grep -E "nodefeaturerules\.nfd\.k8s-sigs\.io|nodefeatures\.nfd\.k8s-sigs\.io" ; then kubectl apply -f /crds/node-feature-discovery; fi
+              kubectl apply -f /crds/node-feature-discovery;
         {{- end }}
       restartPolicy: OnFailure
 {{- end }}
diff --git a/deployment/network-operator/values.yaml b/deployment/network-operator/values.yaml
@@ -33,16 +33,18 @@ sriovNetworkOperator:
 
 # Node Feature discovery chart related values
 node-feature-discovery:
-  enableNodeFeatureApi: true
+  enableNodeFeatureApi: false
   worker:
     serviceAccount:
       name: node-feature-discovery
       # disable creation to avoid duplicate serviceaccount creation by master spec below
       create: false
     tolerations:
     - key: "node-role.kubernetes.io/master"
-      operator: "Equal"
-      value: ""
+      operator: "Exists"
+      effect: "NoSchedule"
+    - key: "node-role.kubernetes.io/control-plane"
+      operator: "Exists"
       effect: "NoSchedule"
     - key: nvidia.com/gpu
       operator: Exists
@@ -59,6 +61,7 @@ node-feature-discovery:
           deviceLabelFields:
           - vendor
   master:
+    instance: "nvidia.networking"
     serviceAccount:
       name: node-feature-discovery
       create: true

diff --git a/hack/templates/values/values.template b/hack/templates/values/values.template
@@ -18,7 +18,6 @@
 
 nfd:
   enabled: true
-  nodeFeatureRules: false
 
 psp:
   enabled: false
@@ -33,16 +32,18 @@ sriovNetworkOperator:
 
 # Node Feature discovery chart related values
 node-feature-discovery:
-  enableNodeFeatureApi: true
+  enableNodeFeatureApi: false
   worker:
     serviceAccount:
       name: node-feature-discovery
       # disable creation to avoid duplicate serviceaccount creation by master spec below
       create: false
     tolerations:
     - key: "node-role.kubernetes.io/master"
-      operator: "Equal"
-      value: ""
+      operator: "Exists"
+      effect: "NoSchedule"
+    - key: "node-role.kubernetes.io/control-plane"
+      operator: "Exists"
       effect: "NoSchedule"
     - key: nvidia.com/gpu
       operator: Exists
@@ -59,6 +60,7 @@ node-feature-discovery:
           deviceLabelFields:
           - vendor
   master:
+    instance: "nvidia.networking"
     serviceAccount:
       name: node-feature-discovery
       create: true