Change volume variable name

openshift · May 4, 2020 · c5f5116 · c5f5116
1 parent d8ee137
commit c5f5116
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/pkg/controller/cincinnati/cincinnati_controller_test.go b/pkg/controller/cincinnati/cincinnati_controller_test.go
@@ -256,8 +256,8 @@ func TestEnsureDeployment(t *testing.T) {
 			assert.Equal(t, found.Spec.Template.Spec.Containers[1].Name, resources.policyEngineContainer.Name)
 			assert.Equal(t, found.Spec.Template.Spec.Containers[1].Image, resources.graphBuilderContainer.Image)
 			if test.caCert {
-				assert.Equal(t, found.Spec.Template.Spec.Volumes[2].Name, NameConfigMapTrustedCA)
-				assert.Equal(t, found.Spec.Template.Spec.Containers[0].VolumeMounts[2].Name, NameConfigMapTrustedCA)
+				assert.Equal(t, found.Spec.Template.Spec.Volumes[2].Name, NameTrustedCAVolume)
+				assert.Equal(t, found.Spec.Template.Spec.Containers[0].VolumeMounts[2].Name, NameTrustedCAVolume)
 			}
 
 			initContainer := found.Spec.Template.Spec.InitContainers[0]

diff --git a/pkg/controller/cincinnati/names.go b/pkg/controller/cincinnati/names.go
@@ -14,8 +14,8 @@ const (
 	NameInitContainerGraphData string = "graph-data"
 	// openshiftConfigNamespace is the name of openshift's configuration namespace
 	openshiftConfigNamespace = "openshift-config"
-	// NameConfigMapTrustedCA is the name of the copied ConfigMap from openshift-config
-	NameConfigMapTrustedCA = "trusted-ca"
+	// NameTrustedCAVolume is the name of the Volume used in Cincinnati's deployment containing the CA Cert
+	NameTrustedCAVolume = "trusted-ca"
 	// NameCertConfigMapKey is the ConfigMap key name where the operator expects the external registry CA Cert
 	NameCertConfigMapKey = "cincinnati-registry"
 )

diff --git a/pkg/controller/cincinnati/new.go b/pkg/controller/cincinnati/new.go
@@ -305,7 +305,7 @@ func (k *kubeResources) newDeployment(instance *cv1alpha1.Cincinnati, externalCA
 
 	if externalCACert {
 		v := corev1.Volume{
-			Name: NameConfigMapTrustedCA,
+			Name: NameTrustedCAVolume,
 			VolumeSource: corev1.VolumeSource{
 				ConfigMap: &corev1.ConfigMapVolumeSource{
 					DefaultMode: &mode,
@@ -419,7 +419,7 @@ func (k *kubeResources) newGraphBuilderContainer(instance *cv1alpha1.Cincinnati,
 	}
 	if externalCACert {
 		v := corev1.VolumeMount{
-			Name:      NameConfigMapTrustedCA,
+			Name:      NameTrustedCAVolume,
 			ReadOnly:  true,
 			MountPath: "/etc/pki/ca-trust/extracted/pem",
 		}