This is an automated email from the ASF dual-hosted git repository.
frankchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 341c65738d issue-12426 upgrade k8s client due to cve (#12427)
341c65738d is described below
commit 341c65738d7ac15889a3a07d119029d91a527935
Author: PJ Fanning <[email protected]>
AuthorDate: Thu Apr 21 04:11:55 2022 +0200
issue-12426 upgrade k8s client due to cve (#12427)
* issue-12426 upgrade k8s client due to cve
* compile issues
* try to fix license check
---
extensions-core/kubernetes-extensions/pom.xml | 2 +-
.../org/apache/druid/k8s/discovery/DefaultK8sApiClient.java | 4 ++--
licenses.yaml | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/extensions-core/kubernetes-extensions/pom.xml
b/extensions-core/kubernetes-extensions/pom.xml
index c1bd477c18..51e53a236b 100644
--- a/extensions-core/kubernetes-extensions/pom.xml
+++ b/extensions-core/kubernetes-extensions/pom.xml
@@ -35,7 +35,7 @@
</parent>
<properties>
- <kubernetes.client.version>10.0.1</kubernetes.client.version>
+ <kubernetes.client.version>11.0.1</kubernetes.client.version>
</properties>
<dependencies>
diff --git
a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
index 09c8218be2..e17f8360e5 100644
---
a/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
+++
b/extensions-core/kubernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
@@ -80,7 +80,7 @@ public class DefaultK8sApiClient implements K8sApiClient
)
{
try {
- V1PodList podList = coreV1Api.listNamespacedPod(podNamespace, null,
null, null, null, labelSelector, 0, null, null, null);
+ V1PodList podList = coreV1Api.listNamespacedPod(podNamespace, null,
null, null, null, labelSelector, 0, null, null, null, null);
Preconditions.checkState(podList != null, "WTH: NULL podList");
Map<String, DiscoveryDruidNode> allNodes = new HashMap();
@@ -114,7 +114,7 @@ public class DefaultK8sApiClient implements K8sApiClient
Watch.createWatch(
realK8sClient,
coreV1Api.listNamespacedPodCall(namespace, null, true, null,
null,
- labelSelector, null,
lastKnownResourceVersion, 0, true, null
+ labelSelector, null,
lastKnownResourceVersion, null, 0, true, null
),
new TypeReference<Watch.Response<V1Pod>>()
{
diff --git a/licenses.yaml b/licenses.yaml
index f4235850c8..d977d1a36e 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -864,7 +864,7 @@ name: kubernetes official java client
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 10.0.1
+version: 11.0.1
libraries:
- io.kubernetes: client-java
@@ -874,7 +874,7 @@ name: kubernetes official java client api
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 10.0.1
+version: 11.0.1
libraries:
- io.kubernetes: client-java-api
@@ -884,7 +884,7 @@ name: kubernetes official java client extended
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 10.0.1
+version: 11.0.1
libraries:
- io.kubernetes: client-java-extended
@@ -934,7 +934,7 @@ name: io.gsonfire gson-fire
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 1.8.4
+version: 1.8.5
libraries:
- io.gsonfire: gson-fire
@@ -964,7 +964,7 @@ name: org.bitbucket.b_c jose4j
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 0.7.2
+version: 0.7.3
libraries:
- org.bitbucket.b_c: jose4j
@@ -1004,7 +1004,7 @@ name: io.kubernetes client-java-proto
license_category: binary
module: extensions/druid-kubernetes-extensions
license_name: Apache License version 2.0
-version: 10.0.1
+version: 11.0.1
libraries:
- io.kubernetes: client-java-proto
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]