Fix #1696: Fix failures in PUT during applying ImageStreams

fabric8io · Oct 16, 2019 · 244a5bc · 244a5bc
1 parent f75d09b
commit 244a5bc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ After this we will switch probably to real [Semantic Versioning 2.0.0](http://se
 * Fix #1728: Ingress enricher is using Ingress kind
 * Fix #1732: Correctly replacing template placeholders in helm chart
 * Fix #1734: Add logging during jib builds
+* Fix #1696: Fix put operations for ImageStreams in ApplyService
 
 ### 4.3.0 (04-10-2019)
 * Updated custom-enricher sample

diff --git a/core/src/main/java/io/fabric8/maven/core/service/ApplyService.java b/core/src/main/java/io/fabric8/maven/core/service/ApplyService.java
@@ -814,9 +814,9 @@ public void applyImageStream(ImageStream entity, String sourceName) {
                 } else {
                     log.info("Updating " + kind + " " + name + " from " + sourceName);
                     copyAllImageStreamTags(entity, old);
-                    patchService.compareAndPatchEntity(namespace, entity, old);
+                    entity = patchService.compareAndPatchEntity(namespace, entity, old);
+                    openShiftClient.resource(entity).inNamespace(namespace).createOrReplace();
                 }
-                openShiftClient.resource(entity).inNamespace(namespace).createOrReplace();
             } catch (Exception e) {
                 onApplyError("Failed to create " + kind + " from " + sourceName + ". " + e, e);
             }

diff --git a/core/src/main/java/io/fabric8/maven/core/service/kubernetes/JibBuildService.java b/core/src/main/java/io/fabric8/maven/core/service/kubernetes/JibBuildService.java
@@ -61,7 +61,7 @@ public void build(ImageConfiguration imageConfiguration) {
            } else {
                fullName = new ImageName(imageConfiguration.getName(), null).getFullName();
            }
-           log.info("Image tagging successfull!");
+           log.info("Image tagging successful!");
            jibBuildConfiguration = JibBuildServiceUtil.getJibBuildConfiguration(config, buildImageConfiguration, fullName, log);
            JibBuildServiceUtil.buildImage(jibBuildConfiguration, log);
        } catch (Exception ex) {
@@ -199,4 +199,4 @@ public JibBuildConfiguration build() {
             }
         }
     }
-}
+}