Fix for container build, function update

scc-digitalhub · May 3, 2024 · 31f299a · 31f299a
1 parent 81ea99d
commit 31f299a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...java/it/smartcommunitylabdhub/framework/kaniko/infrastructure/k8s/K8sKanikoFramework.java b/...java/it/smartcommunitylabdhub/framework/kaniko/infrastructure/k8s/K8sKanikoFramework.java
@@ -131,8 +131,12 @@ public V1Job build(K8sKanikoRunnable runnable) throws K8sFrameworkException {
         String prefix =
             (StringUtils.hasText(imageRegistry) ? imageRegistry + "/" : "") +
             (StringUtils.hasText(imagePrefix) ? imagePrefix + "-" : "");
-        String imageName = k8sBuilderHelper.getImageName(prefix + runnable.getImage(), runnable.getId());
-        runnable.setImage(imageName);
+        // workaround: update image name only first time
+        String imageName =  runnable.getImage();
+        if (StringUtils.hasText(prefix) && !runnable.getImage().startsWith(prefix)) {
+            imageName = k8sBuilderHelper.getImageName(prefix + runnable.getImage(), runnable.getId());
+            runnable.setImage(imageName);                
+        }
 
         //build labels
         Map<String, String> labels = buildLabels(runnable);

diff --git a/...-container/src/main/java/it/smartcommunitylabdhub/runtime/container/ContainerRuntime.java b/...-container/src/main/java/it/smartcommunitylabdhub/runtime/container/ContainerRuntime.java
@@ -313,7 +313,8 @@ public RunContainerStatus onComplete(Run run, RunRunnable runnable) {
             FunctionContainerSpec funSpec = new FunctionContainerSpec(function.getSpec());
             if (!image.equals(funSpec.getImage())) {
                 funSpec.setImage(image);
-                functionService.updateFunction(functionId, function);
+                function.setSpec(funSpec.toMap());
+                functionService.updateFunction(functionId, function, true);
             }
         }