Skip to content

Commit 4e75d06

Browse files
committed
fix: remove use of deprecated package-name property
Signed-off-by: Chris Laprun <claprun@redhat.com>
1 parent 34f6b6f commit 4e75d06

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

docs/modules/ROOT/pages/deploy-with-olm.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ mvn clean package -Dquarkus.container-image.build=true \
3636
-Dquarkus.container-image.registry=<your container registry. Example: quay.io> \
3737
-Dquarkus.container-image.group=<your container registry namespace> \
3838
-Dquarkus.kubernetes.namespace=<the kubernetes namespace where you will deploy the operator> \
39-
-Dquarkus.operator-sdk.bundle.package-name=<the name of the package that bundle image belongs to> \
4039
-Dquarkus.operator-sdk.bundle.channels=<the list of channels that bundle image belongs to>
4140
----
4241

43-
For example, if we want to name the package `my-operator` and use the `alpha` channels, we would need to append the properties `-Dquarkus.operator-sdk.bundle.package-name=my-operator -Dquarkus.operator-sdk.bundle.channels=alpha`.
42+
For example, if we want to name the package `my-operator` and use the `alpha` channels, we would need to append the property `-Dquarkus.operator-sdk.bundle.channels=alpha`.
43+
The bundle name needs to be provided via the `bundleName` field, which would here take the `my-operator` value, of the `@CSVMetadata` annotation on your reconciler.
4444

4545
[NOTE]
4646
====

samples/joke/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,10 @@ mvn clean package -Dquarkus.container-image.build=true \
6565
-Dquarkus.container-image.registry=<your container registry. Example: quay.io> \
6666
-Dquarkus.container-image.group=<your container registry namespace> \
6767
-Dquarkus.kubernetes.namespace=<the kubernetes namespace where you will deploy the operator> \
68-
-Dquarkus.operator-sdk.bundle.package-name=<the name of the package that bundle image belongs to> \
6968
-Dquarkus.operator-sdk.bundle.channels=<the list of channels that bundle image belongs to>
7069
```
7170

72-
For example, if we want to name the package `joke-operator` and use the `alpha` channels, we would need to append the properties `-Dquarkus.operator-sdk.bundle.package-name=joke-operator -Dquarkus.operator-sdk.bundle.channels=alpha`.
71+
For example, if we want to name the package `joke-operator` and use the `alpha` channels, we would need to append the property `-Dquarkus.operator-sdk.bundle.channels=alpha`. The bundle name needs to be provided via the `bundleName` field of the `@CSVMetadata` annotation on your reconciler.
7372

7473
---
7574
**NOTE**

samples/joke/src/main/java/io/quarkiverse/operatorsdk/samples/joke/JokeRequestReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import io.quarkiverse.operatorsdk.samples.joke.JokeRequestSpec.ExcludedTopic;
3535
import io.quarkiverse.operatorsdk.samples.joke.JokeRequestStatus.State;
3636

37-
@CSVMetadata(requiredCRDs = @CSVMetadata.RequiredCRD(kind = "Joke", name = Joke.NAME, version = Joke.VERSION), icon = @Icon(fileName = "icon.png", mediatype = "image/png"))
37+
@CSVMetadata(bundleName = "joke-operator", requiredCRDs = @CSVMetadata.RequiredCRD(kind = "Joke", name = Joke.NAME, version = Joke.VERSION), icon = @Icon(fileName = "icon.png", mediatype = "image/png"))
3838
@ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE)
3939
@RBACRule(apiGroups = Joke.GROUP, resources = "jokes", verbs = RBACRule.ALL)
4040
@SuppressWarnings("unused")

samples/joke/src/main/resources/application.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ joke-api/mp-rest/url=https://v2.jokeapi.dev/joke
22
quarkus.operator-sdk.crd.apply=true
33
quarkus.container-image.builder=jib
44
quarkus.operator-sdk.bundle.channels=alpha
5-
quarkus.operator-sdk.bundle.package-name=joke-operator
65
quarkus.operator-sdk.crd.generate-all=true
76
quarkus.kubernetes-client.devservices.override-kubeconfig=true
87
quarkus.http.test-port=0

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
2424
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
2525
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
26+
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
2627

28+
@CSVMetadata(bundleName = "pingpong-operator")
2729
@ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE)
2830
@SuppressWarnings("unused")
2931
public class PingReconciler implements Reconciler<Ping> {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
2323

2424
@ControllerConfiguration(namespaces = WATCH_CURRENT_NAMESPACE)
25+
@SuppressWarnings("unused")
2526
public class PongReconciler implements Reconciler<Pong> {
2627

2728
@Override
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
quarkus.operator-sdk.crd.apply=true
22
quarkus.container-image.builder=jib
33
quarkus.operator-sdk.bundle.channels=alpha
4-
quarkus.operator-sdk.bundle.package-name=pingpong-operator
54
quarkus.kubernetes-client.devservices.override-kubeconfig=true
65
quarkus.http.test-port=0

0 commit comments

Comments
 (0)