Skip to content

Commit

Permalink
[FLINK-34333][k8s] Upgrade k8s client to v6.9.2 to cover client issue a…
Browse files Browse the repository at this point in the history
…pache#5464 (cherry-picked from FLINK-34007)

fabric8io/kubernetes-client#5463

The change in KubernetesClientTestBase was necessary because of the change [apache#5369](fabric8io/kubernetes-client#5369) that ended up in v6.9.0 as well.
  • Loading branch information
XComp committed Feb 5, 2024
1 parent 03ea2a4 commit ab126a8
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion flink-kubernetes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ under the License.
<packaging>jar</packaging>

<properties>
<kubernetes.client.version>6.6.2</kubernetes.client.version>
<kubernetes.client.version>6.9.2</kubernetes.client.version>
<surefire.module.config><!--
CommonTestUtils#setEnv
-->--add-opens=java.base/java.util=ALL-UNNAMED
Expand Down
52 changes: 26 additions & 26 deletions flink-kubernetes/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down

0 comments on commit ab126a8

Please sign in to comment.