Merge pull request #640 from eliaskoromilas/worker-config

deployment: Implicitly generate the worker ConfigMap name
kubernetes-sigs · Nov 12, 2021 · b26a12c · b26a12c
2 parents 8351887 + e22b937
commit b26a12c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/deployment/helm/node-feature-discovery/templates/nfd-worker-conf.yaml b/deployment/helm/node-feature-discovery/templates/nfd-worker-conf.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Values.worker.configmapName }}
+  name: {{ include "node-feature-discovery.fullname" . }}-worker-conf
   labels:
   {{- include "node-feature-discovery.labels" . | nindent 4 }}
 data:

diff --git a/deployment/helm/node-feature-discovery/templates/worker.yaml b/deployment/helm/node-feature-discovery/templates/worker.yaml
@@ -109,7 +109,7 @@ spec:
             path: "/etc/kubernetes/node-feature-discovery/features.d/"
         - name: nfd-worker-conf
           configMap:
-            name: {{ .Values.worker.configmapName }}
+            name: {{ include "node-feature-discovery.fullname" . }}-worker-conf
             items:
               - key: nfd-worker.conf
                 path: nfd-worker.conf

diff --git a/deployment/helm/node-feature-discovery/values.yaml b/deployment/helm/node-feature-discovery/values.yaml
@@ -83,7 +83,6 @@ master:
                 values: [""]
 
 worker:
-  configmapName: nfd-worker-conf
   config: ### <NFD-WORKER-CONF-START-DO-NOT-REMOVE>
     #core:
     #  labelWhiteList:

diff --git a/docs/get-started/deployment-and-usage.md b/docs/get-started/deployment-and-usage.md
@@ -314,7 +314,6 @@ We have introduced the following Chart parameters.
 | Name | Type | Default | description |
 | ---- | ---- | ------- | ----------- |
 | `worker.*` | dict |  | NFD worker daemonset configuration |
-| `worker.configmapName` | string | `nfd-worker-conf` | NFD worker pod ConfigMap name |
 | `worker.config` | dict |  | NFD worker [configuration](../advanced/worker-configuration-reference.md) |
 | `worker.podSecurityContext` | dict | {} | SecurityContext holds pod-level security attributes and common container settings |
 | `worker.securityContext` | dict | {} | Container [security settings](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) |
@@ -464,12 +463,16 @@ preferred method is to use a ConfigMap which provides easy deployment and
 re-configurability.
 
 The provided nfd-worker deployment templates create an empty configmap and
-mount it inside the nfd-worker containers. Configuration can be edited with:
+mount it inside the nfd-worker containers. In kustomize deployments,
+configuration can be edited with:
 
 ```bash
 kubectl -n ${NFD_NS} edit configmap nfd-worker-conf
 ```
 
+In Helm deployments, [Worker pod parameter](#worker-pod-parameters)
+`worker.config` can be used to edit the respective configuration.
+
 See
 [nfd-worker configuration file reference](../advanced/worker-configuration-reference.md)
 for more details.