Skip to content

Commit f088b2b

Browse files
authored
Updates (#42)
* fix: no need to add Kind and Plural with default versions * chore(deps): update to quarkus 2.4.0, fabric8 5.8.0 and extension 2.0.0 * feat: add support for CSV generation extension
1 parent d7db00c commit f088b2b

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ func (f *ApplicationPropertiesFile) SetTemplateDefaults() error {
4444
return nil
4545
}
4646

47-
// TODO: pass in the name of the operator i.e. replace Memcached
4847
const ApplicationPropertiesTemplate = `quarkus.container-image.build=true
4948
#quarkus.container-image.group=
5049
quarkus.container-image.name={{ .ProjectName }}-operator
5150
# set to true to automatically apply CRDs to the cluster when they get regenerated
5251
quarkus.operator-sdk.crd.apply=false
52+
# set to true to automatically generate CSV from your code
53+
quarkus.operator-sdk.generate-csv=false
5354
`

pkg/quarkus/v1alpha/scaffolds/internal/templates/model/model.go

-4
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,10 @@ const modelTemplate = `package {{ .Package }};
5555
{{if .Resource.API.Namespaced}}import io.fabric8.kubernetes.api.model.Namespaced;{{end}}
5656
import io.fabric8.kubernetes.client.CustomResource;
5757
import io.fabric8.kubernetes.model.annotation.Group;
58-
import io.fabric8.kubernetes.model.annotation.Kind;
59-
import io.fabric8.kubernetes.model.annotation.Plural;
6058
import io.fabric8.kubernetes.model.annotation.Version;
6159
6260
@Version("{{ .Resource.Version }}")
6361
@Group("{{ .Resource.QualifiedGroup }}")
64-
@Kind("{{ .Resource.Kind }}")
65-
@Plural("{{ .Resource.Plural }}")
6662
public class {{ .ClassName }} extends CustomResource<{{ .ClassName }}Spec, {{ .ClassName }}Status> {{if .Resource.API.Namespaced}}implements Namespaced {{end}}{}
6763
6864
`

pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go

+8-3
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ const pomxmlTemplate = `<?xml version="1.0" encoding="UTF-8"?>
5757
<maven.compiler.target>11</maven.compiler.target>
5858
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5959
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
60-
<fabric8-client.version>5.7.2</fabric8-client.version>
61-
<quarkus-sdk.version>2.0.0.Beta5</quarkus-sdk.version>
62-
<quarkus.version>2.2.1.Final</quarkus.version>
60+
<fabric8-client.version>5.8.0</fabric8-client.version>
61+
<quarkus-sdk.version>2.0.0</quarkus-sdk.version>
62+
<quarkus.version>2.4.0.Final</quarkus.version>
6363
</properties>
6464
6565
<dependencyManagement>
@@ -86,6 +86,11 @@ const pomxmlTemplate = `<?xml version="1.0" encoding="UTF-8"?>
8686
<artifactId>quarkus-operator-sdk</artifactId>
8787
<version>${quarkus-sdk.version}</version>
8888
</dependency>
89+
<dependency>
90+
<groupId>io.quarkiverse.operatorsdk</groupId>
91+
<artifactId>quarkus-operator-sdk-csv-generator</artifactId>
92+
<version>${quarkus-sdk.version}</version>
93+
</dependency>
8994
</dependencies>
9095
9196
<build>

0 commit comments

Comments
 (0)