Skip to content

Commit f6aa23f

Browse files
committed
fix: remove config and deprecated api for samples (#1370)
1 parent f74f623 commit f6aa23f

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
import org.takes.http.Exit;
1010
import org.takes.http.FtBasic;
1111

12-
import io.fabric8.kubernetes.client.Config;
13-
import io.fabric8.kubernetes.client.ConfigBuilder;
14-
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
15-
import io.fabric8.kubernetes.client.KubernetesClient;
12+
import io.fabric8.kubernetes.client.*;
1613
import io.javaoperatorsdk.operator.Operator;
1714
import io.javaoperatorsdk.operator.monitoring.micrometer.MicrometerMetrics;
1815
import io.javaoperatorsdk.operator.sample.dependent.ResourcePollerConfig;
@@ -26,8 +23,7 @@ public class MySQLSchemaOperator {
2623
public static void main(String[] args) throws IOException {
2724
log.info("MySQL Schema Operator starting");
2825

29-
Config config = new ConfigBuilder().withNamespace(null).build();
30-
KubernetesClient client = new DefaultKubernetesClient(config);
26+
KubernetesClient client = new KubernetesClientBuilder().build();
3127
Operator operator = new Operator(client,
3228
overrider -> overrider.withMetrics(new MicrometerMetrics(new LoggingMeterRegistry())));
3329

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
import org.takes.http.Exit;
1010
import org.takes.http.FtBasic;
1111

12-
import io.fabric8.kubernetes.client.Config;
13-
import io.fabric8.kubernetes.client.ConfigBuilder;
14-
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
15-
import io.fabric8.kubernetes.client.KubernetesClient;
12+
import io.fabric8.kubernetes.client.*;
1613
import io.javaoperatorsdk.operator.Operator;
1714

1815
public class TomcatOperator {
@@ -21,8 +18,7 @@ public class TomcatOperator {
2118

2219
public static void main(String[] args) throws IOException {
2320

24-
Config config = new ConfigBuilder().withNamespace(null).build();
25-
KubernetesClient client = new DefaultKubernetesClient(config);
21+
KubernetesClient client = new KubernetesClientBuilder().build();
2622
Operator operator = new Operator(client);
2723
operator.register(new TomcatReconciler());
2824
operator.register(new WebappReconciler(client));

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
import org.takes.http.Exit;
1010
import org.takes.http.FtBasic;
1111

12-
import io.fabric8.kubernetes.client.Config;
13-
import io.fabric8.kubernetes.client.ConfigBuilder;
14-
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
15-
import io.fabric8.kubernetes.client.KubernetesClient;
12+
import io.fabric8.kubernetes.client.*;
1613
import io.javaoperatorsdk.operator.Operator;
1714

1815
public class WebPageOperator {
@@ -25,8 +22,7 @@ public class WebPageOperator {
2522
public static void main(String[] args) throws IOException {
2623
log.info("WebServer Operator starting!");
2724

28-
Config config = new ConfigBuilder().withNamespace(null).build();
29-
KubernetesClient client = new DefaultKubernetesClient(config);
25+
KubernetesClient client = new KubernetesClientBuilder().build();
3026
Operator operator = new Operator(client);
3127
String reconcilerEnvVar = System.getenv(WEBPAGE_RECONCILER_ENV);
3228
if (WEBPAGE_CLASSIC_RECONCILER_ENV_VALUE.equals(reconcilerEnvVar)) {

0 commit comments

Comments
 (0)