Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a1a81e5

Browse files
committedDec 12, 2022
Use more generic name for NFD features host directory volume
Before adding kustomize file changing it from feature hooks directory to feature files directory, which is needed to support scalability testing with fake devices, and for: kubernetes-sigs/node-feature-discovery#856 When changing volume names, controller needs to be changed too. Signed-off-by: Eero Tamminen <eero.t.tamminen@intel.com>
1 parent f3d2f35 commit a1a81e5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed
 

‎deployments/gpu_plugin/base/intel-gpu-plugin.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
allowPrivilegeEscalation: false
2525
volumeMounts:
2626
- mountPath: /etc/kubernetes/node-feature-discovery/source.d/
27-
name: nfd-source-hooks
27+
name: nfd-features
2828
containers:
2929
- name: intel-gpu-plugin
3030
env:
@@ -58,7 +58,7 @@ spec:
5858
- name: kubeletsockets
5959
hostPath:
6060
path: /var/lib/kubelet/device-plugins
61-
- name: nfd-source-hooks
61+
- name: nfd-features
6262
hostPath:
6363
path: /etc/kubernetes/node-feature-discovery/source.d/
6464
type: DirectoryOrCreate

‎pkg/controllers/gpu/controller.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func (c *controller) NewDaemonSet(rawObj client.Object) *apps.DaemonSet {
142142

143143
if devicePlugin.Spec.InitImage == "" {
144144
daemonSet.Spec.Template.Spec.InitContainers = nil
145-
daemonSet.Spec.Template.Spec.Volumes = removeVolume(daemonSet.Spec.Template.Spec.Volumes, "nfd-source-hooks")
145+
daemonSet.Spec.Template.Spec.Volumes = removeVolume(daemonSet.Spec.Template.Spec.Volumes, "nfd-features")
146146
} else {
147147
setInitContainer(&daemonSet.Spec.Template.Spec, devicePlugin.Spec.InitImage)
148148
}
@@ -204,11 +204,11 @@ func setInitContainer(spec *v1.PodSpec, imageName string) {
204204
VolumeMounts: []v1.VolumeMount{
205205
{
206206
MountPath: "/etc/kubernetes/node-feature-discovery/source.d/",
207-
Name: "nfd-source-hooks",
207+
Name: "nfd-features",
208208
},
209209
},
210210
}}
211-
addVolumeIfMissing(spec, "nfd-source-hooks", "/etc/kubernetes/node-feature-discovery/source.d/", v1.HostPathDirectoryOrCreate)
211+
addVolumeIfMissing(spec, "nfd-features", "/etc/kubernetes/node-feature-discovery/source.d/", v1.HostPathDirectoryOrCreate)
212212
}
213213

214214
func removeVolume(volumes []v1.Volume, name string) []v1.Volume {
@@ -246,7 +246,7 @@ func (c *controller) UpdateDaemonSet(rawObj client.Object, ds *apps.DaemonSet) (
246246
if dp.Spec.InitImage == "" {
247247
if ds.Spec.Template.Spec.InitContainers != nil {
248248
ds.Spec.Template.Spec.InitContainers = nil
249-
ds.Spec.Template.Spec.Volumes = removeVolume(ds.Spec.Template.Spec.Volumes, "nfd-source-hooks")
249+
ds.Spec.Template.Spec.Volumes = removeVolume(ds.Spec.Template.Spec.Volumes, "nfd-features")
250250
updated = true
251251
}
252252
} else {

0 commit comments

Comments
 (0)
Please sign in to comment.