From b0af2d2eba071fecb635f0ec49a48c2e4d5c2477 Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 25 Jul 2022 15:23:43 +0200 Subject: [PATCH 1/2] fix: remove config and deprecated api for samples --- .../operator/sample/MySQLSchemaOperator.java | 8 ++------ .../javaoperatorsdk/operator/sample/TomcatOperator.java | 8 ++------ .../javaoperatorsdk/operator/sample/WebPageOperator.java | 8 ++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java index f1cd015c34..caf93b7f6d 100644 --- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java +++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java @@ -2,6 +2,7 @@ import java.io.IOException; +import io.fabric8.kubernetes.client.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.takes.facets.fork.FkRegex; @@ -9,10 +10,6 @@ import org.takes.http.Exit; import org.takes.http.FtBasic; -import io.fabric8.kubernetes.client.Config; -import io.fabric8.kubernetes.client.ConfigBuilder; -import io.fabric8.kubernetes.client.DefaultKubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClient; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.monitoring.micrometer.MicrometerMetrics; import io.javaoperatorsdk.operator.sample.dependent.ResourcePollerConfig; @@ -26,8 +23,7 @@ public class MySQLSchemaOperator { public static void main(String[] args) throws IOException { log.info("MySQL Schema Operator starting"); - Config config = new ConfigBuilder().withNamespace(null).build(); - KubernetesClient client = new DefaultKubernetesClient(config); + KubernetesClient client = new KubernetesClientBuilder().build(); Operator operator = new Operator(client, overrider -> overrider.withMetrics(new MicrometerMetrics(new LoggingMeterRegistry()))); diff --git a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java index 6b894a3348..e77d1197c6 100644 --- a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java +++ b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java @@ -2,6 +2,7 @@ import java.io.IOException; +import io.fabric8.kubernetes.client.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.takes.facets.fork.FkRegex; @@ -9,10 +10,6 @@ import org.takes.http.Exit; import org.takes.http.FtBasic; -import io.fabric8.kubernetes.client.Config; -import io.fabric8.kubernetes.client.ConfigBuilder; -import io.fabric8.kubernetes.client.DefaultKubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClient; import io.javaoperatorsdk.operator.Operator; public class TomcatOperator { @@ -21,8 +18,7 @@ public class TomcatOperator { public static void main(String[] args) throws IOException { - Config config = new ConfigBuilder().withNamespace(null).build(); - KubernetesClient client = new DefaultKubernetesClient(config); + KubernetesClient client = new KubernetesClientBuilder().build(); Operator operator = new Operator(client); operator.register(new TomcatReconciler()); operator.register(new WebappReconciler(client)); diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java index 661f6f3ba8..139f88f36a 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java @@ -2,6 +2,7 @@ import java.io.IOException; +import io.fabric8.kubernetes.client.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.takes.facets.fork.FkRegex; @@ -9,10 +10,6 @@ import org.takes.http.Exit; import org.takes.http.FtBasic; -import io.fabric8.kubernetes.client.Config; -import io.fabric8.kubernetes.client.ConfigBuilder; -import io.fabric8.kubernetes.client.DefaultKubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClient; import io.javaoperatorsdk.operator.Operator; public class WebPageOperator { @@ -25,8 +22,7 @@ public class WebPageOperator { public static void main(String[] args) throws IOException { log.info("WebServer Operator starting!"); - Config config = new ConfigBuilder().withNamespace(null).build(); - KubernetesClient client = new DefaultKubernetesClient(config); + KubernetesClient client = new KubernetesClientBuilder().build(); Operator operator = new Operator(client); String reconcilerEnvVar = System.getenv(WEBPAGE_RECONCILER_ENV); if (WEBPAGE_CLASSIC_RECONCILER_ENV_VALUE.equals(reconcilerEnvVar)) { From 7c8c8873497a91a99de82ff316d9eb42301a847e Mon Sep 17 00:00:00 2001 From: csviri Date: Mon, 25 Jul 2022 15:29:58 +0200 Subject: [PATCH 2/2] fix: format --- .../io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java | 2 +- .../java/io/javaoperatorsdk/operator/sample/TomcatOperator.java | 2 +- .../io/javaoperatorsdk/operator/sample/WebPageOperator.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java index caf93b7f6d..b2fb0aab65 100644 --- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java +++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java @@ -2,7 +2,6 @@ import java.io.IOException; -import io.fabric8.kubernetes.client.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.takes.facets.fork.FkRegex; @@ -10,6 +9,7 @@ import org.takes.http.Exit; import org.takes.http.FtBasic; +import io.fabric8.kubernetes.client.*; import io.javaoperatorsdk.operator.Operator; import io.javaoperatorsdk.operator.monitoring.micrometer.MicrometerMetrics; import io.javaoperatorsdk.operator.sample.dependent.ResourcePollerConfig; diff --git a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java index e77d1197c6..3973379769 100644 --- a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java +++ b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java @@ -2,7 +2,6 @@ import java.io.IOException; -import io.fabric8.kubernetes.client.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.takes.facets.fork.FkRegex; @@ -10,6 +9,7 @@ import org.takes.http.Exit; import org.takes.http.FtBasic; +import io.fabric8.kubernetes.client.*; import io.javaoperatorsdk.operator.Operator; public class TomcatOperator { diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java index 139f88f36a..9b137649fc 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java @@ -2,7 +2,6 @@ import java.io.IOException; -import io.fabric8.kubernetes.client.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.takes.facets.fork.FkRegex; @@ -10,6 +9,7 @@ import org.takes.http.Exit; import org.takes.http.FtBasic; +import io.fabric8.kubernetes.client.*; import io.javaoperatorsdk.operator.Operator; public class WebPageOperator {