feat: remove ClientConfiguration, replace it by fabric8 client config

Author: metacosm

api/src/main/java/io/javaoperatorsdk/operator/api/config/ClientConfiguration.java

@@ -1,12 +1,13 @@
 package io.javaoperatorsdk.operator.api.config;
 
+import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.javaoperatorsdk.operator.api.ResourceController;
 
 public interface ConfigurationService {
     <R extends CustomResource> ControllerConfiguration<R> getConfigurationFor(ResourceController<R> controller);
 
-    default ClientConfiguration getClientConfiguration() {
-        return ClientConfiguration.DEFAULT;
+    default Config getClientConfiguration() {
+        return Config.autoConfigure(null);
     }
 }

api/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java

@@ -3,17 +3,16 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.api.config.ClientConfiguration;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.quarkus.arc.DefaultBean;
@@ -41,34 +40,8 @@ public <R extends CustomResource> ControllerConfiguration<R> getConfigurationFor
     }
 
     @Override
-    public ClientConfiguration getClientConfiguration() {
-        final var config = client.getConfiguration();
-        return new ClientConfiguration() {
-            @Override
-            public boolean isOpenshift() {
-                return false; // todo: fix
-            }
-            
-            @Override
-            public Optional<String> getUsername() {
-                return Optional.ofNullable(config.getUsername());
-            }
-            
-            @Override
-            public Optional<String> getPassword() {
-                return Optional.ofNullable(config.getPassword());
-            }
-            
-            @Override
-            public Optional<String> getMasterUrl() {
-                return Optional.ofNullable(config.getMasterUrl());
-            }
-            
-            @Override
-            public boolean isTrustSelfSignedCertificates() {
-                return config.isTrustCerts();
-            }
-        };
+    public Config getClientConfiguration() {
+        return client.getConfiguration();
     }
 
     @DefaultBean

quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/QuarkusConfigurationService.java

@@ -6,14 +6,14 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.openshift.client.DefaultOpenShiftClient;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.api.config.ClientConfiguration;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.config.RetryConfiguration;
@@ -40,13 +40,19 @@ public class OperatorAutoConfiguration implements ConfigurationService {
     @Bean
     @ConditionalOnMissingBean
     public KubernetesClient kubernetesClient() {
-        final var clientCfg = getClientConfiguration();
+        final var config = getClientConfiguration();
+        return configuration.getClient().isOpenshift() ? new DefaultOpenShiftClient(config) : new DefaultKubernetesClient(config);
+    }
+    
+    @Override
+    public Config getClientConfiguration() {
+        final var clientCfg = configuration.getClient();
     ConfigBuilder config = new ConfigBuilder();
     config.withTrustCerts(clientCfg.isTrustSelfSignedCertificates());
     clientCfg.getMasterUrl().ifPresent(config::withMasterUrl);
         clientCfg.getUsername().ifPresent(config::withUsername);
     clientCfg.getPassword().ifPresent(config::withPassword);
-    return clientCfg.isOpenshift() ? new DefaultOpenShiftClient(config.build()) : new DefaultKubernetesClient(config.build());
+    return config.build();
     }
 
     @Bean
@@ -70,11 +76,6 @@ public <R extends CustomResource> ControllerConfiguration<R> getConfigurationFor
         return controllers.get(controller.getName());
     }
 
-    @Override
-  public ClientConfiguration getClientConfiguration() {
-        return configuration.getClient();
-    }
-    
     private static class ConfigurationWrapper<R extends CustomResource> extends AnnotationConfiguration<R> {
         private final Optional<ControllerProperties> properties;
 

spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java

@@ -2,9 +2,7 @@
 
 import java.util.Optional;
 
-import io.javaoperatorsdk.operator.api.config.ClientConfiguration;
-
-public class OperatorProperties implements ClientConfiguration {
+public class OperatorProperties {
 
     private boolean openshift = false;
     private String username;