Skip to content

Commit 354064b

Browse files
committed
fix: ensure that ping & pong reconcilers are assigned to same bundle
Signed-off-by: Chris Laprun <claprun@redhat.com>
1 parent 4e75d06 commit 354064b

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

bundle-generator/deployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleProcessor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ CSVMetadataBuildItem gatherCSVMetadata(KubernetesConfig kubernetesConfig,
8888

8989
final var sharedMetadataHolders = getSharedMetadataHolders(defaultName, defaultVersion, defaultReplaces, index);
9090
final var csvGroups = new HashMap<CSVMetadataHolder, List<ReconcilerAugmentedClassInfo>>();
91-
9291
ClassUtils.getKnownReconcilers(index, log)
9392
.forEach(reconcilerInfo -> {
9493
// figure out which group should be used to generate CSV

samples/pingpong/src/main/java/io/quarkiverse/operatorsdk/samples/pingpong/PingPongOperatorCSVMetadata.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
44
import io.quarkiverse.operatorsdk.annotations.SharedCSVMetadata;
55

6-
@CSVMetadata(bundleName = "pingpong-operator")
6+
@CSVMetadata(bundleName = PingPongOperatorCSVMetadata.BUNDLE_NAME)
77
@SuppressWarnings("unused")
88
public class PingPongOperatorCSVMetadata implements SharedCSVMetadata {
9+
public static final String BUNDLE_NAME = "pingpong-operator";
910
}

samples/pingpong/src/main/java/io/quarkiverse/operatorsdk/samples/pingpong/PingReconciler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package io.quarkiverse.operatorsdk.samples.pingpong;
1616

1717
import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_CURRENT_NAMESPACE;
18+
import static io.quarkiverse.operatorsdk.samples.pingpong.PingPongOperatorCSVMetadata.BUNDLE_NAME;
1819

1920
import jakarta.inject.Inject;
2021

@@ -25,7 +26,7 @@
2526
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
2627
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
2728

28-
@CSVMetadata(bundleName = "pingpong-operator")
29+
@CSVMetadata(bundleName = BUNDLE_NAME)
2930
@ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE)
3031
@SuppressWarnings("unused")
3132
public class PingReconciler implements Reconciler<Ping> {

samples/pingpong/src/main/java/io/quarkiverse/operatorsdk/samples/pingpong/PongReconciler.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@
1515
package io.quarkiverse.operatorsdk.samples.pingpong;
1616

1717
import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_CURRENT_NAMESPACE;
18+
import static io.quarkiverse.operatorsdk.samples.pingpong.PingPongOperatorCSVMetadata.BUNDLE_NAME;
1819

1920
import io.javaoperatorsdk.operator.api.reconciler.Context;
2021
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
2122
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
2223
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
24+
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
2325

26+
@CSVMetadata(bundleName = BUNDLE_NAME)
2427
@ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE)
2528
@SuppressWarnings("unused")
2629
public class PongReconciler implements Reconciler<Pong> {

0 commit comments

Comments
 (0)