From ab126a89032a6d573e953d7d92fc40b91a72a44c Mon Sep 17 00:00:00 2001 From: Matthias Pohl Date: Mon, 29 Jan 2024 11:29:07 +0100 Subject: [PATCH] [FLINK-34333][k8s] Upgrade k8s client to v6.9.2 to cover client issue #5464 (cherry-picked from FLINK-34007) https://github.com/fabric8io/kubernetes-client/issues/5463 The change in KubernetesClientTestBase was necessary because of the change [#5369](https://github.com/fabric8io/kubernetes-client/pull/5369) that ended up in v6.9.0 as well. --- flink-kubernetes/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 52 +++++++++---------- .../kubernetes/KubernetesClientTestBase.java | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/flink-kubernetes/pom.xml b/flink-kubernetes/pom.xml index 7faf4a71f8b495..e1a0af59e6349b 100644 --- a/flink-kubernetes/pom.xml +++ b/flink-kubernetes/pom.xml @@ -31,7 +31,7 @@ under the License. jar - 6.6.2 + 6.9.2 --add-opens=java.base/java.util=ALL-UNNAMED diff --git a/flink-kubernetes/src/main/resources/META-INF/NOTICE b/flink-kubernetes/src/main/resources/META-INF/NOTICE index f295c017ff4faf..2cc796fe022e9c 100644 --- a/flink-kubernetes/src/main/resources/META-INF/NOTICE +++ b/flink-kubernetes/src/main/resources/META-INF/NOTICE @@ -14,31 +14,31 @@ This project bundles the following dependencies under the Apache Software Licens - com.squareup.okhttp3:logging-interceptor:3.14.9 - com.squareup.okhttp3:okhttp:3.14.9 - com.squareup.okio:okio:1.17.2 -- io.fabric8:kubernetes-client:6.6.2 -- io.fabric8:kubernetes-client-api:6.6.2 -- io.fabric8:kubernetes-httpclient-okhttp:6.6.2 -- io.fabric8:kubernetes-model-admissionregistration:6.6.2 -- io.fabric8:kubernetes-model-apiextensions:6.6.2 -- io.fabric8:kubernetes-model-apps:6.6.2 -- io.fabric8:kubernetes-model-autoscaling:6.6.2 -- io.fabric8:kubernetes-model-batch:6.6.2 -- io.fabric8:kubernetes-model-certificates:6.6.2 -- io.fabric8:kubernetes-model-common:6.6.2 -- io.fabric8:kubernetes-model-coordination:6.6.2 -- io.fabric8:kubernetes-model-core:6.6.2 -- io.fabric8:kubernetes-model-discovery:6.6.2 -- io.fabric8:kubernetes-model-events:6.6.2 -- io.fabric8:kubernetes-model-extensions:6.6.2 -- io.fabric8:kubernetes-model-flowcontrol:6.6.2 -- io.fabric8:kubernetes-model-gatewayapi:6.6.2 -- io.fabric8:kubernetes-model-metrics:6.6.2 -- io.fabric8:kubernetes-model-networking:6.6.2 -- io.fabric8:kubernetes-model-node:6.6.2 -- io.fabric8:kubernetes-model-policy:6.6.2 -- io.fabric8:kubernetes-model-rbac:6.6.2 -- io.fabric8:kubernetes-model-resource:6.6.2 -- io.fabric8:kubernetes-model-scheduling:6.6.2 -- io.fabric8:kubernetes-model-storageclass:6.6.2 +- io.fabric8:kubernetes-client:6.9.2 +- io.fabric8:kubernetes-client-api:6.9.2 +- io.fabric8:kubernetes-httpclient-okhttp:6.9.2 +- io.fabric8:kubernetes-model-admissionregistration:6.9.2 +- io.fabric8:kubernetes-model-apiextensions:6.9.2 +- io.fabric8:kubernetes-model-apps:6.9.2 +- io.fabric8:kubernetes-model-autoscaling:6.9.2 +- io.fabric8:kubernetes-model-batch:6.9.2 +- io.fabric8:kubernetes-model-certificates:6.9.2 +- io.fabric8:kubernetes-model-common:6.9.2 +- io.fabric8:kubernetes-model-coordination:6.9.2 +- io.fabric8:kubernetes-model-core:6.9.2 +- io.fabric8:kubernetes-model-discovery:6.9.2 +- io.fabric8:kubernetes-model-events:6.9.2 +- io.fabric8:kubernetes-model-extensions:6.9.2 +- io.fabric8:kubernetes-model-flowcontrol:6.9.2 +- io.fabric8:kubernetes-model-gatewayapi:6.9.2 +- io.fabric8:kubernetes-model-metrics:6.9.2 +- io.fabric8:kubernetes-model-networking:6.9.2 +- io.fabric8:kubernetes-model-node:6.9.2 +- io.fabric8:kubernetes-model-policy:6.9.2 +- io.fabric8:kubernetes-model-rbac:6.9.2 +- io.fabric8:kubernetes-model-resource:6.9.2 +- io.fabric8:kubernetes-model-scheduling:6.9.2 +- io.fabric8:kubernetes-model-storageclass:6.9.2 - io.fabric8:zjsonpatch:0.3.0 -- org.snakeyaml:snakeyaml-engine:2.6 +- org.snakeyaml:snakeyaml-engine:2.7 - org.yaml:snakeyaml:1.33 diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesClientTestBase.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesClientTestBase.java index 8d9a4af663ba3f..aef667291b8eb0 100644 --- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesClientTestBase.java +++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/KubernetesClientTestBase.java @@ -163,7 +163,7 @@ protected void mockPodEventWithLabels( // mock four kinds of events. String mockPath = String.format( - "/api/v1/namespaces/%s/pods?labelSelector=%s&resourceVersion=%s&allowWatchBookmarks=true&watch=true", + "/api/v1/namespaces/%s/pods?allowWatchBookmarks=true&labelSelector=%s&resourceVersion=%s&watch=true", namespace, labels.entrySet().stream() .map(entry -> entry.getKey() + "%3D" + entry.getValue())