Merge pull request #1726 from marquiz/devel/helm-cmdline-args

deployment/helm: enable specifying additional cmdline args
kubernetes-sigs · Jul 9, 2024 · d2456e1 · d2456e1
2 parents b88a90d + a088de7
commit d2456e1
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 0 deletions.
diff --git a/deployment/helm/node-feature-discovery/templates/master.yaml b/deployment/helm/node-feature-discovery/templates/master.yaml
@@ -115,6 +115,9 @@ spec:
             - "-feature-gates={{ $key }}={{ $value }}"
             {{- end }}
             - "-metrics={{ .Values.master.metricsPort  | default "8081" }}"
+            {{- with .Values.master.args }}
+            {{- toYaml . | nindent 12 }}
+            {{- end }}
           volumeMounts:
             {{- if .Values.tls.enable }}
             - name: nfd-master-cert

diff --git a/deployment/helm/node-feature-discovery/templates/nfd-gc.yaml b/deployment/helm/node-feature-discovery/templates/nfd-gc.yaml
@@ -53,6 +53,9 @@ spec:
           {{- if .Values.gc.interval | empty | not }}
           - "-gc-interval={{ .Values.gc.interval }}"
           {{- end }}
+          {{- with .Values.gc.args }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
         resources:
       {{- toYaml .Values.gc.resources | nindent 12 }}
         securityContext:

diff --git a/deployment/helm/node-feature-discovery/templates/topologyupdater.yaml b/deployment/helm/node-feature-discovery/templates/topologyupdater.yaml
@@ -91,6 +91,9 @@ spec:
           - "-kubelet-state-dir="
           {{- end }}
           - -metrics={{ .Values.topologyUpdater.metricsPort | default "8081"}}
+          {{- with .Values.topologyUpdater.args }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
         ports:
           - name: metrics
             containerPort: {{ .Values.topologyUpdater.metricsPort | default "8081"}}

diff --git a/deployment/helm/node-feature-discovery/templates/worker.yaml b/deployment/helm/node-feature-discovery/templates/worker.yaml
@@ -85,6 +85,9 @@ spec:
         - "-feature-gates={{ $key }}={{ $value }}"
 {{- end }}
         - "-metrics={{ .Values.worker.metricsPort | default "8081"}}"
+        {{- with .Values.gc.args }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         ports:
           - name: metrics
             containerPort: {{ .Values.worker.metricsPort | default "8081"}}

diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml
@@ -20,6 +20,7 @@ priorityClassName: ""
 
 master:
   enable: true
+  args: []
   config: ### <NFD-MASTER-CONF-START-DO-NOT-REMOVE>
     # noPublish: false
     # autoDefaultNs: true
@@ -141,6 +142,7 @@ master:
 
 worker:
   enable: true
+  args: []
   config: ### <NFD-WORKER-CONF-START-DO-NOT-REMOVE>
     #core:
     #  labelWhiteList:
@@ -458,6 +460,7 @@ topologyUpdater:
 ### <NFD-TOPOLOGY-UPDATER-CONF-END-DO-NOT-REMOVE>
 
   enable: false
+  args: []
   createCRDs: false
 
   serviceAccount:
@@ -512,6 +515,7 @@ topologyUpdater:
 
 gc:
   enable: true
+  args: []
   replicaCount: 1
 
   serviceAccount:

diff --git a/docs/deployment/helm.md b/docs/deployment/helm.md
@@ -143,6 +143,7 @@ API's you need to install the prometheus operator in your cluster.
 | `master.deploymentAnnotations` | dict | {}                                      | NFD master deployment [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) |
 | `master.nfdApiParallelism` | integer | 10                                      | Specifies the maximum number of concurrent node updates. |
 | `master.config`            | dict    |                                         | NFD master [configuration](../reference/master-configuration-reference) |
+| `master.args`              | array   | []                                      | Additional [command line arguments](../reference/master-commandline-reference.md) to pass to nfd-master |
 
 ### Worker pod parameters
 
@@ -166,6 +167,7 @@ API's you need to install the prometheus operator in your cluster.
 | `worker.priorityClassName`        | string |         | NFD worker pod [priority class](https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/)                                                                                    |
 | `worker.annotations`              | dict   | {}      | NFD worker pod [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)                                                                                         |
 | `worker.daemonsetAnnotations`     | dict   | {}      | NFD worker daemonset [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)                                                                                  |
+| `worker.args`                     | array   | []     | Additional [command line arguments](../reference/worker-commandline-reference.md) to pass to nfd-worker |
 
 ### Topology updater parameters
 
@@ -195,6 +197,7 @@ API's you need to install the prometheus operator in your cluster.
 | `topologyUpdater.config`                      | dict   |                  | [configuration](../reference/topology-updater-configuration-reference)                                                                                                                                |
 | `topologyUpdater.podSetFingerprint`           | bool   | true             | Enables compute and report of pod fingerprint in NRT objects.                                                                                                                                         |
 | `topologyUpdater.kubeletStateDir`             | string | /var/lib/kubelet | Specifies kubelet state directory path for watching state and checkpoint files. Empty value disables kubelet state tracking.                                                                          |
+| `topologyUpdater.args`                        | array   | []              | Additional [command line arguments](../reference/topology-updater-commandline-reference.md) to pass to nfd-topology-updater |
 
 ### Garbage collector parameters
 
@@ -216,6 +219,7 @@ API's you need to install the prometheus operator in your cluster.
 | `gc.annotations`                      | dict   | {}      | Garbage collector pod [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)                  |
 | `gc.deploymentAnnotations`            | dict   | {}      | Garbage collector deployment [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/)          |
 | `gc.affinity`                         | dict   | {}      | Garbage collector pod [affinity](https://kubernetes.io/docs/tasks/configure-pod-container/assign-pods-nodes-using-node-affinity/)    |
+| `gc.args`                             | array   | []     | Additional [command line arguments](../reference/gc-commandline-reference.md) to pass to nfd-gc |
 
 <!-- Links -->
 [rbac]: https://kubernetes.io/docs/reference/access-authn-authz/rbac/