Skip to content

Commit f95e563

Browse files
committed
deployments: update to NFD v0.14.0 and drop custom GPU deployment
With the NFD recent versions (v0.13+), it's no longer necessary to start NFD with custom nfd-master args/rbac settings to get numeric labels registered as extended resources. The same can be specified via NodeFeatureRules which also works for "local" source with feature files. Signed-off-by: Mikko Ylinen <[email protected]>
1 parent a8a459c commit f95e563

File tree

8 files changed

+32
-32
lines changed

8 files changed

+32
-32
lines changed

cmd/gpu_plugin/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ take care of, which are explained below. For the RBAC-permissions, gRPC service
227227
the flag enabling, it is recommended to use kustomization by running:
228228

229229
```bash
230-
# Start NFD with GPU related configuration changes
231-
$ kubectl apply -k 'https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd/overlays/gpu?ref=<RELEASE_VERSION>'
230+
# Start NFD - if your cluster doesn't have NFD installed yet
231+
$ kubectl apply -k 'https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd?ref=<RELEASE_VERSION>'
232232

233233
# Create NodeFeatureRules for detecting GPUs on nodes
234234
$ kubectl apply -k 'https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd/overlays/node-feature-rules?ref=<RELEASE_VERSION>'
Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- "https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.13.4"
4+
- "https://github.com/kubernetes-sigs/node-feature-discovery/deployment/overlays/default?ref=v0.14.0"
5+
configMapGenerator:
6+
- name: nfd-worker-conf
7+
behavior: replace
8+
files:
9+
- nfd-worker.conf

deployments/nfd/base/nfd-worker.conf

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
core:
2+
featureSources:
3+
- "cpu"
4+
- "pci"
5+
- "local"
6+
- "kernel"
7+
labelSources:
8+
- "-cpu"
9+
- "-pci"
10+
- "-local"
11+
- "-kernel"

deployments/nfd/components/gpu/kustomization.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

deployments/nfd/components/gpu/master-args.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

deployments/nfd/components/gpu/master-rbac.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

deployments/nfd/overlays/gpu/kustomization.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

deployments/nfd/overlays/node-feature-rules/platform-labeling-rules.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@ metadata:
44
name: intel-gpu-platform-labeling
55
spec:
66
rules:
7+
- extendedResources:
8+
gpu.intel.com/millicores: "@local.label.gpu.intel.com/millicores"
9+
gpu.intel.com/memory.max: "@local.label.gpu.intel.com/memory.max"
10+
gpu.intel.com/tiles: "@local.label.gpu.intel.com/tiles"
11+
labels:
12+
"gpu.intel.com/fractional-resources": "true"
13+
matchFeatures:
14+
- feature: local.label
15+
matchExpressions:
16+
gpu.intel.com/millicores: {op: Exists}
17+
gpu.intel.com/memory.max: {op: Exists}
18+
gpu.intel.com/tiles: {op: Exists}
19+
name: intel.gpu.fractionalresources
720
# generic rule for older and upcoming devices
821
- labels:
922
labelsTemplate: |

0 commit comments

Comments
 (0)