mirrors/node-feature-discovery
mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-05 16:27:05 +00:00
Code Activity

Merge pull request #1013 from marquiz/devel/helm-args

Browse source 
Use single-dash format for nfd cmdline flags
This commit is contained in:
Kubernetes Prow Robot 2022-12-21 05:55:25 -08:00 • committed by GitHub
commit 8321ea3b67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
deployment/helm/node-feature-discovery/templates/master.yaml
View file

@ -76,16 +76,16 @@ spec:
{{- toYaml .Values.master.resources | nindent 12 }} {{- toYaml .Values.master.resources | nindent 12 }}
args: args:
{{- if .Values.master.instance | empty | not }} {{- if .Values.master.instance | empty | not }}
- "--instance={{ .Values.master.instance }}" - "-instance={{ .Values.master.instance }}"
{{- end }} {{- end }}
{{- if .Values.enableNodeFeatureApi }} {{- if .Values.enableNodeFeatureApi }}
- "-enable-nodefeature-api" - "-enable-nodefeature-api"
{{- end }} {{- end }}
{{- if .Values.master.extraLabelNs | empty | not }} {{- if .Values.master.extraLabelNs | empty | not }}
- "--extra-label-ns={{- join "," .Values.master.extraLabelNs }}" - "-extra-label-ns={{- join "," .Values.master.extraLabelNs }}"
{{- end }} {{- end }}
{{- if .Values.master.resourceLabels | empty | not }} {{- if .Values.master.resourceLabels | empty | not }}
- "--resource-labels={{- join "," .Values.master.resourceLabels }}" - "-resource-labels={{- join "," .Values.master.resourceLabels }}"
{{- end }} {{- end }}
{{- if .Values.master.crdController | kindIs "invalid" | not }} {{- if .Values.master.crdController | kindIs "invalid" | not }}
- "-crd-controller={{ .Values.master.crdController }}" - "-crd-controller={{ .Values.master.crdController }}"
@ -97,9 +97,9 @@ spec:
- "-featurerules-controller={{ .Values.master.featureRulesController }}" - "-featurerules-controller={{ .Values.master.featureRulesController }}"
{{- end }} {{- end }}
{{- if .Values.tls.enable }} {{- if .Values.tls.enable }}
- "--ca-file=/etc/kubernetes/node-feature-discovery/certs/ca.crt" - "-ca-file=/etc/kubernetes/node-feature-discovery/certs/ca.crt"
- "--key-file=/etc/kubernetes/node-feature-discovery/certs/tls.key" - "-key-file=/etc/kubernetes/node-feature-discovery/certs/tls.key"
- "--cert-file=/etc/kubernetes/node-feature-discovery/certs/tls.crt" - "-cert-file=/etc/kubernetes/node-feature-discovery/certs/tls.crt"
volumeMounts: volumeMounts:
- name: nfd-master-cert - name: nfd-master-cert
mountPath: "/etc/kubernetes/node-feature-discovery/certs" mountPath: "/etc/kubernetes/node-feature-discovery/certs"

14
deployment/helm/node-feature-discovery/templates/topologyupdater.yaml
View file

@ -41,19 +41,19 @@ spec:
- "nfd-topology-updater" - "nfd-topology-updater"
args: args:
{{- if .Values.topologyUpdater.updateInterval | empty | not }} {{- if .Values.topologyUpdater.updateInterval | empty | not }}
- "--sleep-interval={{ .Values.topologyUpdater.updateInterval }}" - "-sleep-interval={{ .Values.topologyUpdater.updateInterval }}"
{{- else }} {{- else }}
- "--sleep-interval=3s" - "-sleep-interval=3s"
{{- end }} {{- end }}
{{- if .Values.topologyUpdater.watchNamespace | empty | not }} {{- if .Values.topologyUpdater.watchNamespace | empty | not }}
- "--watch-namespace={{ .Values.topologyUpdater.watchNamespace }}" - "-watch-namespace={{ .Values.topologyUpdater.watchNamespace }}"
{{- else }} {{- else }}
- "--watch-namespace=*" - "-watch-namespace=*"
{{- end }} {{- end }}
{{- if .Values.tls.enable }} {{- if .Values.tls.enable }}
- "--ca-file=/etc/kubernetes/node-feature-discovery/certs/ca.crt" - "-ca-file=/etc/kubernetes/node-feature-discovery/certs/ca.crt"
- "--key-file=/etc/kubernetes/node-feature-discovery/certs/tls.key" - "-key-file=/etc/kubernetes/node-feature-discovery/certs/tls.key"
- "--cert-file=/etc/kubernetes/node-feature-discovery/certs/tls.crt" - "-cert-file=/etc/kubernetes/node-feature-discovery/certs/tls.crt"
{{- end }} {{- end }}
volumeMounts: volumeMounts:
- name: kubelet-config - name: kubelet-config

8
deployment/helm/node-feature-discovery/templates/worker.yaml
View file

@ -45,14 +45,14 @@ spec:
command: command:
- "nfd-worker" - "nfd-worker"
args: args:
- "--server={{ include "node-feature-discovery.fullname" . }}-master:{{ .Values.master.service.port }}" - "-server={{ include "node-feature-discovery.fullname" . }}-master:{{ .Values.master.service.port }}"
{{- if .Values.enableNodeFeatureApi }} {{- if .Values.enableNodeFeatureApi }}
- "-enable-nodefeature-api" - "-enable-nodefeature-api"
{{- end }} {{- end }}
{{- if .Values.tls.enable }} {{- if .Values.tls.enable }}
- "--ca-file=/etc/kubernetes/node-feature-discovery/certs/ca.crt" - "-ca-file=/etc/kubernetes/node-feature-discovery/certs/ca.crt"
- "--key-file=/etc/kubernetes/node-feature-discovery/certs/tls.key" - "-key-file=/etc/kubernetes/node-feature-discovery/certs/tls.key"
- "--cert-file=/etc/kubernetes/node-feature-discovery/certs/tls.crt" - "-cert-file=/etc/kubernetes/node-feature-discovery/certs/tls.crt"
{{- end }} {{- end }}
volumeMounts: volumeMounts:
- name: host-boot - name: host-boot

2
deployment/overlays/prune/master-job.yaml
View file

@ -20,6 +20,6 @@ spec:
command: command:
- "nfd-master" - "nfd-master"
args: args:
- "--prune" - "-prune"
restartPolicy: Never restartPolicy: Never

8
test/e2e/utils/pod/pod.go
View file

@ -363,10 +363,10 @@ func NFDTopologyUpdaterSpec(kc utils.KubeletConfig, opts ...SpecOption) *corev1.
ImagePullPolicy: pullPolicy(), ImagePullPolicy: pullPolicy(),
Command: []string{"nfd-topology-updater"}, Command: []string{"nfd-topology-updater"},
Args: []string{ Args: []string{
"--kubelet-config-uri=file:///podresources/config.yaml", "-kubelet-config-uri=file:///podresources/config.yaml",
"--podresources-socket=unix:///podresources/kubelet.sock", "-podresources-socket=unix:///podresources/kubelet.sock",
"--sleep-interval=3s", "-sleep-interval=3s",
"--watch-namespace=rte"}, "-watch-namespace=rte"},
Env: []corev1.EnvVar{ Env: []corev1.EnvVar{
{ {
Name: "NODE_NAME", Name: "NODE_NAME",