operator: dsa&iaa: use const names

Signed-off-by: Tuomas Katila <[email protected]>

Author: tkatila

pkg/controllers/dsa/controller.go

@@ -37,6 +37,7 @@ import (
 const (
 	ownerKey         = ".metadata.controller.dsa"
 	inicontainerName = "intel-idxd-config-initcontainer"
+	configVolumeName = "intel-dsa-config-volume"
 )
 
 var defaultNodeSelector = deployments.DSAPluginDaemonSet().Spec.Template.Spec.NodeSelector
@@ -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
 		}
 
@@ -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}},
@@ -186,7 +187,7 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.DsaDevicePlugin) {
 		for i, initcontainer := range ds.Spec.Template.Spec.InitContainers {
 			if initcontainer.Name == inicontainerName {
 				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",
 				})
 			}
@@ -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
 		}

pkg/controllers/iaa/controller.go

@@ -37,6 +37,7 @@ import (
 const (
 	ownerKey         = ".metadata.controller.iaa"
 	inicontainerName = "intel-iaa-initcontainer"
+	configVolumeName = "intel-iaa-config-volume"
 )
 
 // +kubebuilder:rbac:groups=deviceplugin.intel.com,resources=iaadeviceplugins,verbs=get;list;watch;create;update;patch;delete
@@ -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
 		}
 
@@ -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}},
@@ -185,7 +186,7 @@ func addInitContainer(ds *apps.DaemonSet, dp *devicepluginv1.IaaDevicePlugin) {
 		for i, initcontainer := range ds.Spec.Template.Spec.InitContainers {
 			if initcontainer.Name == inicontainerName {
 				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 == inicontainerName {
 			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