Skip to content

Commit f002555

Browse files
committed
refactor: use bundleName instead of deprecated name
Signed-off-by: Chris Laprun <[email protected]>
1 parent 341f162 commit f002555

File tree

9 files changed

+13
-12
lines changed

9 files changed

+13
-12
lines changed

annotations/src/main/java/io/quarkiverse/operatorsdk/annotations/SharedCSVMetadata.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
/**
44
* A marker interface used to identify classes bearing {@link CSVMetadata} that needs to be shared across reconcilers using the
5-
* same {@link CSVMetadata#name()} attribute. Note that sharing metadata without using {@link SharedCSVMetadata} is not allowed.
5+
* same {@link CSVMetadata#bundleName()} attribute. Note that sharing metadata without using {@link SharedCSVMetadata} is not
6+
* allowed.
67
*/
78
public interface SharedCSVMetadata {
89
}

bundle-generator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/sources/AReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
88
import io.quarkiverse.operatorsdk.annotations.SharedCSVMetadata;
99

10-
@CSVMetadata(name = AReconciler.SHARED, version = AReconciler.SHARED_VERSION)
10+
@CSVMetadata(bundleName = AReconciler.SHARED, version = AReconciler.SHARED_VERSION)
1111
public class AReconciler implements Reconciler<ConfigMap>, SharedCSVMetadata {
1212

1313
public static final String SHARED_VERSION = "0.0.1";

bundle-generator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/sources/BReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
77
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
88

9-
@CSVMetadata(name = AReconciler.SHARED, version = "0.0.2")
9+
@CSVMetadata(bundleName = AReconciler.SHARED, version = "0.0.2")
1010
public class BReconciler implements Reconciler<Service> {
1111

1212
@Override

bundle-generator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/sources/DuplicatedBundleNameWithoutSharedCSVMetadata1.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
77
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
88

9-
@CSVMetadata(name = "illegal")
9+
@CSVMetadata(bundleName = "illegal")
1010
public class DuplicatedBundleNameWithoutSharedCSVMetadata1 implements Reconciler<Role> {
1111

1212
@Override
13-
public UpdateControl<Role> reconcile(Role role, Context<Role> context) throws Exception {
13+
public UpdateControl<Role> reconcile(Role role, Context<Role> context) {
1414
return null;
1515
}
1616
}

bundle-generator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/sources/DuplicatedBundleNameWithoutSharedCSVMetadata2.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
77
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
88

9-
@CSVMetadata(name = "illegal")
9+
@CSVMetadata(bundleName = "illegal")
1010
public class DuplicatedBundleNameWithoutSharedCSVMetadata2 implements Reconciler<RoleBinding> {
1111

1212
@Override
13-
public UpdateControl<RoleBinding> reconcile(RoleBinding roleBinding, Context<RoleBinding> context)
14-
throws Exception {
13+
public UpdateControl<RoleBinding> reconcile(RoleBinding roleBinding, Context<RoleBinding> context) {
1514
return null;
1615
}
1716
}

bundle-generator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/sources/FirstReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
66
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
77

8-
@CSVMetadata(name = "first-operator", version = FirstReconciler.VERSION)
8+
@CSVMetadata(bundleName = "first-operator", version = FirstReconciler.VERSION)
99
public class FirstReconciler implements Reconciler<First> {
1010

1111
public static final String VERSION = "first-version";

bundle-generator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/sources/SecondReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
88
import io.quarkiverse.operatorsdk.annotations.RBACRule;
99

10-
@CSVMetadata(name = "second-operator")
10+
@CSVMetadata(bundleName = "second-operator")
1111
@RBACRule(apiGroups = SecondReconciler.RBAC_RULE_GROUP, resources = SecondReconciler.RBAC_RULE_RES, verbs = SecondReconciler.RBAC_RULE_VERBS)
1212
@ControllerConfiguration(namespaces = "foo")
1313
public class SecondReconciler implements Reconciler<Second> {

bundle-generator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/sources/ThirdReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.quarkiverse.operatorsdk.annotations.CSVMetadata.Annotations.Annotation;
1111
import io.quarkiverse.operatorsdk.annotations.CSVMetadata.RequiredCRD;
1212

13-
@CSVMetadata(name = "third-operator", requiredCRDs = @RequiredCRD(kind = SecondExternal.KIND, name = "externalagains."
13+
@CSVMetadata(bundleName = "third-operator", requiredCRDs = @RequiredCRD(kind = SecondExternal.KIND, name = "externalagains."
1414
+ SecondExternal.GROUP, version = SecondExternal.VERSION), replaces = "1.0.0", annotations = @Annotations(skipRange = ">=1.0.0 <1.0.3", capabilities = "Test", others = @Annotation(name = "foo", value = "bar")))
1515
@ControllerConfiguration(name = ThirdReconciler.NAME, dependents = {
1616
@Dependent(type = ExternalDependentResource.class),

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,6 +3,7 @@
33
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
44
import io.quarkiverse.operatorsdk.annotations.SharedCSVMetadata;
55

6-
@CSVMetadata(name = "pingpong-operator")
6+
@CSVMetadata(bundleName = "pingpong-operator")
7+
@SuppressWarnings("unused")
78
public class PingPongOperatorCSVMetadata implements SharedCSVMetadata {
89
}

0 commit comments

Comments
 (0)