Addressed more feedback.

Signed-off-by: Andon Andonov <[email protected]>
vmware · Mar 27, 2023 · 0036586 · 0036586
1 parent 3d871cd
commit 0036586
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...ntrol_service/src/main/java/com/vmware/taurus/service/deploy/SupportedPythonVersions.java b/...ntrol_service/src/main/java/com/vmware/taurus/service/deploy/SupportedPythonVersions.java
@@ -24,7 +24,7 @@
 @Slf4j
 public class SupportedPythonVersions {
 
-  public record DeploymentDetails(String baseImage, String vdkImage) {}
+  record DeploymentDetails(String baseImage, String vdkImage) {}
 
   @Value("#{${datajobs.deployment.supportedPythonVersions:{}}}")
   private Map<String, DeploymentDetails> supportedPythonVersions;
@@ -50,9 +50,7 @@ public boolean isPythonVersionSupported(String pythonVersion) {
    * @return A set of all python versions supported by the Control Service.
    */
   public Set<String> getSupportedPythonVersions() {
-    return Optional.ofNullable(supportedPythonVersions)
-        .map(Map::keySet)
-        .orElse(Collections.emptySet());
+    return supportedPythonVersions.keySet();
   }
 
   /**

diff --git a/...trol-service/projects/pipelines_control_service/src/main/resources/application.properties b/...trol-service/projects/pipelines_control_service/src/main/resources/application.properties
@@ -126,10 +126,10 @@ datajobs.deployment.dataJobBaseImage=python:3.9-slim
 
 # The map of python version and respective data job base and vdk images that would be
 # used for data job deployments
-datajobs.deployment.supportedPythonVersions=${DATAJOBS_DEPLOYMENT_SUPPORTED_PYTHON_VERSIONS:{}}
+datajobs.deployment.supportedPythonVersions=${DATAJOBS_DEPLOYMENT_SUPPORTED_PYTHON_VERSIONS:{3.9: {vdkImage: 'registry.hub.docker.com/versatiledatakit/quickstart-vdk:release', baseImage: 'python:3.9-slim'}}}
 # The default python version, which is to be used when selecting the vdk and job base images from
 # the supportedPythonVersions for data job deployments
-datajobs.deployment.defaultPythonVersion=${DATAJOBS_DEPLOYMENT_DEFAULT_PYTHON_VERSION:3.7}
+datajobs.deployment.defaultPythonVersion=${DATAJOBS_DEPLOYMENT_DEFAULT_PYTHON_VERSION:3.9}
 
 #Configuration variables used for data job execution cleanup
 #This is a spring cron expression, used to schedule the clean up job / default is every 3 hours