Skip to content

Commit 9b3bca9

Browse files
committed
remove smalltye proof of concept from sample
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 60c7750 commit 9b3bca9

File tree

5 files changed

+9
-82
lines changed

5 files changed

+9
-82
lines changed

sample-operators/tomcat-operator/pom.xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,6 @@
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>
42-
<dependency>
43-
<groupId>io.smallrye.config</groupId>
44-
<artifactId>smallrye-config-bom</artifactId>
45-
<version>3.16.0</version>
46-
<type>pom</type>
47-
<scope>import</scope>
48-
</dependency>
4942
</dependencies>
5043
</dependencyManagement>
5144

@@ -99,22 +92,6 @@
9992
<artifactId>operator-framework-junit</artifactId>
10093
<scope>test</scope>
10194
</dependency>
102-
103-
<dependency>
104-
<groupId>io.smallrye.config</groupId>
105-
<artifactId>smallrye-config</artifactId>
106-
<version>3.11.4</version>
107-
</dependency>
108-
<dependency>
109-
<groupId>io.smallrye.config</groupId>
110-
<artifactId>smallrye-config-source-yaml</artifactId>
111-
<version>3.11.4</version>
112-
</dependency>
113-
<dependency>
114-
<groupId>org.eclipse.microprofile.config</groupId>
115-
<artifactId>microprofile-config-api</artifactId>
116-
<version>3.1</version>
117-
</dependency>
11895
</dependencies>
11996

12097
<build>

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,25 @@
1616
package io.javaoperatorsdk.operator.sample;
1717

1818
import java.io.IOException;
19-
import java.net.URL;
2019

20+
import org.slf4j.Logger;
21+
import org.slf4j.LoggerFactory;
2122
import org.takes.facets.fork.FkRegex;
2223
import org.takes.facets.fork.TkFork;
2324
import org.takes.http.Exit;
2425
import org.takes.http.FtBasic;
2526

2627
import io.javaoperatorsdk.operator.Operator;
27-
import io.javaoperatorsdk.operator.config.loader.ConfigLoader;
28-
import io.javaoperatorsdk.operator.sample.smallryeconfig.SmallryeConfigProvider;
29-
import io.smallrye.config.SmallRyeConfigBuilder;
30-
import io.smallrye.config.source.yaml.YamlConfigSource;
3128

3229
public class TomcatOperator {
3330

31+
private static final Logger log = LoggerFactory.getLogger(TomcatOperator.class);
32+
3433
public static void main(String[] args) throws IOException {
3534

36-
URL configUrl = TomcatOperator.class.getResource("/application.yaml");
37-
if (configUrl == null) {
38-
throw new IllegalStateException("application.yaml not found on classpath");
39-
}
40-
var configLoader =
41-
new ConfigLoader(
42-
new SmallryeConfigProvider(
43-
new SmallRyeConfigBuilder().withSources(new YamlConfigSource(configUrl)).build()));
44-
45-
Operator operator = new Operator(configLoader.applyConfigs());
46-
operator.register(
47-
new TomcatReconciler(), configLoader.applyControllerConfigs(TomcatReconciler.NAME));
48-
operator.register(
49-
new WebappReconciler(operator.getKubernetesClient()),
50-
configLoader.applyControllerConfigs(WebappReconciler.NAME));
35+
Operator operator = new Operator();
36+
operator.register(new TomcatReconciler());
37+
operator.register(new WebappReconciler(operator.getKubernetesClient()));
5138
operator.start();
5239

5340
new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD.")), 8080).start(Exit.NEVER);

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatReconciler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@
3535
@Dependent(type = DeploymentDependentResource.class),
3636
@Dependent(type = ServiceDependentResource.class)
3737
})
38-
@ControllerConfiguration(name = TomcatReconciler.NAME)
38+
@ControllerConfiguration
3939
public class TomcatReconciler implements Reconciler<Tomcat> {
4040

41-
public static final String NAME = "tomcat";
4241
private final Logger log = LoggerFactory.getLogger(getClass());
4342

4443
@Override

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,10 @@
4747
import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
4848
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
4949

50-
@ControllerConfiguration(name = WebappReconciler.NAME)
50+
@ControllerConfiguration
5151
public class WebappReconciler implements Reconciler<Webapp>, Cleaner<Webapp> {
5252

5353
private static final Logger log = LoggerFactory.getLogger(WebappReconciler.class);
54-
public static final String NAME = "webapp";
5554

5655
private final KubernetesClient kubernetesClient;
5756

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/smallryeconfig/SmallryeConfigProvider.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)