diff --git a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/KubernetesService.java b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/KubernetesService.java index c2c02794a0..bfa8f01483 100644 --- a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/KubernetesService.java +++ b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/KubernetesService.java @@ -2004,8 +2004,10 @@ private Optional mapV1beta1CronJobToDeploymentStatus( var initContainers = cronJob.getSpec().getJobTemplate().getSpec().getTemplate().getSpec().getInitContainers(); if (!CollectionUtils.isEmpty(initContainers)) { - // With the functionality to pass custom vdk images that are different from the ones specified - // in the supportedPythonVersions, we need to pass the whole image as a VdkVersion instead of + // With the functionality to pass custom vdk images that are different from the ones + // specified + // in the supportedPythonVersions, we need to pass the whole image as a VdkVersion instead + // of // just the image tag. String vdkImage = initContainers.get(0).getImage(); deployment.setVdkVersion(vdkImage); @@ -2068,8 +2070,10 @@ private Optional mapV1CronJobToDeploymentStatus( var initContainers = cronJob.getSpec().getJobTemplate().getSpec().getTemplate().getSpec().getInitContainers(); if (!CollectionUtils.isEmpty(initContainers)) { - // With the functionality to pass custom vdk images that are different from the ones specified - // in the supportedPythonVersions, we need to pass the whole image as a VdkVersion instead of + // With the functionality to pass custom vdk images that are different from the ones + // specified + // in the supportedPythonVersions, we need to pass the whole image as a VdkVersion instead + // of // just the image tag. String vdkImage = initContainers.get(0).getImage(); deployment.setVdkVersion(vdkImage); diff --git a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployer.java b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployer.java index 4ff7a0bebd..a788bfd073 100644 --- a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployer.java +++ b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployer.java @@ -255,7 +255,8 @@ private void updateCronJob(DataJob dataJob, JobDeployment jobDeployment, String "cp -r $(python -c \"from distutils.sysconfig import get_python_lib;" + " print(get_python_lib())\") /vdk/. && cp /usr/local/bin/vdk /vdk/."); - var jobVdkImage = (jobDeployment.getVdkVersion() != null) + var jobVdkImage = + (jobDeployment.getVdkVersion() != null) ? jobDeployment.getVdkVersion() : supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion()); diff --git a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java index 5305a9a1e4..a809d5aced 100644 --- a/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java +++ b/projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/JobImageDeployerV2.java @@ -396,7 +396,8 @@ private KubernetesService.CronJob getCronJob( "-c", "cp -r $(python -c \"from distutils.sysconfig import get_python_lib;" + " print(get_python_lib())\") /vdk/. && cp /usr/local/bin/vdk /vdk/."); - var jobVdkImage = (jobDeployment.getVdkVersion() != null) + var jobVdkImage = + (jobDeployment.getVdkVersion() != null) ? jobDeployment.getVdkVersion() : supportedPythonVersions.getVdkImage(jobDeployment.getPythonVersion()); var jobInitContainer =