From f439c2fd6bbe004b184aba6ec91a071b282bf5c0 Mon Sep 17 00:00:00 2001 From: Tuomas Katila Date: Mon, 23 Oct 2023 11:04:06 +0300 Subject: [PATCH] operator: dsa & iaa: use const names Signed-off-by: Tuomas Katila --- pkg/controllers/dsa/controller.go | 21 +++++++++++---------- pkg/controllers/iaa/controller.go | 21 +++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/pkg/controllers/dsa/controller.go b/pkg/controllers/dsa/controller.go index 9d6773c7..cc71a823 100644 --- a/pkg/controllers/dsa/controller.go +++ b/pkg/controllers/dsa/controller.go @@ -35,8 +35,9 @@ import ( ) const ( - ownerKey = ".metadata.controller.dsa" - inicontainerName = "intel-idxd-config-initcontainer" + ownerKey = ".metadata.controller.dsa" + initcontainerName = "intel-idxd-config-initcontainer" + configVolumeName = "intel-dsa-config-volume" ) var defaultNodeSelector = deployments.DSAPluginDaemonSet().Spec.Template.Spec.NodeSelector @@ -87,7 +88,7 @@ func removeInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin) newInitContainers := []v1.Container{} for _, container := range ds.Spec.Template.Spec.InitContainers { - if container.Name == inicontainerName { + if container.Name == initcontainerName { continue } @@ -98,7 +99,7 @@ func removeInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin) newVolumes := []v1.Volume{} for _, volume := range ds.Spec.Template.Spec.Volumes { - if volume.Name == "intel-dsa-config-volume" || volume.Name == "sys-bus-dsa" || volume.Name == "sys-devices" || volume.Name == "scratch" { + if volume.Name == configVolumeName || volume.Name == "sys-bus-dsa" || volume.Name == "sys-devices" || volume.Name == "scratch" { continue } @@ -114,7 +115,7 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin) { ds.Spec.Template.Spec.InitContainers = append(ds.Spec.Template.Spec.InitContainers, v1.Container{ Image: dp.Spec.InitImage, ImagePullPolicy: "IfNotPresent", - Name: inicontainerName, + Name: initcontainerName, Env: []v1.EnvVar{ { Name: "NODE_NAME", @@ -176,7 +177,7 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin) { if dp.Spec.ProvisioningConfig != "" { ds.Spec.Template.Spec.Volumes = append(ds.Spec.Template.Spec.Volumes, v1.Volume{ - Name: "intel-dsa-config-volume", + Name: configVolumeName, VolumeSource: v1.VolumeSource{ ConfigMap: &v1.ConfigMapVolumeSource{ LocalObjectReference: v1.LocalObjectReference{Name: dp.Spec.ProvisioningConfig}}, @@ -184,9 +185,9 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin) { }) for i, initcontainer := range ds.Spec.Template.Spec.InitContainers { - if initcontainer.Name == inicontainerName { + if initcontainer.Name == initcontainerName { ds.Spec.Template.Spec.InitContainers[i].VolumeMounts = append(ds.Spec.Template.Spec.InitContainers[i].VolumeMounts, v1.VolumeMount{ - Name: "intel-dsa-config-volume", + Name: configVolumeName, MountPath: "/idxd-init/conf", }) } @@ -218,7 +219,7 @@ func provisioningUpdate(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin) found := false for _, container := range ds.Spec.Template.Spec.InitContainers { - if container.Name == inicontainerName { + if container.Name == initcontainerName { if container.Image != dp.Spec.InitImage { update = true } @@ -230,7 +231,7 @@ func provisioningUpdate(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin) } for _, volume := range ds.Spec.Template.Spec.Volumes { - if volume.Name == "intel-dsa-config-volume" && volume.ConfigMap.Name != dp.Spec.ProvisioningConfig { + if volume.Name == configVolumeName && volume.ConfigMap.Name != dp.Spec.ProvisioningConfig { update = true break } diff --git a/pkg/controllers/iaa/controller.go b/pkg/controllers/iaa/controller.go index 9bb3cd04..f0dd5112 100644 --- a/pkg/controllers/iaa/controller.go +++ b/pkg/controllers/iaa/controller.go @@ -35,8 +35,9 @@ import ( ) const ( - ownerKey = ".metadata.controller.iaa" - inicontainerName = "intel-iaa-initcontainer" + ownerKey = ".metadata.controller.iaa" + initcontainerName = "intel-iaa-initcontainer" + configVolumeName = "intel-iaa-config-volume" ) // +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) newInitContainers := []v1.Container{} for _, container := range ds.Spec.Template.Spec.InitContainers { - if container.Name == inicontainerName { + if container.Name == initcontainerName { continue } @@ -97,7 +98,7 @@ func removeInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin) newVolumes := []v1.Volume{} for _, volume := range ds.Spec.Template.Spec.Volumes { - if volume.Name == "intel-iaa-config-volume" || volume.Name == "sys-bus-dsa" || volume.Name == "sys-devices" || volume.Name == "scratch" { + if volume.Name == configVolumeName || volume.Name == "sys-bus-dsa" || volume.Name == "sys-devices" || volume.Name == "scratch" { continue } @@ -113,7 +114,7 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin) { ds.Spec.Template.Spec.InitContainers = append(ds.Spec.Template.Spec.InitContainers, v1.Container{ Image: dp.Spec.InitImage, ImagePullPolicy: "IfNotPresent", - Name: inicontainerName, + Name: initcontainerName, Env: []v1.EnvVar{ { Name: "NODE_NAME", @@ -175,7 +176,7 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin) { if dp.Spec.ProvisioningConfig != "" { ds.Spec.Template.Spec.Volumes = append(ds.Spec.Template.Spec.Volumes, v1.Volume{ - Name: "intel-iaa-config-volume", + Name: configVolumeName, VolumeSource: v1.VolumeSource{ ConfigMap: &v1.ConfigMapVolumeSource{ LocalObjectReference: v1.LocalObjectReference{Name: dp.Spec.ProvisioningConfig}}, @@ -183,9 +184,9 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin) { }) for i, initcontainer := range ds.Spec.Template.Spec.InitContainers { - if initcontainer.Name == inicontainerName { + if initcontainer.Name == initcontainerName { ds.Spec.Template.Spec.InitContainers[i].VolumeMounts = append(ds.Spec.Template.Spec.InitContainers[i].VolumeMounts, v1.VolumeMount{ - Name: "intel-iaa-config-volume", + Name: configVolumeName, MountPath: "/idxd-init/conf", }) } @@ -219,7 +220,7 @@ func provisioningUpdate(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin) found := false for _, container := range ds.Spec.Template.Spec.InitContainers { - if container.Name == "intel-iaa-initcontainer" { + if container.Name == initcontainerName { if container.Image != dp.Spec.InitImage { update = true } @@ -231,7 +232,7 @@ func provisioningUpdate(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin) } for _, volume := range ds.Spec.Template.Spec.Volumes { - if volume.Name == "intel-iaa-config-volume" && volume.ConfigMap.Name != dp.Spec.ProvisioningConfig { + if volume.Name == configVolumeName && volume.ConfigMap.Name != dp.Spec.ProvisioningConfig { update = true break