Merge pull request #341 from kstrenkova/fix-ansible-workload-key

Refactor AnsibleTest code

Author: openshift-merge-bot[bot]

controllers/ansibletest_controller.go

@@ -207,9 +207,9 @@ func (r *AnsibleTestReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	// Create a new pod
 	mountCerts := r.CheckSecretExists(ctx, instance, "combined-ca-bundle")
 	podName := r.GetPodName(instance, nextWorkflowStep)
-	envVars, workflowOverrideParams := r.PrepareAnsibleEnv(instance)
+	envVars := r.PrepareAnsibleEnv(instance)
 	logsPVCName := r.GetPVCLogsName(instance, 0)
-	containerImage, err := r.GetContainerImage(ctx, workflowOverrideParams["ContainerImage"], instance)
+	containerImage, err := r.GetContainerImage(ctx, instance.Spec.ContainerImage, instance)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -221,7 +221,6 @@ func (r *AnsibleTestReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		logsPVCName,
 		mountCerts,
 		envVars,
-		workflowOverrideParams,
 		nextWorkflowStep,
 		containerImage,
 	)
@@ -268,23 +267,12 @@ func (r *AnsibleTestReconciler) SetupWithManager(mgr ctrl.Manager) error {
 // PrepareAnsibleEnv prepares environment variables for a single workflow step
 func (r *AnsibleTestReconciler) PrepareAnsibleEnv(
 	instance *testv1beta1.AnsibleTest,
-) (map[string]env.Setter, map[string]string) {
+) map[string]env.Setter {
 	// Prepare env vars
 	envVars := make(map[string]env.Setter)
-	workflowOverrideParams := make(map[string]string)
-
-	// volumes workflow override
-	workflowOverrideParams["WorkloadSSHKeySecretName"] = instance.Spec.WorkloadSSHKeySecretName
-	workflowOverrideParams["ComputeSSHKeySecretName"] = instance.Spec.ComputeSSHKeySecretName
-	workflowOverrideParams["ContainerImage"] = instance.Spec.ContainerImage
 
 	// bool
-	debug := instance.Spec.Debug
-	if debug {
-		envVars["POD_DEBUG"] = env.SetValue("true")
-	} else {
-		envVars["POD_DEBUG"] = env.SetValue("false")
-	}
+	envVars["POD_DEBUG"] = env.SetValue(strconv.FormatBool(instance.Spec.Debug))
 
 	// strings
 	envVars["POD_ANSIBLE_EXTRA_VARS"] = env.SetValue(instance.Spec.AnsibleExtraVars)
@@ -294,5 +282,5 @@ func (r *AnsibleTestReconciler) PrepareAnsibleEnv(
 	envVars["POD_ANSIBLE_PLAYBOOK"] = env.SetValue(instance.Spec.AnsiblePlaybookPath)
 	envVars["POD_INSTALL_COLLECTIONS"] = env.SetValue(instance.Spec.AnsibleCollections)
 
-	return envVars, workflowOverrideParams
+	return envVars
 }

pkg/ansibletest/pod.go

@@ -17,7 +17,6 @@ func Pod(
 	logsPVCName string,
 	mountCerts bool,
 	envVars map[string]env.Setter,
-	workflowOverrideParams map[string]string,
 	externalWorkflowCounter int,
 	containerImage string,
 ) *corev1.Pod {
@@ -60,7 +59,6 @@ func Pod(
 				logsPVCName,
 				mountCerts,
 				AnsibleTestPropagation,
-				workflowOverrideParams,
 				externalWorkflowCounter,
 			),
 		},

pkg/ansibletest/volumes.go

@@ -13,7 +13,6 @@ func GetVolumes(
 	logsPVCName string,
 	mountCerts bool,
 	svc []storage.PropagationType,
-	workflowOverrideParams map[string]string,
 	externalWorkflowCounter int,
 ) []corev1.Volume {
 
@@ -85,20 +84,20 @@ func GetVolumes(
 		Name: "compute-ssh-secret",
 		VolumeSource: corev1.VolumeSource{
 			Secret: &corev1.SecretVolumeSource{
-				SecretName:  workflowOverrideParams["ComputeSSHKeySecretName"],
+				SecretName:  instance.Spec.ComputeSSHKeySecretName,
 				DefaultMode: &privateKeyMode,
 			},
 		},
 	}
 
 	volumes = append(volumes, keysVolume)
 
-	if workflowOverrideParams["WorkloadSSHKeySecretName"] != "" {
+	if instance.Spec.WorkloadSSHKeySecretName != "" {
 		keysVolume = corev1.Volume{
 			Name: "workload-ssh-secret",
 			VolumeSource: corev1.VolumeSource{
 				Secret: &corev1.SecretVolumeSource{
-					SecretName:  workflowOverrideParams["WorkloadSSHKeySecretName"],
+					SecretName:  instance.Spec.WorkloadSSHKeySecretName,
 					DefaultMode: &privateKeyMode,
 				},
 			},
@@ -219,14 +218,16 @@ func GetVolumeMounts(
 		volumeMounts = append(volumeMounts, caCertVolumeMount)
 	}
 
-	workloadSSHKeyMount := corev1.VolumeMount{
-		Name:      "workload-ssh-secret",
-		MountPath: "/var/lib/ansible/test_keypair.key",
-		SubPath:   "ssh-privatekey",
-		ReadOnly:  true,
-	}
+	if instance.Spec.WorkloadSSHKeySecretName != "" {
+		workloadSSHKeyMount := corev1.VolumeMount{
+			Name:      "workload-ssh-secret",
+			MountPath: "/var/lib/ansible/test_keypair.key",
+			SubPath:   "ssh-privatekey",
+			ReadOnly:  true,
+		}
 
-	volumeMounts = append(volumeMounts, workloadSSHKeyMount)
+		volumeMounts = append(volumeMounts, workloadSSHKeyMount)
+	}
 
 	computeSSHKeyMount := corev1.VolumeMount{
 		Name:      "compute-ssh-secret",