Merge pull request #365 from kstrenkova/remove-keys-from-horizontest

Remove HorizonTest volume mount for keys

Author: openshift-merge-bot[bot]

controllers/horizontest_controller.go

@@ -206,9 +206,6 @@ func (r *HorizonTestReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	// Create Job
 	mountCerts := r.CheckSecretExists(ctx, instance, "combined-ca-bundle")
-
-	mountKeys := false
-
 	mountKubeconfig := len(instance.Spec.KubeconfigSecretName) != 0
 
 	// Prepare HorizonTest env vars
@@ -226,7 +223,6 @@ func (r *HorizonTestReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		podName,
 		logsPVCName,
 		mountCerts,
-		mountKeys,
 		mountKubeconfig,
 		envVars,
 		containerImage,

pkg/horizontest/pod.go

@@ -16,7 +16,6 @@ func Pod(
 	podName string,
 	logsPVCName string,
 	mountCerts bool,
-	mountKeys bool,
 	mountKubeconfig bool,
 	envVars map[string]env.Setter,
 	containerImage string,
@@ -50,7 +49,7 @@ func Pod(
 					Image:           containerImage,
 					Args:            []string{},
 					Env:             env.MergeEnvs([]corev1.EnvVar{}, envVars),
-					VolumeMounts:    GetVolumeMounts(mountCerts, mountKeys, mountKubeconfig, HorizonTestPropagation, instance),
+					VolumeMounts:    GetVolumeMounts(mountCerts, mountKubeconfig, HorizonTestPropagation, instance),
 					SecurityContext: &securityContext,
 					Resources:       instance.Spec.Resources,
 				},

pkg/horizontest/volumes.go

@@ -144,7 +144,6 @@ func GetVolumes(
 // GetVolumeMounts -
 func GetVolumeMounts(
 	mountCerts bool,
-	mountKeys bool,
 	mountKubeconfig bool,
 	svc []storage.PropagationType,
 	instance *testv1beta1.HorizonTest,
@@ -205,26 +204,6 @@ func GetVolumeMounts(
 		volumeMounts = append(volumeMounts, caCertVolumeMount)
 	}
 
-	if mountKeys {
-		keysMount := corev1.VolumeMount{
-			Name:      "horizontest-private-key",
-			MountPath: "/etc/test_operator/id_ecdsa",
-			SubPath:   "id_ecdsa",
-			ReadOnly:  true,
-		}
-
-		volumeMounts = append(volumeMounts, keysMount)
-
-		keysMount = corev1.VolumeMount{
-			Name:      "horizontest-public-key",
-			MountPath: "/etc/test_operator/id_ecdsa.pub",
-			SubPath:   "id_ecdsa.pub",
-			ReadOnly:  true,
-		}
-
-		volumeMounts = append(volumeMounts, keysMount)
-	}
-
 	if mountKubeconfig {
 		kubeconfigMount := corev1.VolumeMount{
 			Name:      "kubeconfig",