From 8eae4f2c68c69d4a4de89160738056bb2a1ecc4e Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Thu, 29 Jun 2023 06:29:52 +0200 Subject: [PATCH 1/5] fix: clarify apply CRD usage --- .../scaffolds/internal/templates/applicationproperties.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go index b7a76a7..24ff976 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go @@ -47,6 +47,6 @@ func (f *ApplicationPropertiesFile) SetTemplateDefaults() error { const ApplicationPropertiesTemplate = `quarkus.container-image.build=true #quarkus.container-image.group= quarkus.container-image.name={{ .ProjectName }}-operator -# set to true to automatically apply CRDs to the cluster when they get regenerated -quarkus.operator-sdk.crd.apply=false -` +# set to false to prevent CRDs from being applied to the cluster automatically (only applies to dev mode, CRD applying is disabled in prod) +# quarkus.operator-sdk.crd.apply=false +` \ No newline at end of file From 6a26b7b6dd4cd85db8d0c6cf7ec5053160262480 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Thu, 29 Jun 2023 06:30:18 +0200 Subject: [PATCH 2/5] feat: move to java 17 by default --- pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go index 6eb3c7a..7c428ef 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go @@ -53,8 +53,8 @@ const pomxmlTemplate = ` 3.10.1 true - 11 - 11 + 17 + 17 UTF-8 UTF-8 6.0.0 From 79f86cb4a7897223ec00200edb6b2e26ab8828a6 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Fri, 30 Jun 2023 18:09:58 +0200 Subject: [PATCH 3/5] chore: upgrade Quarkus to 3.2.0 and QOSDK to 6.2.0 --- pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go | 4 ++-- testdata/quarkus/memcached-quarkus-operator/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go index 7c428ef..c24ac20 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go @@ -57,8 +57,8 @@ const pomxmlTemplate = ` 17 UTF-8 UTF-8 - 6.0.0 - 3.0.0.Final + 6.2.0 + 3.2.0.Final diff --git a/testdata/quarkus/memcached-quarkus-operator/pom.xml b/testdata/quarkus/memcached-quarkus-operator/pom.xml index 1308125..519cede 100644 --- a/testdata/quarkus/memcached-quarkus-operator/pom.xml +++ b/testdata/quarkus/memcached-quarkus-operator/pom.xml @@ -15,8 +15,8 @@ 11 UTF-8 UTF-8 - 6.0.0 - 3.0.0.Final + 6.2.0 + 3.2.0.Final From 0d45314266cf5bd9c05c8fe3d14e23e10096aa81 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Fri, 30 Jun 2023 18:22:51 +0200 Subject: [PATCH 4/5] fix: improper property key and comment --- .../src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testdata/quarkus/memcached-quarkus-operator/src/main/resources/application.properties b/testdata/quarkus/memcached-quarkus-operator/src/main/resources/application.properties index 49a7598..9877790 100644 --- a/testdata/quarkus/memcached-quarkus-operator/src/main/resources/application.properties +++ b/testdata/quarkus/memcached-quarkus-operator/src/main/resources/application.properties @@ -3,5 +3,5 @@ quarkus.container-image.build=true quarkus.container-image.name=memcached-quarkus-operator-operator # set to true to automatically apply CRDs to the cluster when they get regenerated quarkus.operator-sdk.crd.apply=false -# set to true to automatically generate CSV from your code -quarkus.operator-sdk.generate-csv=false +# set to true to automatically generate OLM bundle from your code +quarkus.operator-sdk.bundle.enabled=false From 6ab1a2a788861c269891e354ef4ecb1bb9e1b210 Mon Sep 17 00:00:00 2001 From: Chris Laprun Date: Tue, 4 Jul 2023 15:18:41 +0200 Subject: [PATCH 5/5] chore: update to QOSDK 6.2.1 --- pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go | 2 +- testdata/quarkus/memcached-quarkus-operator/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go index c24ac20..d6ed034 100644 --- a/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go +++ b/pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go @@ -57,7 +57,7 @@ const pomxmlTemplate = ` 17 UTF-8 UTF-8 - 6.2.0 + 6.2.1 3.2.0.Final diff --git a/testdata/quarkus/memcached-quarkus-operator/pom.xml b/testdata/quarkus/memcached-quarkus-operator/pom.xml index 519cede..51f5229 100644 --- a/testdata/quarkus/memcached-quarkus-operator/pom.xml +++ b/testdata/quarkus/memcached-quarkus-operator/pom.xml @@ -15,7 +15,7 @@ 11 UTF-8 UTF-8 - 6.2.0 + 6.2.1 3.2.0.Final