Merge pull request #2310 from k8s-infra-cherrypick-robot/cherry-pick-2309-to-release-0.18

[release-0.18] helm: fixes

Author: k8s-ci-robot

deployment/helm/node-feature-discovery/templates/master-pdb.yaml

@@ -12,6 +12,6 @@ spec:
     matchLabels:
       {{- include "node-feature-discovery.selectorLabels" . | nindent 6 }}
       role: master
-{{- toYaml (omit .Values.master.podDisruptionBudget "enable") | indent 2 }}
+{{- toYaml (omit .Values.master.podDisruptionBudget "enable") | nindent 2 }}
 {{- end }}
 {{- end }}

deployment/helm/node-feature-discovery/templates/master.yaml

@@ -105,7 +105,7 @@ spec:
               fieldRef:
                 fieldPath: spec.nodeName
         {{- with .Values.master.extraEnvs }}
-          {{- toYaml . | nindent 8 }}
+          {{- toYaml . | nindent 10 }}
         {{- end}}
           command:
             - "nfd-master"
@@ -125,9 +125,6 @@ spec:
             {{- if .Values.master.enableTaints }}
             - "-enable-taints"
             {{- end }}
-            {{- if .Values.master.featureRulesController | kindIs "invalid" | not }}
-            - "-featurerules-controller={{ .Values.master.featureRulesController }}"
-            {{- end }}
             {{- if .Values.master.resyncPeriod }}
             - "-resync-period={{ .Values.master.resyncPeriod }}"
             {{- end }}

deployment/helm/node-feature-discovery/templates/nfd-gc-pdb.yaml

@@ -12,6 +12,6 @@ spec:
     matchLabels:
       {{- include "node-feature-discovery.selectorLabels" . | nindent 6 }}
       role: gc
-{{- toYaml (omit .Values.gc.podDisruptionBudget "enable") | indent 2 }}
+{{- toYaml (omit .Values.gc.podDisruptionBudget "enable") | nindent 2 }}
 {{- end }}
 {{- end }}

deployment/helm/node-feature-discovery/values.yaml

@@ -71,12 +71,10 @@ master:
   ### <NFD-MASTER-CONF-END-DO-NOT-REMOVE>
   port: 8080
   instance:
-  featureApi:
   resyncPeriod:
   denyLabelNs: []
   extraLabelNs: []
   enableTaints: false
-  featureRulesController: null
   nfdApiParallelism: null
   deploymentAnnotations: {}
   replicaCount: 1
@@ -595,7 +593,7 @@ gc:
   podDisruptionBudget:
     enable: false
     minAvailable: 1
-    unhealthyPodEvictionPolicy: Always
+    unhealthyPodEvictionPolicy: AlwaysAllow
 
   # specify how many old ReplicaSets for the Deployment to retain.
   revisionHistoryLimit: