Merge pull request #31781 from marcnuri-forks/deps/kubernetes-client

Bump kubernetes-client-bom from 6.4.1 to 6.5.0
quarkusio · Mar 11, 2023 · 1a5ed81 · 1a5ed81
2 parents 7ee8c89 + 1e67c65
commit 1a5ed81
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/...ment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java b/...ment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java
@@ -25,6 +25,7 @@
 import io.fabric8.kubernetes.api.model.KubeSchema;
 import io.fabric8.kubernetes.api.model.KubernetesResource;
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
+import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.VersionInfo;
@@ -206,11 +207,11 @@ public void process(ApplicationIndexBuildItem applicationIndex, CombinedIndexBui
         reflectiveClasses.produce(ReflectiveClassBuildItem
                 .builder(AnyType.class, IntOrString.class, KubernetesDeserializer.class).methods(true).build());
 
-        // exec credentials support - we need to use Strings as the classes are private
+        // exec credentials support
         reflectiveClasses
-                .produce(ReflectiveClassBuildItem.builder("io.fabric8.kubernetes.client.Config$ExecCredential",
-                        "io.fabric8.kubernetes.client.Config$ExecCredentialSpec",
-                        "io.fabric8.kubernetes.client.Config$ExecCredentialStatus").methods(true).fields(true).build());
+                .produce(ReflectiveClassBuildItem.builder(Config.ExecCredential.class,
+                        Config.ExecCredentialSpec.class,
+                        Config.ExecCredentialStatus.class).methods(true).fields(true).build());
 
         if (log.isDebugEnabled()) {
             final String watchedClassNames = watchedClasses

diff --git a/...ernal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java b/...ernal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java
@@ -139,12 +139,6 @@ public class KubernetesClientBuildConfig {
     @ConfigItem(defaultValue = "PT1S") // default lifted from Kubernetes Client
     public Duration requestRetryBackoffInterval;
 
-    /**
-     * Maximum amount of time in milliseconds to wait for a rollout to be completed
-     */
-    @ConfigItem(defaultValue = "PT15M") // default lifted from Kubernetes Client
-    public Duration rollingTimeout;
-
     /**
      * HTTP proxy used to access the Kubernetes API server
      */

diff --git a/...me-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java b/...me-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java
@@ -23,7 +23,6 @@ public static Config createConfig(KubernetesClientBuildConfig buildConfig, TlsCo
                 .withWatchReconnectLimit(buildConfig.watchReconnectLimit)
                 .withConnectionTimeout((int) buildConfig.connectionTimeout.toMillis())
                 .withRequestTimeout((int) buildConfig.requestTimeout.toMillis())
-                .withRollingTimeout(buildConfig.rollingTimeout.toMillis())
                 .withMasterUrl(buildConfig.apiServerUrl.or(() -> buildConfig.masterUrl).orElse(base.getMasterUrl()))
                 .withNamespace(buildConfig.namespace.orElse(base.getNamespace()))
                 .withUsername(buildConfig.username.orElse(base.getUsername()))
@@ -65,8 +64,6 @@ public static KubernetesClient createClient() {
                         .orElse(Duration.ofMillis(base.getConnectionTimeout())).toMillis())
                 .withRequestTimeout((int) config.getOptionalValue(PREFIX + "request-timeout", Duration.class)
                         .orElse(Duration.ofMillis(base.getRequestTimeout())).toMillis())
-                .withRollingTimeout((int) config.getOptionalValue(PREFIX + "rolling-timeout", Duration.class)
-                        .orElse(Duration.ofMillis(base.getRollingTimeout())).toMillis())
                 .withMasterUrl(config.getOptionalValue(PREFIX + "api-server-url", String.class)
                         .or(() -> config.getOptionalValue(PREFIX + "master-url", String.class)).orElse(base.getMasterUrl()))
                 .withNamespace(config.getOptionalValue(PREFIX + "namespace", String.class).orElse(base.getNamespace()))

diff --git a/pom.xml b/pom.xml
@@ -68,7 +68,7 @@
 
         <!-- Dependency versions -->
         <jacoco.version>0.8.8</jacoco.version>
-        <kubernetes-client.version>6.4.1</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->
+        <kubernetes-client.version>6.5.0</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->
 
         <!-- Make sure to check compatibility between these 2 gRPC components before upgrade -->
         <grpc.version>1.53.0</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->