Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update kubernetes java client to 19.0.0 and docker-java to 3.3.4 #15449

Merged
merged 13 commits into from
Dec 12, 2023
Merged

update kubernetes java client to 19.0.0 and docker-java to 3.3.4 #15449

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bac3285
update kubernetes java client to 19.0.0
janjwerner-confluent Nov 29, 2023
9700b12
fix indentation
janjwerner-confluent Nov 30, 2023
4c688bc
Merge branch 'master' into janjwerner-update-kubernetes-client
janjwerner-confluent Dec 5, 2023
fd7c25d
replace values of optional arguments with nulls
janjwerner-confluent Dec 7, 2023
034a655
remove unnecessary bcprov and update docker-java
janjwerner-confluent Dec 7, 2023
7fd2fc9
fix licenses, suppressions, add version definitions
janjwerner-confluent Dec 8, 2023
ac12e24
add pluginmanagement ignore for a false positive
janjwerner-confluent Dec 8, 2023
e732f71
Update extensions-core/kubernetes-extensions/pom.xml
janjwerner-confluent Dec 8, 2023
8800dde
Update extensions-core/protobuf-extensions/pom.xml
janjwerner-confluent Dec 8, 2023
0afb744
Update extensions-core/kubernetes-extensions/pom.xml
janjwerner-confluent Dec 8, 2023
a34e737
remove the dependencymanagement override for the provided dependency
janjwerner-confluent Dec 9, 2023
f86c8d0
re-adding okio definition
janjwerner-confluent Dec 10, 2023
e7b94a6
Update extensions-core/protobuf-extensions/pom.xml
janjwerner-confluent Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 26 additions & 13 deletions extensions-core/kubernetes-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,22 @@
</parent>

<properties>
<kubernetes.client.version>11.0.4</kubernetes.client.version>
<kubernetes.client.version>19.0.0</kubernetes.client.version>
</properties>


<dependencyManagement>
<dependencies>
<!-- This is an indirect dependency of io.kubernetes.client-java
update to address vulnerability in transitive dependency okio used by okhttp -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.12.0</version>
janjwerner-confluent marked this conversation as resolved.
Show resolved Hide resolved
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.apache.druid</groupId>
Expand Down Expand Up @@ -80,18 +93,6 @@
<scope>test</scope>
</dependency>

<!-- Version override to address CVE-2020-28052 -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-ext-jdk15on</artifactId>
<scope>runtime</scope>
</dependency>

<!-- others -->
<dependency>
<groupId>com.google.code.findbugs</groupId>
Expand Down Expand Up @@ -137,6 +138,18 @@
</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<!-- analyze incorrectly flags this dependency as missing when omitted, and unused when declared -->
<ignoredDependencies>io.kubernetes:client-java-api-fluent:jar:19.0.0</ignoredDependencies>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.jacoco</groupId>
Expand Down
6 changes: 3 additions & 3 deletions ...bernetes-extensions/src/main/java/org/apache/druid/k8s/discovery/DefaultK8sApiClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public DefaultK8sApiClient(ApiClient realK8sClient, @Json ObjectMapper jsonMappe
public void patchPod(String podName, String podNamespace, String jsonPatchStr)
{
try {
coreV1Api.patchNamespacedPod(podName, podNamespace, new V1Patch(jsonPatchStr), "true", null, null, null);
coreV1Api.patchNamespacedPod(podName, podNamespace, new V1Patch(jsonPatchStr), "true", null, null, null, null);
}
catch (ApiException ex) {
throw new RE(ex, "Failed to patch pod[%s/%s], code[%d], error[%s].", podNamespace, podName, ex.getCode(), ex.getResponseBody());
Expand All @@ -80,7 +80,7 @@ public DiscoveryDruidNodeList listPods(
)
{
try {
V1PodList podList = coreV1Api.listNamespacedPod(podNamespace, null, null, null, null, labelSelector, 0, null, null, null, null);
V1PodList podList = coreV1Api.listNamespacedPod(podNamespace, null, null, null, null, labelSelector, 0, null, null, null, null, null);
Preconditions.checkState(podList != null, "WTH: NULL podList");

Map<String, DiscoveryDruidNode> allNodes = new HashMap();
Expand Down Expand Up @@ -114,7 +114,7 @@ public WatchResult watchPods(String namespace, String labelSelector, String last
Watch.createWatch(
realK8sClient,
coreV1Api.listNamespacedPodCall(namespace, null, true, null, null,
labelSelector, null, lastKnownResourceVersion, null, 0, true, null
labelSelector, null, lastKnownResourceVersion, null, null, 0, true, null
),
new TypeReference<Watch.Response<V1Pod>>()
{
Expand Down
15 changes: 15 additions & 0 deletions extensions-core/protobuf-extensions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

<properties>
<commons-io.version>2.11.0</commons-io.version>
<okio.version>3.6.0</okio.version>
</properties>

<repositories>
Expand All @@ -45,6 +46,20 @@
</repository>
</repositories>

<dependencyManagement>
<dependencies>
<!-- This is an indirect dependency of kafka-protobuf-provider
update to address vulnerability in transitive dependency okio -->
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
<scope>provided</scope>
janjwerner-confluent marked this conversation as resolved.
Show resolved Hide resolved
</dependency>
</dependencies>
</dependencyManagement>


<dependencies>
<dependency>
<groupId>org.apache.druid</groupId>
Expand Down
Loading