Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deployment: Implicitly generate the worker ConfigMap name #640

Merged
merged 1 commit into from
Nov 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion deployment/helm/node-feature-discovery/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ master:
values: [""]

worker:
configmapName: nfd-worker-conf
config: ### <NFD-WORKER-CONF-START-DO-NOT-REMOVE>
#core:
# labelWhiteList:
Expand Down
7 changes: 5 additions & 2 deletions docs/get-started/deployment-and-usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -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) |
Expand Down Expand Up @@ -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.
Expand Down