1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-15 04:57:56 +00:00

Merge pull request #640 from eliaskoromilas/worker-config

deployment: Implicitly generate the worker ConfigMap name
This commit is contained in:
Kubernetes Prow Robot 2021-11-12 03:38:28 -08:00 committed by GitHub
commit b26a12cc17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions

View file

@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ .Values.worker.configmapName }} name: {{ include "node-feature-discovery.fullname" . }}-worker-conf
labels: labels:
{{- include "node-feature-discovery.labels" . | nindent 4 }} {{- include "node-feature-discovery.labels" . | nindent 4 }}
data: data:

View file

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

View file

@ -83,7 +83,6 @@ master:
values: [""] values: [""]
worker: worker:
configmapName: nfd-worker-conf
config: ### <NFD-WORKER-CONF-START-DO-NOT-REMOVE> config: ### <NFD-WORKER-CONF-START-DO-NOT-REMOVE>
#core: #core:
# labelWhiteList: # labelWhiteList:

View file

@ -314,7 +314,6 @@ We have introduced the following Chart parameters.
| Name | Type | Default | description | | Name | Type | Default | description |
| ---- | ---- | ------- | ----------- | | ---- | ---- | ------- | ----------- |
| `worker.*` | dict | | NFD worker daemonset configuration | | `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.config` | dict | | NFD worker [configuration](../advanced/worker-configuration-reference.md) |
| `worker.podSecurityContext` | dict | {} | SecurityContext holds pod-level security attributes and common container settings | | `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) | | `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. re-configurability.
The provided nfd-worker deployment templates create an empty configmap and 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 ```bash
kubectl -n ${NFD_NS} edit configmap nfd-worker-conf 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 See
[nfd-worker configuration file reference](../advanced/worker-configuration-reference.md) [nfd-worker configuration file reference](../advanced/worker-configuration-reference.md)
for more details. for more details.