diff --git a/annotations/pom.xml b/annotations/pom.xml index 050ab4bc..ed6c9424 100644 --- a/annotations/pom.xml +++ b/annotations/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT quarkus-operator-sdk-annotations diff --git a/bom/pom.xml b/bom/pom.xml index 4f51fe4a..7cbe2edf 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT quarkus-operator-sdk-bom Quarkus - Operator SDK - BOM diff --git a/build-parent/pom.xml b/build-parent/pom.xml index e86f7d29..6015160d 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT quarkus-operator-sdk-build-parent pom diff --git a/bundle-generator/deployment/pom.xml b/bundle-generator/deployment/pom.xml index d936b2f0..c17f83df 100644 --- a/bundle-generator/deployment/pom.xml +++ b/bundle-generator/deployment/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-bundle-generator-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT Quarkus - Operator SDK - Bundle Generator - Deployment diff --git a/bundle-generator/pom.xml b/bundle-generator/pom.xml index 592e7d03..8a4d1ab2 100644 --- a/bundle-generator/pom.xml +++ b/bundle-generator/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-build-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT ../build-parent/pom.xml diff --git a/bundle-generator/runtime/pom.xml b/bundle-generator/runtime/pom.xml index a4485700..97fccec9 100644 --- a/bundle-generator/runtime/pom.xml +++ b/bundle-generator/runtime/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-bundle-generator-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT Quarkus - Operator SDK - Bundle Generator - Runtime diff --git a/common-deployment/pom.xml b/common-deployment/pom.xml index 5f4f9d35..46724698 100644 --- a/common-deployment/pom.xml +++ b/common-deployment/pom.xml @@ -3,7 +3,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-build-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT ../build-parent/pom.xml 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 3e4d480f..473bef38 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-build-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml index fff93373..c27984d2 100644 --- a/core/deployment/pom.xml +++ b/core/deployment/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-core-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT quarkus-operator-sdk-deployment Quarkus - Operator SDK - Core - Deployment diff --git a/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/QuarkusControllerConfigurationBuildStep.java b/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/QuarkusControllerConfigurationBuildStep.java index 355a0a31..f0c2ef24 100644 --- a/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/QuarkusControllerConfigurationBuildStep.java +++ b/core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/QuarkusControllerConfigurationBuildStep.java @@ -65,7 +65,9 @@ public KubernetesDependentResourceConfig configFrom( return new QuarkusKubernetesDependentResourceConfig(original.namespaces(), original.labelSelector(), original.wereNamespacesConfigured(), - original.getResourceDiscriminator(), original.onAddFilter(), + original.createResourceOnlyIfNotExistingWithSSA(), original.getResourceDiscriminator(), + (Boolean) original.useSSA().orElse(null), + original.onAddFilter(), original.onUpdateFilter(), original.onDeleteFilter(), original.genericFilter()); } }; diff --git a/core/pom.xml b/core/pom.xml index 35131a24..6c19b8c3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-build-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT ../build-parent/pom.xml diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml index ce2bbee7..8cc3355d 100644 --- a/core/runtime/pom.xml +++ b/core/runtime/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-core-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT quarkus-operator-sdk Quarkus - Operator SDK - Core - Runtime diff --git a/core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/QuarkusKubernetesDependentResourceConfig.java b/core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/QuarkusKubernetesDependentResourceConfig.java index 48f46abe..8e402f67 100644 --- a/core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/QuarkusKubernetesDependentResourceConfig.java +++ b/core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/QuarkusKubernetesDependentResourceConfig.java @@ -16,13 +16,15 @@ public class QuarkusKubernetesDependentResourceConfig ext @RecordableConstructor public QuarkusKubernetesDependentResourceConfig(Set namespaces, String labelSelector, boolean configuredNS, + boolean createResourceOnlyIfNotExistingWithSSA, ResourceDiscriminator resourceDiscriminator, + Boolean useSSA, OnAddFilter onAddFilter, OnUpdateFilter onUpdateFilter, OnDeleteFilter onDeleteFilter, GenericFilter genericFilter) { - super(namespaces, labelSelector, configuredNS, resourceDiscriminator, onAddFilter, onUpdateFilter, onDeleteFilter, - genericFilter); + super(namespaces, labelSelector, configuredNS, createResourceOnlyIfNotExistingWithSSA, resourceDiscriminator, + useSSA, onAddFilter, onUpdateFilter, onDeleteFilter, genericFilter); } // Needed for the recordable constructor @@ -69,4 +71,16 @@ public GenericFilter getGenericFilter() { public boolean getConfiguredNS() { return wereNamespacesConfigured(); } + + // Needed for the recordable constructor + @SuppressWarnings("unused") + public boolean isCreateResourceOnlyIfNotExistingWithSSA() { + return createResourceOnlyIfNotExistingWithSSA(); + } + + // Needed for the recordable constructor + @SuppressWarnings("unused") + public Boolean isUseSSA() { + return useSSA().orElse(null); + } } diff --git a/docs/modules/ROOT/pages/includes/quarkus-operator-sdk.adoc b/docs/modules/ROOT/pages/includes/quarkus-operator-sdk.adoc index cd72e1eb..03c0ed3a 100644 --- a/docs/modules/ROOT/pages/includes/quarkus-operator-sdk.adoc +++ b/docs/modules/ROOT/pages/includes/quarkus-operator-sdk.adoc @@ -593,11 +593,17 @@ ifndef::no-duration-note[] [id='duration-note-anchor-{summaryTableId}'] .About the Duration format ==== -The format for durations uses the standard `java.time.Duration` format. -You can learn more about it in the link:https://docs.oracle.com/javase/8/docs/api/java/time/Duration.html#parse-java.lang.CharSequence-[Duration#parse() javadoc]. +To write duration values, use the standard `java.time.Duration` format. +See the link:https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/time/Duration.html#parse(java.lang.CharSequence)[Duration#parse() javadoc] for more information. -You can also provide duration values starting with a number. -In this case, if the value consists only of a number, the converter treats the value as seconds. -Otherwise, `PT` is implicitly prepended to the value to obtain a standard `java.time.Duration` format. +You can also use a simplified format, starting with a number: + +* If the value is only a number, it represents time in seconds. +* If the value is a number followed by `ms`, it represents time in milliseconds. + +In other cases, the simplified format is translated to the `java.time.Duration` format for parsing: + +* If the value is a number followed by `h`, `m`, or `s`, it is prefixed with `PT`. +* If the value is a number followed by `d`, it is prefixed with `P`. ==== endif::no-duration-note[] diff --git a/docs/pom.xml b/docs/pom.xml index 2619a146..8c48efa5 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-build-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT ../build-parent/pom.xml diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index a0542e82..83f0fc03 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-build-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT ../build-parent/pom.xml quarkus-operator-sdk-integration-tests diff --git a/pom.xml b/pom.xml index 13a30cb3..eb2e31b1 100644 --- a/pom.xml +++ b/pom.xml @@ -8,12 +8,12 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-parent - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT pom Quarkus - Operator SDK - Parent - 3.2.6.Final - 4.4.3 + 3.4.0 + 4.5.0-SNAPSHOT :git:git@github.com:quarkiverse/quarkus-operator-sdk.git diff --git a/samples/exposedapp/pom.xml b/samples/exposedapp/pom.xml index b0015507..2c81c482 100644 --- a/samples/exposedapp/pom.xml +++ b/samples/exposedapp/pom.xml @@ -3,7 +3,7 @@ quarkus-operator-sdk-samples io.quarkiverse.operatorsdk - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT 4.0.0 diff --git a/samples/joke/pom.xml b/samples/joke/pom.xml index a972fcf2..c74ec350 100644 --- a/samples/joke/pom.xml +++ b/samples/joke/pom.xml @@ -3,7 +3,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-samples - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT 4.0.0 diff --git a/samples/mysql-schema/pom.xml b/samples/mysql-schema/pom.xml index a4d508f7..6d215812 100644 --- a/samples/mysql-schema/pom.xml +++ b/samples/mysql-schema/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-samples - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT quarkus-operator-sdk-samples-mysql-schema diff --git a/samples/pingpong/pom.xml b/samples/pingpong/pom.xml index cb388ee3..6396521b 100644 --- a/samples/pingpong/pom.xml +++ b/samples/pingpong/pom.xml @@ -3,7 +3,7 @@ io.quarkiverse.operatorsdk quarkus-operator-sdk-samples - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT 4.0.0 diff --git a/samples/pom.xml b/samples/pom.xml index fa41ef86..d86a26c8 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -3,7 +3,7 @@ quarkus-operator-sdk-build-parent io.quarkiverse.operatorsdk - 6.3.3-SNAPSHOT + 6.4.0-SNAPSHOT ../build-parent/pom.xml 4.0.0