fix(deps): update io.kubernetes.client.java to v19 (major) (#648)

* fix(deps): update io.kubernetes.client.java to v19 * Remove deleted apis * Fix client calls (extra parameter) * Api calls in groovy
micronaut-projects · Jan 22, 2024 · dffb6aa · dffb6aa
1 parent f369843
commit dffb6aa
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/examples/micronaut-kubernetes-client/src/main/java/micronaut/service/PodController.java b/examples/micronaut-kubernetes-client/src/main/java/micronaut/service/PodController.java
@@ -43,7 +43,7 @@ public String getPod(final @NotNull String namespace, final @NotNull String name
 
     @Get("/{namespace}")
     public Map<String, String> index(final @NotNull String namespace) throws ApiException {
-        V1PodList v1PodList = coreV1Api.listNamespacedPod(namespace, null, null, null, null, null, null, null, null, null, false);
+        V1PodList v1PodList = coreV1Api.listNamespacedPod(namespace, null, null, null, null, null, null, null, null, null, null, false);
         return v1PodList.getItems().stream()
                 .filter(p -> p.getStatus() != null)
                 .collect(Collectors.toMap(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ rxjava2 = '2.2.21'
 rxjava3 = '3.1.8'
 shadow = '8.0.0'
 system-lambda = '1.2.1'
-io-kubernetes-client-java = '18.0.0'
+io-kubernetes-client-java = '19.0.0'
 io-fabric8-kubernetes-client = '6.10.0'
 
 micronaut-discovery = "4.2.0"

diff --git a/.../src/test/groovy/io/micronaut/kubernetes/client/reactor/CoreV1ApiReactorClientSpec.groovy b/.../src/test/groovy/io/micronaut/kubernetes/client/reactor/CoreV1ApiReactorClientSpec.groovy
@@ -37,6 +37,7 @@ class CoreV1ApiReactorClientSpec extends KubernetesSpecification {
                 null,
                 null,
                 null,
+                null,
                 null).block()
 
         then:
@@ -58,6 +59,7 @@ class CoreV1ApiReactorClientSpec extends KubernetesSpecification {
                 null,
                 null,
                 null,
+                null,
                 null).block()
 
         then:

diff --git a/...java2/src/test/groovy/io/micronaut/kubernetes/client/rxjava2/CoreV1ApiRxClientSpec.groovy b/...java2/src/test/groovy/io/micronaut/kubernetes/client/rxjava2/CoreV1ApiRxClientSpec.groovy
@@ -39,6 +39,7 @@ class CoreV1ApiRxClientSpec extends KubernetesSpecification {
                 null,
                 null,
                 null,
+                null,
                 null).blockingGet()
 
         then:
@@ -60,6 +61,7 @@ class CoreV1ApiRxClientSpec extends KubernetesSpecification {
                 null,
                 null,
                 null,
+                null,
                 null).blockingGet()
 
         then:

diff --git a/...java3/src/test/groovy/io/micronaut/kubernetes/client/rxjava3/CoreV1ApiRxClientSpec.groovy b/...java3/src/test/groovy/io/micronaut/kubernetes/client/rxjava3/CoreV1ApiRxClientSpec.groovy
@@ -39,6 +39,7 @@ class CoreV1ApiRxClientSpec extends KubernetesSpecification {
                 null,
                 null,
                 null,
+                null,
                 null).blockingGet()
 
         then:
@@ -60,6 +61,7 @@ class CoreV1ApiRxClientSpec extends KubernetesSpecification {
                 null,
                 null,
                 null,
+                null,
                 null).blockingGet()
 
         then:

diff --git a/kubernetes-client/src/main/java/io/micronaut/kubernetes/client/Apis.java b/kubernetes-client/src/main/java/io/micronaut/kubernetes/client/Apis.java
@@ -15,9 +15,6 @@
  */
 package io.micronaut.kubernetes.client;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
 import io.kubernetes.client.openapi.apis.AdmissionregistrationApi;
 import io.kubernetes.client.openapi.apis.AdmissionregistrationV1Api;
 import io.kubernetes.client.openapi.apis.ApiextensionsApi;
@@ -34,7 +31,6 @@
 import io.kubernetes.client.openapi.apis.AutoscalingApi;
 import io.kubernetes.client.openapi.apis.AutoscalingV1Api;
 import io.kubernetes.client.openapi.apis.AutoscalingV2Api;
-import io.kubernetes.client.openapi.apis.AutoscalingV2beta2Api;
 import io.kubernetes.client.openapi.apis.BatchApi;
 import io.kubernetes.client.openapi.apis.BatchV1Api;
 import io.kubernetes.client.openapi.apis.CertificatesApi;
@@ -49,7 +45,6 @@
 import io.kubernetes.client.openapi.apis.EventsApi;
 import io.kubernetes.client.openapi.apis.EventsV1Api;
 import io.kubernetes.client.openapi.apis.FlowcontrolApiserverApi;
-import io.kubernetes.client.openapi.apis.FlowcontrolApiserverV1beta1Api;
 import io.kubernetes.client.openapi.apis.FlowcontrolApiserverV1beta2Api;
 import io.kubernetes.client.openapi.apis.InternalApiserverApi;
 import io.kubernetes.client.openapi.apis.InternalApiserverV1alpha1Api;
@@ -67,10 +62,12 @@
 import io.kubernetes.client.openapi.apis.SchedulingV1Api;
 import io.kubernetes.client.openapi.apis.StorageApi;
 import io.kubernetes.client.openapi.apis.StorageV1Api;
-import io.kubernetes.client.openapi.apis.StorageV1beta1Api;
 import io.kubernetes.client.openapi.apis.VersionApi;
 import io.kubernetes.client.openapi.apis.WellKnownApi;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
  * Internal annotation to trigger the creation of Api clients.
  *
@@ -99,7 +96,6 @@ Class<?>[] value() default {
             AutoscalingApi.class,
             AutoscalingV1Api.class,
             AutoscalingV2Api .class,
-            AutoscalingV2beta2Api.class,
             BatchApi.class,
             BatchV1Api.class,
             CertificatesApi.class,
@@ -114,7 +110,6 @@ Class<?>[] value() default {
             EventsApi.class,
             EventsV1Api.class,
             FlowcontrolApiserverApi.class,
-            FlowcontrolApiserverV1beta1Api.class,
             FlowcontrolApiserverV1beta2Api.class,
             InternalApiserverApi.class,
             InternalApiserverV1alpha1Api.class,
@@ -132,7 +127,6 @@ Class<?>[] value() default {
             SchedulingV1Api.class,
             StorageApi.class,
             StorageV1Api.class,
-            StorageV1beta1Api.class,
             VersionApi.class,
             WellKnownApi.class,
     };

diff --git a/kubernetes-client/src/test/groovy/io/micronaut/kubernetes/client/ApiClientFactorySpec.groovy b/kubernetes-client/src/test/groovy/io/micronaut/kubernetes/client/ApiClientFactorySpec.groovy
@@ -59,7 +59,7 @@ class ApiClientFactorySpec extends KubernetesSpecification {
 
         CoreV1Api coreV1Api = applicationContext.getBean(CoreV1Api)
         when:
-        V1PodList podList = coreV1Api.listNamespacedPod("kube-system", null, null, null, null, null, null, null, null, null, null)
+        V1PodList podList = coreV1Api.listNamespacedPod("kube-system", null, null, null, null, null, null, null, null, null, null, null)
 
         then:
         podList

diff --git a/...nt/src/main/java/io/micronaut/kubernetes/configuration/KubernetesConfigurationClient.java b/...nt/src/main/java/io/micronaut/kubernetes/configuration/KubernetesConfigurationClient.java
@@ -180,7 +180,7 @@ private Flux<PropertySource> getPropertySourcesFromConfigMaps() {
                             }
                         })
                         .flatMap(labelSelector ->
-                                client.listNamespacedConfigMap(configuration.getNamespace(), null, null, null, null, labelSelector, null, null, null, null))
+                                client.listNamespacedConfigMap(configuration.getNamespace(), null, null, null, null, labelSelector, null, null, null, null, null))
                         .doOnError(ApiException.class, throwable -> LOG.error("Error to list ConfigMaps in the namespace [" + configuration.getNamespace() + "]: " + throwable.getResponseBody(), throwable))
                         .onErrorResume(throwable -> exceptionOnPodLabelsMissing
                                 ? Mono.error(throwable)
@@ -297,7 +297,7 @@ private Publisher<PropertySource> getPropertySourcesFromSecrets() {
 
                 Flux<PropertySource> secretListFlowable = computePodLabelSelector(client,
                     configuration.getSecrets().getPodLabels(), configuration.getNamespace(), labels, exceptionOnPodLabelsMissing)
-                        .flatMap(labelSelector -> client.listNamespacedSecret(configuration.getNamespace(), null, null, null, null, labelSelector, null, null, null, null))
+                        .flatMap(labelSelector -> client.listNamespacedSecret(configuration.getNamespace(), null, null, null, null, labelSelector, null, null, null, null, null))
                         .doOnError(ApiException.class, throwable -> LOG.error("Failed to list Secrets in the namespace [" + configuration.getNamespace() + "]: " + throwable.getResponseBody(), throwable))
                         .onErrorResume(throwable -> exceptionOnPodLabelsMissing
                                                        ? Mono.error(throwable)

diff --git a/...io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceEndpointProvider.java b/...io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceEndpointProvider.java
@@ -69,7 +69,7 @@ public Flux<V1Endpoints> listEndpoints(String namespace) {
             LOG.trace("Using API to fetch endpoints from namespace [{}]", namespace);
         }
 
-        return client.listNamespacedEndpoints(namespace, null, null, null, null, null, null, null, null, null)
+        return client.listNamespacedEndpoints(namespace, null, null, null, null, null, null, null, null, null, null)
                 .doOnError(ApiException.class, throwable -> LOG.error("Failed to list Endpoints from namespace [" + namespace + "]: " + throwable.getResponseBody(), throwable))
                 .flatMapIterable(V1EndpointsList::getItems);
     }

diff --git a/.../io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceServiceProvider.java b/.../io/micronaut/kubernetes/discovery/provider/KubernetesServiceInstanceServiceProvider.java
@@ -69,7 +69,7 @@ public Flux<V1Service> listServices(String namespace) {
             LOG.trace("Using API to fetch services from namespace [{}]", namespace);
         }
 
-        return client.listNamespacedService(namespace, null, null, null, null, null, null, null, null, null)
+        return client.listNamespacedService(namespace, null, null, null, null, null, null, null, null, null, null)
                 .doOnError(ApiException.class, throwable -> LOG.error("Failed to list Services from namespace [" + namespace + "]: " + throwable.getResponseBody(), throwable))
                 .flatMapIterable(V1ServiceList::getItems);
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                     null,
                     null,
                     null,
+                    null,
                     null).block()
             then:
@@ Expand All @@
                     null,
                     null,
                     null,
+                    null,
                     null).block()
             then:
@@ Expand Down @@