Skip to content

Commit 0036586

Browse files
committed
Addressed more feedback.
Signed-off-by: Andon Andonov <andonova@vmware.com>
1 parent 3d871cd commit 0036586

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

projects/control-service/projects/pipelines_control_service/src/main/java/com/vmware/taurus/service/deploy/SupportedPythonVersions.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
@Slf4j
2525
public class SupportedPythonVersions {
2626

27-
public record DeploymentDetails(String baseImage, String vdkImage) {}
27+
record DeploymentDetails(String baseImage, String vdkImage) {}
2828

2929
@Value("#{${datajobs.deployment.supportedPythonVersions:{}}}")
3030
private Map<String, DeploymentDetails> supportedPythonVersions;
@@ -50,9 +50,7 @@ public boolean isPythonVersionSupported(String pythonVersion) {
5050
* @return A set of all python versions supported by the Control Service.
5151
*/
5252
public Set<String> getSupportedPythonVersions() {
53-
return Optional.ofNullable(supportedPythonVersions)
54-
.map(Map::keySet)
55-
.orElse(Collections.emptySet());
53+
return supportedPythonVersions.keySet();
5654
}
5755

5856
/**

projects/control-service/projects/pipelines_control_service/src/main/resources/application.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ datajobs.deployment.dataJobBaseImage=python:3.9-slim
126126

127127
# The map of python version and respective data job base and vdk images that would be
128128
# used for data job deployments
129-
datajobs.deployment.supportedPythonVersions=${DATAJOBS_DEPLOYMENT_SUPPORTED_PYTHON_VERSIONS:{}}
129+
datajobs.deployment.supportedPythonVersions=${DATAJOBS_DEPLOYMENT_SUPPORTED_PYTHON_VERSIONS:{3.9: {vdkImage: 'registry.hub.docker.com/versatiledatakit/quickstart-vdk:release', baseImage: 'python:3.9-slim'}}}
130130
# The default python version, which is to be used when selecting the vdk and job base images from
131131
# the supportedPythonVersions for data job deployments
132-
datajobs.deployment.defaultPythonVersion=${DATAJOBS_DEPLOYMENT_DEFAULT_PYTHON_VERSION:3.7}
132+
datajobs.deployment.defaultPythonVersion=${DATAJOBS_DEPLOYMENT_DEFAULT_PYTHON_VERSION:3.9}
133133

134134
#Configuration variables used for data job execution cleanup
135135
#This is a spring cron expression, used to schedule the clean up job / default is every 3 hours

0 commit comments

Comments
 (0)