Merge pull request #242 from openshift-cherrypick-robot/cherry-pick-2…

…39-to-18.0-fr1 [18.0-fr1] Fix the nil pointing issue
openstack-k8s-operators · Nov 12, 2024 · 026395b · 026395b
2 parents 9b081b3 + 6c90ba1
commit 026395b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/ansibletest/volumes.go b/pkg/ansibletest/volumes.go
@@ -106,7 +106,7 @@ func GetVolumes(
 		volumes = append(volumes, extraVol)
 	}
 
-	if len(instance.Spec.Workflow) > 0 {
+	if len(instance.Spec.Workflow) > 0 && *instance.Spec.Workflow[externalWorkflowCounter].ExtraConfigmapsMounts != nil {
 		for _, vol := range *instance.Spec.Workflow[externalWorkflowCounter].ExtraConfigmapsMounts {
 			extraWorkflowVol := corev1.Volume{
 				Name: vol.Name,
@@ -204,7 +204,7 @@ func GetVolumeMounts(mountCerts bool, instance *testv1beta1.AnsibleTest, externa
 		volumeMounts = append(volumeMounts, extraConfigmapsMounts)
 	}
 
-	if len(instance.Spec.Workflow) > 0 {
+	if len(instance.Spec.Workflow) > 0 && *instance.Spec.Workflow[externalWorkflowCounter].ExtraConfigmapsMounts != nil {
 		for _, vol := range *instance.Spec.Workflow[externalWorkflowCounter].ExtraConfigmapsMounts {
 
 			extraConfigmapsMounts := corev1.VolumeMount{
@@ -217,5 +217,6 @@ func GetVolumeMounts(mountCerts bool, instance *testv1beta1.AnsibleTest, externa
 			volumeMounts = append(volumeMounts, extraConfigmapsMounts)
 		}
 	}
+
 	return volumeMounts
 }