Skip to content

Commit 8cdedf9

Browse files
authored
Merge pull request #1365 from marquiz/devel/helm-fix-nf-api
deployment/helm: fix handling of enableNodeFeatureApi parameter
2 parents 7c2110c + 8b207ca commit 8cdedf9

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,11 @@ spec:
8686
- "-instance={{ .Values.master.instance }}"
8787
{{- end }}
8888
- "-port={{ .Values.master.port | default "8080" }}"
89-
{{- if .Values.enableNodeFeatureApi }}
90-
- "-enable-nodefeature-api"
91-
{{- if gt (int .Values.master.replicaCount) 1 }}
89+
{{- if not .Values.enableNodeFeatureApi }}
90+
- "-enable-nodefeature-api=false"
91+
{{- else if gt (int .Values.master.replicaCount) 1 }}
9292
- "-enable-leader-election"
9393
{{- end }}
94-
{{- end }}
9594
{{- if .Values.master.extraLabelNs | empty | not }}
9695
- "-extra-label-ns={{- join "," .Values.master.extraLabelNs }}"
9796
{{- end }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ spec:
5050
- "nfd-worker"
5151
args:
5252
- "-server={{ include "node-feature-discovery.fullname" . }}-master:{{ .Values.master.service.port }}"
53-
{{- if .Values.enableNodeFeatureApi }}
54-
- "-enable-nodefeature-api"
53+
{{- if not .Values.enableNodeFeatureApi }}
54+
- "-enable-nodefeature-api=false"
5555
{{- end }}
5656
{{- if .Values.tls.enable }}
5757
- "-ca-file=/etc/kubernetes/node-feature-discovery/certs/ca.crt"

0 commit comments

Comments
 (0)