From 255c952af25860564178d6cdcdd3450fa4821110 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Sat, 11 Mar 2023 05:40:43 +0100 Subject: [PATCH 1/3] fix: remove deprecated config rollingTimeout Rolling timeout configuration is deprecated and will be removed in v6.5.0 Signed-off-by: Marc Nuri --- .../client/runtime/KubernetesClientBuildConfig.java | 6 ------ .../kubernetes/client/runtime/KubernetesClientUtils.java | 3 --- 2 files changed, 9 deletions(-) diff --git a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java index 6c7919d46bff6..bfdee6a2b635d 100644 --- a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientBuildConfig.java +++ b/extensions/kubernetes-client/runtime-internal/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/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java b/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java index b2819c8cc1d71..ac27ac253b6a2 100644 --- a/extensions/kubernetes-client/runtime-internal/src/main/java/io/quarkus/kubernetes/client/runtime/KubernetesClientUtils.java +++ b/extensions/kubernetes-client/runtime-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())) From 655ccb5e0bbdbfb84cdd0daf20f8df664613a127 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Sat, 11 Mar 2023 05:11:14 +0100 Subject: [PATCH 2/3] deps: Bump kubernetes-client-bom from 6.4.1 to 6.5.0 Signed-off-by: Marc Nuri --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a5c72ada93e0..346754c84a9c5 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ 0.8.8 - 6.4.1 + 6.5.0 1.53.0 From 1e67c652b1923cf0f7dada581a0c4c5f899d45c7 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Sat, 11 Mar 2023 05:43:15 +0100 Subject: [PATCH 3/3] fix: ExecConfig classes are now public Signed-off-by: Marc Nuri --- .../client/deployment/KubernetesClientProcessor.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java b/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java index b17f4fe509a54..6b30a409b2c19 100644 --- a/extensions/kubernetes-client/deployment/src/main/java/io/quarkus/kubernetes/client/deployment/KubernetesClientProcessor.java +++ b/extensions/kubernetes-client/deployment/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