Empty init config map check fix.

scc-digitalhub · Aug 21, 2024 · 54553a0 · 54553a0
1 parent 53e57c1
commit 54553a0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/...ava/it/smartcommunitylabdhub/framework/k8s/infrastructure/k8s/K8sDeploymentFramework.java b/...ava/it/smartcommunitylabdhub/framework/k8s/infrastructure/k8s/K8sDeploymentFramework.java
@@ -248,7 +248,8 @@ public V1Deployment build(K8sDeploymentRunnable runnable) throws K8sFrameworkExc
         List<String> args = buildArgs(runnable);
 
         //check if context build is required
-        if (runnable.getContextRefs() != null || runnable.getContextSources() != null) {
+        if (runnable.getContextRefs() != null && !runnable.getContextRefs().isEmpty() || 
+            runnable.getContextSources() != null && !runnable.getContextSources().isEmpty()) {
             // Create sharedVolume
             CoreVolume sharedVolume = new CoreVolume(
                 CoreVolume.VolumeType.empty_dir,
@@ -308,7 +309,8 @@ public V1Deployment build(K8sDeploymentRunnable runnable) throws K8sFrameworkExc
             .imagePullSecrets(buildImagePullSecrets(runnable));
 
         //check if context build is required
-        if (runnable.getContextRefs() != null || runnable.getContextSources() != null) {
+        if (runnable.getContextRefs() != null && !runnable.getContextRefs().isEmpty() || 
+            runnable.getContextSources() != null && !runnable.getContextSources().isEmpty()) {
             // Add Init container to the PodTemplateSpec
             // Build the Init Container
             V1Container initContainer = new V1Container()

diff --git a/.../main/java/it/smartcommunitylabdhub/framework/k8s/infrastructure/k8s/K8sJobFramework.java b/.../main/java/it/smartcommunitylabdhub/framework/k8s/infrastructure/k8s/K8sJobFramework.java
@@ -257,7 +257,8 @@ public V1Job build(K8sJobRunnable runnable) throws K8sFrameworkException {
         List<String> args = buildArgs(runnable);
 
         //check if context build is required
-        if (runnable.getContextRefs() != null || runnable.getContextSources() != null) {
+        if (runnable.getContextRefs() != null && !runnable.getContextRefs().isEmpty() || 
+            runnable.getContextSources() != null && !runnable.getContextSources().isEmpty()) {
             // Create sharedVolume
             CoreVolume sharedVolume = new CoreVolume(
                 CoreVolume.VolumeType.empty_dir,
@@ -317,7 +318,8 @@ public V1Job build(K8sJobRunnable runnable) throws K8sFrameworkException {
             .imagePullSecrets(buildImagePullSecrets(runnable));
 
         //check if context build is required
-        if (runnable.getContextRefs() != null || runnable.getContextSources() != null) {
+        if (runnable.getContextRefs() != null && !runnable.getContextRefs().isEmpty() || 
+            runnable.getContextSources() != null && !runnable.getContextSources().isEmpty()) {
             // Add Init container to the PodTemplateSpec
             // Build the Init Container
             V1Container initContainer = new V1Container()

diff --git a/...ain/java/it/smartcommunitylabdhub/framework/k8s/infrastructure/k8s/K8sServeFramework.java b/...ain/java/it/smartcommunitylabdhub/framework/k8s/infrastructure/k8s/K8sServeFramework.java
@@ -442,7 +442,8 @@ public V1Deployment buildDeployment(K8sServeRunnable runnable) throws K8sFramewo
         List<String> args = buildArgs(runnable);
 
         //check if context build is required
-        if (runnable.getContextRefs() != null || runnable.getContextSources() != null) {
+        if (runnable.getContextRefs() != null && !runnable.getContextRefs().isEmpty() || 
+            runnable.getContextSources() != null && !runnable.getContextSources().isEmpty()) {
             // Create sharedVolume
             CoreVolume sharedVolume = new CoreVolume(
                 CoreVolume.VolumeType.empty_dir,
@@ -502,7 +503,8 @@ public V1Deployment buildDeployment(K8sServeRunnable runnable) throws K8sFramewo
             .imagePullSecrets(buildImagePullSecrets(runnable));
 
         //check if context build is required
-        if (runnable.getContextRefs() != null || runnable.getContextSources() != null) {
+        if (runnable.getContextRefs() != null && !runnable.getContextRefs().isEmpty() || 
+            runnable.getContextSources() != null && !runnable.getContextSources().isEmpty()) {
             // Add Init container to the PodTemplateSpec
             // Build the Init Container
             V1Container initContainer = new V1Container()