Fix RemoveDeploymentTriggerDecorator order

The decorator RemoveDeploymentTriggerDecorator was not configured to be triggered before ChangeDeploymentTriggerDecorator, so sometimes the image stream tag was wrong. Relates to failures in https://github.com/dekorateio/dekorate/actions/runs/4023231521/jobs/6913879180
quarkusio · Feb 1, 2023 · ce2d2d6 · ce2d2d6
1 parent 247fcb5
commit ce2d2d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java b/...vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/OpenshiftProcessor.java
@@ -322,7 +322,7 @@ public List<DecoratorBuildItem> createDecorators(ApplicationInfoBuildItem applic
                 String imageStreamWithTag = name + ":" + i.getTag();
                 result.add(new DecoratorBuildItem(OPENSHIFT, new ApplyContainerImageDecorator(name, imageStreamWithTag)));
                 // remove the default trigger which has a wrong version
-                result.add(new DecoratorBuildItem(OPENSHIFT, new RemoveDeploymentTriggerDecorator()));
+                result.add(new DecoratorBuildItem(OPENSHIFT, new RemoveDeploymentTriggerDecorator(name)));
                 // re-add the trigger with the correct version
                 result.add(new DecoratorBuildItem(OPENSHIFT, new ChangeDeploymentTriggerDecorator(name, imageStreamWithTag)));
             });

diff --git a/...ment/src/main/java/io/quarkus/kubernetes/deployment/RemoveDeploymentTriggerDecorator.java b/...ment/src/main/java/io/quarkus/kubernetes/deployment/RemoveDeploymentTriggerDecorator.java
@@ -10,13 +10,17 @@
 
 public class RemoveDeploymentTriggerDecorator extends NamedResourceDecorator<DeploymentConfigSpecFluent<?>> {
 
+    public RemoveDeploymentTriggerDecorator(String name) {
+        super(name);
+    }
+
     @Override
     public void andThenVisit(DeploymentConfigSpecFluent<?> deploymentConfigSpec, ObjectMeta objectMeta) {
         deploymentConfigSpec.withTriggers(Collections.emptyList());
     }
 
     @Override
-    public Class<? extends Decorator>[] after() {
+    public Class<? extends Decorator>[] before() {
         return new Class[] { ApplyDeploymentTriggerDecorator.class };
     }
 }