Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release 6.6.6 #858

Merged
merged 2 commits into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/project.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Java Operator SDK Extension
release:
current-version: 6.6.5
next-version: 6.6.6-SNAPSHOT
current-version: 6.6.6
next-version: 6.6.7-SNAPSHOT

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

/**
* A marker interface used to identify classes bearing {@link CSVMetadata} that needs to be shared across reconcilers using the
* same {@link CSVMetadata#name()} attribute. Note that sharing metadata without using {@link SharedCSVMetadata} is not allowed.
* same {@link CSVMetadata#bundleName()} attribute. Note that sharing metadata without using {@link SharedCSVMetadata} is not
* allowed.
*/
public interface SharedCSVMetadata {
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
import io.quarkiverse.operatorsdk.annotations.SharedCSVMetadata;

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

public static final String SHARED_VERSION = "0.0.1";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;

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

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;

@CSVMetadata(name = "illegal")
@CSVMetadata(bundleName = "illegal")
public class DuplicatedBundleNameWithoutSharedCSVMetadata1 implements Reconciler<Role> {

@Override
public UpdateControl<Role> reconcile(Role role, Context<Role> context) throws Exception {
public UpdateControl<Role> reconcile(Role role, Context<Role> context) {
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;

@CSVMetadata(name = "illegal")
@CSVMetadata(bundleName = "illegal")
public class DuplicatedBundleNameWithoutSharedCSVMetadata2 implements Reconciler<RoleBinding> {

@Override
public UpdateControl<RoleBinding> reconcile(RoleBinding roleBinding, Context<RoleBinding> context)
throws Exception {
public UpdateControl<RoleBinding> reconcile(RoleBinding roleBinding, Context<RoleBinding> context) {
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;

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

public static final String VERSION = "first-version";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
import io.quarkiverse.operatorsdk.annotations.RBACRule;

@CSVMetadata(name = "second-operator")
@CSVMetadata(bundleName = "second-operator")
@RBACRule(apiGroups = SecondReconciler.RBAC_RULE_GROUP, resources = SecondReconciler.RBAC_RULE_RES, verbs = SecondReconciler.RBAC_RULE_VERBS)
@ControllerConfiguration(namespaces = "foo")
public class SecondReconciler implements Reconciler<Second> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import io.quarkiverse.operatorsdk.annotations.CSVMetadata.Annotations.Annotation;
import io.quarkiverse.operatorsdk.annotations.CSVMetadata.RequiredCRD;

@CSVMetadata(name = "third-operator", requiredCRDs = @RequiredCRD(kind = SecondExternal.KIND, name = "externalagains."
@CSVMetadata(bundleName = "third-operator", requiredCRDs = @RequiredCRD(kind = SecondExternal.KIND, name = "externalagains."
+ 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")))
@ControllerConfiguration(name = ThirdReconciler.NAME, dependents = {
@Dependent(type = ExternalDependentResource.class),
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/ROOT/pages/includes/attributes.adoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
:project-version: 6.6.5
:project-version: 6.6.6

:examples-dir: ./../examples/
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.quarkiverse.operatorsdk.annotations.CSVMetadata;
import io.quarkiverse.operatorsdk.annotations.SharedCSVMetadata;

@CSVMetadata(name = "pingpong-operator")
@CSVMetadata(bundleName = "pingpong-operator")
@SuppressWarnings("unused")
public class PingPongOperatorCSVMetadata implements SharedCSVMetadata {
}
Loading