chore: update to Quarkus 3.4.0 (#676)

* chore: upgrade to Quarkus 3.4.0 * chore: update version to 6.4.0-SNAPSHOT * chore: update to JOSDK 4.5.0-SNAPSHOT Signed-off-by: Chris Laprun <claprun@redhat.com>
quarkiverse · Sep 18, 2023 · 7a16033 · 7a16033
1 parent ff47499
commit 7a16033
Show file tree

Hide file tree

Showing 22 changed files with 51 additions and 29 deletions.
diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkiverse.operatorsdk</groupId>
         <artifactId>quarkus-operator-sdk-parent</artifactId>
-        <version>6.3.3-SNAPSHOT</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>quarkus-operator-sdk-annotations</artifactId>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.quarkiverse.operatorsdk</groupId>
     <artifactId>quarkus-operator-sdk-parent</artifactId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>quarkus-operator-sdk-bom</artifactId>
   <name>Quarkus - Operator SDK - BOM</name>

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.quarkiverse.operatorsdk</groupId>
     <artifactId>quarkus-operator-sdk-parent</artifactId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>quarkus-operator-sdk-build-parent</artifactId>
   <packaging>pom</packaging>

diff --git a/bundle-generator/deployment/pom.xml b/bundle-generator/deployment/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.quarkiverse.operatorsdk</groupId>
         <artifactId>quarkus-operator-sdk-bundle-generator-parent</artifactId>
-        <version>6.3.3-SNAPSHOT</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
 
     <name>Quarkus - Operator SDK - Bundle Generator - Deployment</name>

diff --git a/bundle-generator/pom.xml b/bundle-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.quarkiverse.operatorsdk</groupId>
         <artifactId>quarkus-operator-sdk-build-parent</artifactId>
-        <version>6.3.3-SNAPSHOT</version>
+        <version>6.4.0-SNAPSHOT</version>
         <relativePath>../build-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/bundle-generator/runtime/pom.xml b/bundle-generator/runtime/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.quarkiverse.operatorsdk</groupId>
         <artifactId>quarkus-operator-sdk-bundle-generator-parent</artifactId>
-        <version>6.3.3-SNAPSHOT</version>
+        <version>6.4.0-SNAPSHOT</version>
     </parent>
 
     <name>Quarkus - Operator SDK - Bundle Generator - Runtime</name>

diff --git a/common-deployment/pom.xml b/common-deployment/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.quarkiverse.operatorsdk</groupId>
     <artifactId>quarkus-operator-sdk-build-parent</artifactId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
     <relativePath>../build-parent/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/common/pom.xml b/common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.quarkiverse.operatorsdk</groupId>
         <artifactId>quarkus-operator-sdk-build-parent</artifactId>
-        <version>6.3.3-SNAPSHOT</version>
+        <version>6.4.0-SNAPSHOT</version>
         <relativePath>../build-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.quarkiverse.operatorsdk</groupId>
     <artifactId>quarkus-operator-sdk-core-parent</artifactId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>quarkus-operator-sdk-deployment</artifactId>
   <name>Quarkus - Operator SDK - Core - Deployment</name>

diff --git a/...n/java/io/quarkiverse/operatorsdk/deployment/QuarkusControllerConfigurationBuildStep.java b/...n/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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.quarkiverse.operatorsdk</groupId>
         <artifactId>quarkus-operator-sdk-build-parent</artifactId>
-        <version>6.3.3-SNAPSHOT</version>
+        <version>6.4.0-SNAPSHOT</version>
         <relativePath>../build-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.quarkiverse.operatorsdk</groupId>
     <artifactId>quarkus-operator-sdk-core-parent</artifactId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>quarkus-operator-sdk</artifactId>
   <name>Quarkus - Operator SDK - Core - Runtime</name>

diff --git a/...ain/java/io/quarkiverse/operatorsdk/runtime/QuarkusKubernetesDependentResourceConfig.java b/...ain/java/io/quarkiverse/operatorsdk/runtime/QuarkusKubernetesDependentResourceConfig.java
@@ -16,13 +16,15 @@ public class QuarkusKubernetesDependentResourceConfig<R extends HasMetadata> ext
     @RecordableConstructor
     public QuarkusKubernetesDependentResourceConfig(Set<String> namespaces, String labelSelector,
             boolean configuredNS,
+            boolean createResourceOnlyIfNotExistingWithSSA,
             ResourceDiscriminator<R, ?> resourceDiscriminator,
+            Boolean useSSA,
             OnAddFilter<R> onAddFilter,
             OnUpdateFilter<R> onUpdateFilter,
             OnDeleteFilter<R> onDeleteFilter,
             GenericFilter<R> 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<R> 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
@@ -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
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.quarkiverse.operatorsdk</groupId>
         <artifactId>quarkus-operator-sdk-build-parent</artifactId>
-        <version>6.3.3-SNAPSHOT</version>
+        <version>6.4.0-SNAPSHOT</version>
         <relativePath>../build-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.quarkiverse.operatorsdk</groupId>
     <artifactId>quarkus-operator-sdk-build-parent</artifactId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
     <relativePath>../build-parent/pom.xml</relativePath>
   </parent>
   <artifactId>quarkus-operator-sdk-integration-tests</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -8,12 +8,12 @@
   </parent>
   <groupId>io.quarkiverse.operatorsdk</groupId>
   <artifactId>quarkus-operator-sdk-parent</artifactId>
-  <version>6.3.3-SNAPSHOT</version>
+  <version>6.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Quarkus - Operator SDK - Parent</name>
   <properties>
-    <quarkus.version>3.2.6.Final</quarkus.version>
-    <java-operator-sdk.version>4.4.3</java-operator-sdk.version>
+    <quarkus.version>3.4.0</quarkus.version>
+    <java-operator-sdk.version>4.5.0-SNAPSHOT</java-operator-sdk.version>
   </properties>
   <scm>
     <connection>:git:git@github.com:quarkiverse/quarkus-operator-sdk.git</connection>

diff --git a/samples/exposedapp/pom.xml b/samples/exposedapp/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>quarkus-operator-sdk-samples</artifactId>
     <groupId>io.quarkiverse.operatorsdk</groupId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/samples/joke/pom.xml b/samples/joke/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.quarkiverse.operatorsdk</groupId>
     <artifactId>quarkus-operator-sdk-samples</artifactId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/samples/mysql-schema/pom.xml b/samples/mysql-schema/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.quarkiverse.operatorsdk</groupId>
     <artifactId>quarkus-operator-sdk-samples</artifactId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>quarkus-operator-sdk-samples-mysql-schema</artifactId>

diff --git a/samples/pingpong/pom.xml b/samples/pingpong/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.quarkiverse.operatorsdk</groupId>
     <artifactId>quarkus-operator-sdk-samples</artifactId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/samples/pom.xml b/samples/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>quarkus-operator-sdk-build-parent</artifactId>
     <groupId>io.quarkiverse.operatorsdk</groupId>
-    <version>6.3.3-SNAPSHOT</version>
+    <version>6.4.0-SNAPSHOT</version>
     <relativePath>../build-parent/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>