refactor: replace custom dekorator impl with upstream ones

quarkusio · Sep 23, 2020 · c32da06 · c32da06
1 parent 50e9da5
commit c32da06
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 77 deletions.
diff --git a/...n/java/io/quarkus/kubernetes/deployment/DeploymentConfigRemoveLabelSelectorDecorator.java b/...n/java/io/quarkus/kubernetes/deployment/DeploymentConfigRemoveLabelSelectorDecorator.java
diff --git a/...rc/main/java/io/quarkus/kubernetes/deployment/DeploymentRemoveLabelSelectorDecorator.java b/...rc/main/java/io/quarkus/kubernetes/deployment/DeploymentRemoveLabelSelectorDecorator.java
diff --git a/...anilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java b/...anilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java
@@ -97,6 +97,9 @@
 import io.dekorate.kubernetes.decorator.ApplyServiceAccountNamedDecorator;
 import io.dekorate.kubernetes.decorator.ApplyWorkingDirDecorator;
 import io.dekorate.kubernetes.decorator.RemoveAnnotationDecorator;
+import io.dekorate.kubernetes.decorator.RemoveFromMatchingLabelsDecorator;
+import io.dekorate.kubernetes.decorator.RemoveFromSelectorDecorator;
+import io.dekorate.kubernetes.decorator.RemoveLabelDecorator;
 import io.dekorate.logger.NoopLogger;
 import io.dekorate.processor.SimpleFileReader;
 import io.dekorate.processor.SimpleFileWriter;
@@ -582,8 +585,9 @@ private void applyAnnotations(Session session, Project project, String target, P
     // apply Openshift specific configuration
     private void applyVanillaKubernetesSpecificConfig(Session session, KubernetesConfig kubernetesConfig) {
         if (!kubernetesConfig.addVersionToLabelSelectors) {
-            session.resources().decorate(KUBERNETES, new DeploymentRemoveLabelSelectorDecorator(Labels.VERSION));
-            session.resources().decorate(KUBERNETES, new ServiceRemoveLabelSelectorDecorator(Labels.VERSION));
+            session.resources().decorate(KUBERNETES, new RemoveLabelDecorator(Labels.VERSION));
+            session.resources().decorate(KUBERNETES, new RemoveFromSelectorDecorator(Labels.VERSION));
+            session.resources().decorate(KUBERNETES, new RemoveFromMatchingLabelsDecorator(Labels.VERSION));
         }
     }
 
@@ -592,9 +596,8 @@ private void applyOpenshiftSpecificConfig(Session session, OpenshiftConfig opens
         session.resources().decorate(OPENSHIFT, new AddLabelDecorator(new Label(OPENSHIFT_APP_RUNTIME, QUARKUS)));
 
         if (!openshiftConfig.addVersionToLabelSelectors) {
-            session.resources().decorate(OPENSHIFT,
-                    new DeploymentConfigRemoveLabelSelectorDecorator(Labels.VERSION));
-            session.resources().decorate(OPENSHIFT, new ServiceRemoveLabelSelectorDecorator(Labels.VERSION));
+            session.resources().decorate(OPENSHIFT, new RemoveLabelDecorator(Labels.VERSION));
+            session.resources().decorate(OPENSHIFT, new RemoveFromSelectorDecorator(Labels.VERSION));
         }
     }
 

diff --git a/...ployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveLabelSelectorDecorator.java b/...ployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveLabelSelectorDecorator.java
diff --git a/...t/src/main/java/io/quarkus/kubernetes/deployment/ServiceRemoveLabelSelectorDecorator.java b/...t/src/main/java/io/quarkus/kubernetes/deployment/ServiceRemoveLabelSelectorDecorator.java