Skip to content

Updates #42

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.

Sign up for GitHub

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 3 commits into from
Nov 1, 2021
Merged

Updates #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db6faeb
fix: no need to add Kind and Plural with default versions
metacosm Sep 3, 2021
5d71426
chore(deps): update to quarkus 2.4.0, fabric8 5.8.0 and extension 2.0.0
metacosm Oct 29, 2021
c4555bc
feat: add support for CSV generation extension
metacosm Oct 29, 2021
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
3 changes: 2 additions & 1 deletion pkg/quarkus/v1alpha/scaffolds/internal/templates/applicationproperties.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ func (f *ApplicationPropertiesFile) SetTemplateDefaults() error {
return nil
}

// TODO: pass in the name of the operator i.e. replace Memcached
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 true to automatically generate CSV from your code
quarkus.operator-sdk.generate-csv=false
`
4 changes: 0 additions & 4 deletions pkg/quarkus/v1alpha/scaffolds/internal/templates/model/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,10 @@ const modelTemplate = `package {{ .Package }};
{{if .Resource.API.Namespaced}}import io.fabric8.kubernetes.api.model.Namespaced;{{end}}
import io.fabric8.kubernetes.client.CustomResource;
import io.fabric8.kubernetes.model.annotation.Group;
import io.fabric8.kubernetes.model.annotation.Kind;
import io.fabric8.kubernetes.model.annotation.Plural;
import io.fabric8.kubernetes.model.annotation.Version;

@Version("{{ .Resource.Version }}")
@Group("{{ .Resource.QualifiedGroup }}")
@Kind("{{ .Resource.Kind }}")
@Plural("{{ .Resource.Plural }}")
public class {{ .ClassName }} extends CustomResource<{{ .ClassName }}Spec, {{ .ClassName }}Status> {{if .Resource.API.Namespaced}}implements Namespaced {{end}}{}

`
11 changes: 8 additions & 3 deletions pkg/quarkus/v1alpha/scaffolds/internal/templates/pomxml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ 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>
<fabric8-client.version>5.7.2</fabric8-client.version>
<quarkus-sdk.version>2.0.0.Beta5</quarkus-sdk.version>
<quarkus.version>2.2.1.Final</quarkus.version>
<fabric8-client.version>5.8.0</fabric8-client.version>
<quarkus-sdk.version>2.0.0</quarkus-sdk.version>
<quarkus.version>2.4.0.Final</quarkus.version>
</properties>

<dependencyManagement>
Expand All @@ -86,6 +86,11 @@ const pomxmlTemplate = `<?xml version="1.0" encoding="UTF-8"?>
<artifactId>quarkus-operator-sdk</artifactId>
<version>${quarkus-sdk.version}</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk-csv-generator</artifactId>
<version>${quarkus-sdk.version}</version>
</dependency>
</dependencies>

<build>
Expand Down