Skip to content

fix: remove config and deprecated api for samples #1370

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 2 commits into from
Jul 25, 2022
Merged

fix: remove config and deprecated api for samples #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0af2d2
fix: remove config and deprecated api for samples
csviri Jul 25, 2022
7c8c887
fix: format
csviri Jul 25, 2022
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
8 changes: 2 additions & 6 deletions ...rs/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
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.fabric8.kubernetes.client.*;
import io.javaoperatorsdk.operator.Operator;
import io.javaoperatorsdk.operator.monitoring.micrometer.MicrometerMetrics;
import io.javaoperatorsdk.operator.sample.dependent.ResourcePollerConfig;
Expand All @@ -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())));

Expand Down
8 changes: 2 additions & 6 deletions ...tors/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
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.fabric8.kubernetes.client.*;
import io.javaoperatorsdk.operator.Operator;

public class TomcatOperator {
Expand All @@ -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));
Expand Down
8 changes: 2 additions & 6 deletions ...e-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
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.fabric8.kubernetes.client.*;
import io.javaoperatorsdk.operator.Operator;

public class WebPageOperator {
Expand All @@ -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)) {
Expand Down