chore: use latest sundrio and kubernetes-client

dekorateio · Sep 5, 2022 · ffbdb0c · ffbdb0c
1 parent 7020706
commit ffbdb0c
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 18 deletions.
diff --git a/...rc/main/java/io/dekorate/prometheus/client/dsl/internal/ServiceMonitorOperationsImpl.java b/...rc/main/java/io/dekorate/prometheus/client/dsl/internal/ServiceMonitorOperationsImpl.java
@@ -17,17 +17,17 @@
 
 import io.dekorate.prometheus.model.ServiceMonitor;
 import io.dekorate.prometheus.model.ServiceMonitorList;
-import io.fabric8.kubernetes.client.ClientContext;
+import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.kubernetes.client.dsl.base.HasMetadataOperation;
-import io.fabric8.kubernetes.client.dsl.base.OperationContext;
+import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperation;
 import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperationsImpl;
+import io.fabric8.kubernetes.client.dsl.internal.OperationContext;
 
 public class ServiceMonitorOperationsImpl
     extends HasMetadataOperation<ServiceMonitor, ServiceMonitorList, Resource<ServiceMonitor>> {
 
-  public ServiceMonitorOperationsImpl(ClientContext clientContext) {
-    this(HasMetadataOperationsImpl.defaultContext(clientContext));
+  public ServiceMonitorOperationsImpl(Client client) {
+    this(HasMetadataOperationsImpl.defaultContext(client));
   }
 
   public ServiceMonitorOperationsImpl(OperationContext context) {

diff --git a/core/pom.xml b/core/pom.xml
@@ -85,6 +85,7 @@ limitations under the License.
       <optional>true</optional>
     </dependency>
 
+
     <dependency>
       <groupId>io.dekorate</groupId>
       <artifactId>dekorate-templates</artifactId>

diff --git a/testing/core-junit/src/main/java/io/dekorate/testing/CustomResourceCondition.java b/testing/core-junit/src/main/java/io/dekorate/testing/CustomResourceCondition.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;
@@ -28,10 +29,11 @@
 import io.dekorate.utils.Strings;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.http.HttpClient;
+import io.fabric8.kubernetes.client.http.HttpRequest;
+import io.fabric8.kubernetes.client.http.HttpResponse;
 import io.fabric8.kubernetes.client.utils.URLUtils;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
+
 
 public class CustomResourceCondition implements ExecutionCondition, WithKubernetesClient {
 
@@ -53,7 +55,8 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
 
       KubernetesClient client = getKubernetesClient(context);
       Config config = client.getConfiguration();
-      OkHttpClient http = client.adapt(OkHttpClient.class);
+
+      HttpClient httpClient = client.getHttpClient();
 
       List<String> parts = new ArrayList<>();
       parts.add(config.getMasterUrl());
@@ -71,9 +74,11 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
       }
       parts.add(plural);
       String requestUrl = URLUtils.join(parts.stream().toArray(s -> new String[s]));
-      Request request = new Request.Builder().get().url(requestUrl).build();
-      Response response = http.newCall(request).execute();
 
+      final HttpRequest request = httpClient.newHttpRequestBuilder()
+          .uri(requestUrl)
+          .build();
+      HttpResponse<String> response = httpClient.sendAsync(request, String.class).get(10, TimeUnit.SECONDS);
       if (!response.isSuccessful()) {
         return ConditionEvaluationResult.disabled("Could not lookup custom resource.");
       }

diff --git a/testing/core-junit/src/main/java/io/dekorate/testing/Pods.java b/testing/core-junit/src/main/java/io/dekorate/testing/Pods.java
@@ -31,6 +31,7 @@
 import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
+import io.fabric8.kubernetes.client.dsl.PodResource;
 
 public class Pods {
 
@@ -80,7 +81,7 @@ public PodList list(Object resource) {
    * @param deployment The {@link Deployment}
    */
   protected PodList map(Deployment deployment) {
-    FilterWatchListDeletable<Pod, PodList> podLister = client.pods()
+    FilterWatchListDeletable<Pod, PodList, PodResource> podLister = client.pods()
         .inNamespace(deployment.getMetadata().getNamespace());
     if (deployment.getSpec().getSelector().getMatchLabels() != null) {
       podLister.withLabels(deployment.getSpec().getSelector().getMatchLabels());
@@ -112,7 +113,7 @@ protected PodList map(Deployment deployment) {
    * @param replicaSet The {@link ReplicaSet}
    */
   protected PodList map(ReplicaSet replicaSet) {
-    FilterWatchListDeletable<Pod, PodList> podLister = client.pods()
+    FilterWatchListDeletable<Pod, PodList, PodResource> podLister = client.pods()
         .inNamespace(replicaSet.getMetadata().getNamespace());
     if (replicaSet.getSpec().getSelector().getMatchLabels() != null) {
       podLister.withLabels(replicaSet.getSpec().getSelector().getMatchLabels());

diff --git a/testing/core-junit/src/main/java/io/dekorate/testing/WithKubernetesClient.java b/testing/core-junit/src/main/java/io/dekorate/testing/WithKubernetesClient.java
@@ -33,8 +33,8 @@
 import io.dekorate.DekorateException;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.BaseClient;
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 
 /**
@@ -88,7 +88,7 @@ default KubernetesClient getKubernetesClient(ExtensionContext context) {
       return (KubernetesClient) client;
     }
 
-    client = new DefaultKubernetesClient();
+    client = new KubernetesClientBuilder().build();
     context.getStore(DEKORATE_STORE).put(KUBERNETES_CLIENT, client);
     return (KubernetesClient) client;
   }

diff --git a/testing/knative-junit/src/main/java/io/dekorate/testing/knative/KnativeReadiness.java b/testing/knative-junit/src/main/java/io/dekorate/testing/knative/KnativeReadiness.java
@@ -26,7 +26,7 @@
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.ReplicaSet;
 import io.fabric8.kubernetes.api.model.apps.StatefulSet;
-import io.fabric8.kubernetes.client.internal.readiness.Readiness;
+import io.fabric8.kubernetes.client.readiness.Readiness;
 import io.fabric8.kubernetes.client.utils.Utils;
 
 public class KnativeReadiness {

diff --git a/testing/openshift-junit/src/main/java/io/dekorate/testing/openshift/OpenshiftExtension.java b/testing/openshift-junit/src/main/java/io/dekorate/testing/openshift/OpenshiftExtension.java
@@ -177,11 +177,11 @@ private void startProject(ExtensionContext context, Project project) throws Inte
             try {
               HasMetadata r = client.resource(i).fromServer().get();
               if (r == null) {
-                client.resource(i).apply();
+                client.resource(i).createOrReplace();
               } else if (r instanceof ImageStream) {
                 //let's not delete image streams at this point
               } else if (deleteAndWait(context, i, 1, TimeUnit.MINUTES)) {
-                client.resource(i).apply();
+                client.resource(i).createOrReplace();
               }
             } catch (Exception e) {
               e.printStackTrace(System.err);