Skip to content

Commit f439c2f

Browse files
tkatilatkatila
committed
operator: dsa & iaa: use const names
Signed-off-by: Tuomas Katila <[email protected]>
1 parent a15c84c commit f439c2f

File tree

2 files changed

+22
-20
lines changed

2 files changed

+22
-20
lines changed

‎pkg/controllers/dsa/controller.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ import (
3535
)
3636

3737
const (
38-
ownerKey = ".metadata.controller.dsa"
39-
inicontainerName = "intel-idxd-config-initcontainer"
38+
ownerKey = ".metadata.controller.dsa"
39+
initcontainerName = "intel-idxd-config-initcontainer"
40+
configVolumeName = "intel-dsa-config-volume"
4041
)
4142

4243
var defaultNodeSelector = deployments.DSAPluginDaemonSet().Spec.Template.Spec.NodeSelector
@@ -87,7 +88,7 @@ func removeInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin)
8788
newInitContainers := []v1.Container{}
8889

8990
for _, container := range ds.Spec.Template.Spec.InitContainers {
90-
if container.Name == inicontainerName {
91+
if container.Name == initcontainerName {
9192
continue
9293
}
9394

@@ -98,7 +99,7 @@ func removeInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin)
9899
newVolumes := []v1.Volume{}
99100

100101
for _, volume := range ds.Spec.Template.Spec.Volumes {
101-
if volume.Name == "intel-dsa-config-volume" || volume.Name == "sys-bus-dsa" || volume.Name == "sys-devices" || volume.Name == "scratch" {
102+
if volume.Name == configVolumeName || volume.Name == "sys-bus-dsa" || volume.Name == "sys-devices" || volume.Name == "scratch" {
102103
continue
103104
}
104105

@@ -114,7 +115,7 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin) {
114115
ds.Spec.Template.Spec.InitContainers = append(ds.Spec.Template.Spec.InitContainers, v1.Container{
115116
Image: dp.Spec.InitImage,
116117
ImagePullPolicy: "IfNotPresent",
117-
Name: inicontainerName,
118+
Name: initcontainerName,
118119
Env: []v1.EnvVar{
119120
{
120121
Name: "NODE_NAME",
@@ -176,17 +177,17 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin) {
176177

177178
if dp.Spec.ProvisioningConfig != "" {
178179
ds.Spec.Template.Spec.Volumes = append(ds.Spec.Template.Spec.Volumes, v1.Volume{
179-
Name: "intel-dsa-config-volume",
180+
Name: configVolumeName,
180181
VolumeSource: v1.VolumeSource{
181182
ConfigMap: &v1.ConfigMapVolumeSource{
182183
LocalObjectReference: v1.LocalObjectReference{Name: dp.Spec.ProvisioningConfig}},
183184
},
184185
})
185186

186187
for i, initcontainer := range ds.Spec.Template.Spec.InitContainers {
187-
if initcontainer.Name == inicontainerName {
188+
if initcontainer.Name == initcontainerName {
188189
ds.Spec.Template.Spec.InitContainers[i].VolumeMounts = append(ds.Spec.Template.Spec.InitContainers[i].VolumeMounts, v1.VolumeMount{
189-
Name: "intel-dsa-config-volume",
190+
Name: configVolumeName,
190191
MountPath: "/idxd-init/conf",
191192
})
192193
}
@@ -218,7 +219,7 @@ func provisioningUpdate(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin)
218219
found := false
219220

220221
for _, container := range ds.Spec.Template.Spec.InitContainers {
221-
if container.Name == inicontainerName {
222+
if container.Name == initcontainerName {
222223
if container.Image != dp.Spec.InitImage {
223224
update = true
224225
}
@@ -230,7 +231,7 @@ func provisioningUpdate(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin)
230231
}
231232

232233
for _, volume := range ds.Spec.Template.Spec.Volumes {
233-
if volume.Name == "intel-dsa-config-volume" && volume.ConfigMap.Name != dp.Spec.ProvisioningConfig {
234+
if volume.Name == configVolumeName && volume.ConfigMap.Name != dp.Spec.ProvisioningConfig {
234235
update = true
235236
break
236237
}

‎pkg/controllers/iaa/controller.go‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ import (
3535
)
3636

3737
const (
38-
ownerKey = ".metadata.controller.iaa"
39-
inicontainerName = "intel-iaa-initcontainer"
38+
ownerKey = ".metadata.controller.iaa"
39+
initcontainerName = "intel-iaa-initcontainer"
40+
configVolumeName = "intel-iaa-config-volume"
4041
)
4142

4243
// +kubebuilder:rbac:groups=deviceplugin.intel.com,resources=iaadeviceplugins,verbs=get;list;watch;create;update;patch;delete
@@ -85,7 +86,7 @@ func removeInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin)
8586
newInitContainers := []v1.Container{}
8687

8788
for _, container := range ds.Spec.Template.Spec.InitContainers {
88-
if container.Name == inicontainerName {
89+
if container.Name == initcontainerName {
8990
continue
9091
}
9192

@@ -97,7 +98,7 @@ func removeInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin)
9798
newVolumes := []v1.Volume{}
9899

99100
for _, volume := range ds.Spec.Template.Spec.Volumes {
100-
if volume.Name == "intel-iaa-config-volume" || volume.Name == "sys-bus-dsa" || volume.Name == "sys-devices" || volume.Name == "scratch" {
101+
if volume.Name == configVolumeName || volume.Name == "sys-bus-dsa" || volume.Name == "sys-devices" || volume.Name == "scratch" {
101102
continue
102103
}
103104

@@ -113,7 +114,7 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin) {
113114
ds.Spec.Template.Spec.InitContainers = append(ds.Spec.Template.Spec.InitContainers, v1.Container{
114115
Image: dp.Spec.InitImage,
115116
ImagePullPolicy: "IfNotPresent",
116-
Name: inicontainerName,
117+
Name: initcontainerName,
117118
Env: []v1.EnvVar{
118119
{
119120
Name: "NODE_NAME",
@@ -175,17 +176,17 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin) {
175176

176177
if dp.Spec.ProvisioningConfig != "" {
177178
ds.Spec.Template.Spec.Volumes = append(ds.Spec.Template.Spec.Volumes, v1.Volume{
178-
Name: "intel-iaa-config-volume",
179+
Name: configVolumeName,
179180
VolumeSource: v1.VolumeSource{
180181
ConfigMap: &v1.ConfigMapVolumeSource{
181182
LocalObjectReference: v1.LocalObjectReference{Name: dp.Spec.ProvisioningConfig}},
182183
},
183184
})
184185

185186
for i, initcontainer := range ds.Spec.Template.Spec.InitContainers {
186-
if initcontainer.Name == inicontainerName {
187+
if initcontainer.Name == initcontainerName {
187188
ds.Spec.Template.Spec.InitContainers[i].VolumeMounts = append(ds.Spec.Template.Spec.InitContainers[i].VolumeMounts, v1.VolumeMount{
188-
Name: "intel-iaa-config-volume",
189+
Name: configVolumeName,
189190
MountPath: "/idxd-init/conf",
190191
})
191192
}
@@ -219,7 +220,7 @@ func provisioningUpdate(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin)
219220
found := false
220221

221222
for _, container := range ds.Spec.Template.Spec.InitContainers {
222-
if container.Name == "intel-iaa-initcontainer" {
223+
if container.Name == initcontainerName {
223224
if container.Image != dp.Spec.InitImage {
224225
update = true
225226
}
@@ -231,7 +232,7 @@ func provisioningUpdate(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin)
231232
}
232233

233234
for _, volume := range ds.Spec.Template.Spec.Volumes {
234-
if volume.Name == "intel-iaa-config-volume" && volume.ConfigMap.Name != dp.Spec.ProvisioningConfig {
235+
if volume.Name == configVolumeName && volume.ConfigMap.Name != dp.Spec.ProvisioningConfig {
235236
update = true
236237

237238
break

0 commit comments

Comments
 (0)