Skip to content

Commit d0c6c00

Browse files
authored
chore(deps): update to use Quarkus JOSDK extension 3.0.1 (#67)
Since the extension now uses a BOM, we don't need to track the JOSDK and fabric8 versions separately. We still need to provide the Quarkus version even though it's provided in the BOM because we need it for the maven plugin and there is no way to retrieve the version from the BOM…
1 parent 98836e2 commit d0c6c00

File tree

3 files changed

+19
-37
lines changed

3 files changed

+19
-37
lines changed

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

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,37 +48,28 @@ func (f *Controller) SetTemplateDefaults() error {
4848
return nil
4949
}
5050

51-
// TODO: pass in the name of the operator i.e. replace Memcached
5251
const controllerTemplate = `package {{ .Package }};
5352
5453
import io.fabric8.kubernetes.client.KubernetesClient;
55-
import io.javaoperatorsdk.operator.api.*;
56-
import io.javaoperatorsdk.operator.api.Context;
57-
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
54+
import io.javaoperatorsdk.operator.api.reconciler.Context;
55+
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
56+
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
5857
59-
@Controller
60-
public class {{ .ClassName }}Controller implements ResourceController<{{ .ClassName }}> {
58+
public class {{ .ClassName }}Reconciler implements Reconciler<{{ .ClassName }}> {
59+
private final KubernetesClient client;
6160
62-
private final KubernetesClient client;
61+
public {{ .ClassName }}Reconciler(KubernetesClient client) {
62+
this.client = client;
63+
}
6364
64-
public {{ .ClassName }}Controller(KubernetesClient client) {
65-
this.client = client;
66-
}
65+
// TODO Fill in the rest of the reconciler
6766
68-
// TODO Fill in the rest of the controller
67+
@Override
68+
public UpdateControl<{{ .ClassName }}> reconcile({{ .ClassName }} resource, Context context) {
69+
// TODO: fill in logic
6970
70-
@Override
71-
public void init(EventSourceManager eventSourceManager) {
72-
// TODO: fill in init
73-
}
74-
75-
@Override
76-
public UpdateControl<{{ .ClassName }}> createOrUpdateResource(
77-
{{ .ClassName }} resource, Context<{{ .ClassName }}> context) {
78-
// TODO: fill in logic
79-
80-
return UpdateControl.noUpdate();
81-
}
71+
return UpdateControl.noUpdate();
72+
}
8273
}
8374
8475
`

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ func (f *Model) SetTemplateDefaults() error {
4949
return nil
5050
}
5151

52-
// TODO: pass in the name of the operator i.e. replace Memcached
5352
const modelTemplate = `package {{ .Package }};
5453
5554
{{if .Resource.API.Namespaced}}import io.fabric8.kubernetes.api.model.Namespaced;{{end}}

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,16 @@ 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.8.0</fabric8-client.version>
61-
<quarkus-sdk.version>2.0.0</quarkus-sdk.version>
62-
<quarkus.version>2.4.0.Final</quarkus.version>
60+
<quarkus-sdk.version>3.0.1</quarkus-sdk.version>
61+
<quarkus.version>2.6.2.Final</quarkus.version>
6362
</properties>
6463
6564
<dependencyManagement>
6665
<dependencies>
6766
<dependency>
68-
<groupId>io.fabric8</groupId>
69-
<artifactId>kubernetes-client-bom</artifactId>
70-
<version>${fabric8-client.version}</version>
71-
<type>pom</type>
72-
<scope>import</scope>
73-
</dependency>
74-
<dependency>
75-
<groupId>io.quarkus</groupId>
76-
<artifactId>quarkus-bom</artifactId>
77-
<version>${quarkus.version}</version>
67+
<groupId>io.quarkiverse.operatorsdk</groupId>
68+
<artifactId>quarkus-operator-sdk-bom</artifactId>
69+
<version>${quarkus-sdk.version}</version>
7870
<type>pom</type>
7971
<scope>import</scope>
8072
</dependency>

0 commit comments

Comments
 (0)