Skip to content

feat: update to use JOSDK 3.1 and latest Quarkus extension #99

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

Merged
merged 7 commits into from
Aug 16, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,4 @@ const ApplicationPropertiesTemplate = `quarkus.container-image.build=true
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 true to automatically generate CSV from your code
quarkus.operator-sdk.generate-csv=false
`
7 changes: 4 additions & 3 deletions pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ const pomxmlTemplate = `<?xml version="1.0" encoding="UTF-8"?>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus-sdk.version>3.0.7</quarkus-sdk.version>
<quarkus.version>2.7.5.Final</quarkus.version>
<quarkus-sdk.version>4.0.0</quarkus-sdk.version>
<quarkus.version>2.11.2.Final</quarkus.version>
</properties>

<dependencyManagement>
Expand All @@ -77,9 +77,10 @@ const pomxmlTemplate = `<?xml version="1.0" encoding="UTF-8"?>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk</artifactId>
</dependency>
<!-- Needed to generate OLM bundle. If you're not interested in this, you can remove this dependency -->
<dependency>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-csv-generator</artifactId>
<artifactId>quarkus-operator-sdk-bundle-generator</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
6 changes: 3 additions & 3 deletions testdata/quarkus/memcached-quarkus-operator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus-sdk.version>3.0.7</quarkus-sdk.version>
<quarkus.version>2.7.5.Final</quarkus.version>
<quarkus-sdk.version>4.0.0</quarkus-sdk.version>
<quarkus.version>2.11.2.Final</quarkus.version>
</properties>

<dependencyManagement>
Expand All @@ -37,7 +37,7 @@
</dependency>
<dependency>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-csv-generator</artifactId>
<artifactId>quarkus-operator-sdk-bundle-generator</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down