fix: ensure that ping & pong reconcilers are assigned to same bundle

Signed-off-by: Chris Laprun <claprun@redhat.com>
quarkiverse · Jul 3, 2024 · 354064b · 354064b
1 parent 4e75d06
commit 354064b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/...eployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleProcessor.java b/...eployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleProcessor.java
@@ -88,7 +88,6 @@ CSVMetadataBuildItem gatherCSVMetadata(KubernetesConfig kubernetesConfig,
 
         final var sharedMetadataHolders = getSharedMetadataHolders(defaultName, defaultVersion, defaultReplaces, index);
         final var csvGroups = new HashMap<CSVMetadataHolder, List<ReconcilerAugmentedClassInfo>>();
-
         ClassUtils.getKnownReconcilers(index, log)
                 .forEach(reconcilerInfo -> {
                     // figure out which group should be used to generate CSV

diff --git a/...rc/main/java/io/quarkiverse/operatorsdk/samples/pingpong/PingPongOperatorCSVMetadata.java b/...rc/main/java/io/quarkiverse/operatorsdk/samples/pingpong/PingPongOperatorCSVMetadata.java
@@ -3,7 +3,8 @@
 import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
 import io.quarkiverse.operatorsdk.annotations.SharedCSVMetadata;
 
-@CSVMetadata(bundleName = "pingpong-operator")
+@CSVMetadata(bundleName = PingPongOperatorCSVMetadata.BUNDLE_NAME)
 @SuppressWarnings("unused")
 public class PingPongOperatorCSVMetadata implements SharedCSVMetadata {
+    public static final String BUNDLE_NAME = "pingpong-operator";
 }
diff --git a/...es/pingpong/src/main/java/io/quarkiverse/operatorsdk/samples/pingpong/PingReconciler.java b/...es/pingpong/src/main/java/io/quarkiverse/operatorsdk/samples/pingpong/PingReconciler.java
@@ -15,6 +15,7 @@
 package io.quarkiverse.operatorsdk.samples.pingpong;
 
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_CURRENT_NAMESPACE;
+import static io.quarkiverse.operatorsdk.samples.pingpong.PingPongOperatorCSVMetadata.BUNDLE_NAME;
 
 import jakarta.inject.Inject;
 
@@ -25,7 +26,7 @@
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
 
-@CSVMetadata(bundleName = "pingpong-operator")
+@CSVMetadata(bundleName = BUNDLE_NAME)
 @ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE)
 @SuppressWarnings("unused")
 public class PingReconciler implements Reconciler<Ping> {

diff --git a/...es/pingpong/src/main/java/io/quarkiverse/operatorsdk/samples/pingpong/PongReconciler.java b/...es/pingpong/src/main/java/io/quarkiverse/operatorsdk/samples/pingpong/PongReconciler.java
@@ -15,12 +15,15 @@
 package io.quarkiverse.operatorsdk.samples.pingpong;
 
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_CURRENT_NAMESPACE;
+import static io.quarkiverse.operatorsdk.samples.pingpong.PingPongOperatorCSVMetadata.BUNDLE_NAME;
 
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
 
+@CSVMetadata(bundleName = BUNDLE_NAME)
 @ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE)
 @SuppressWarnings("unused")
 public class PongReconciler implements Reconciler<Pong> {