This is an automated email from the ASF dual-hosted git repository. nicknezis pushed a commit to branch nicknezis/kubernetes-client-upgrade in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
commit b76f36c1e5182d148adf8dadd0cce6488302c17f Author: Nicholas Nezis <[email protected]> AuthorDate: Mon Jan 3 13:38:11 2022 -0500 Updated Kubernetes client library to 14.0.0 --- WORKSPACE | 3 ++- .../src/java/org/apache/heron/scheduler/kubernetes/V1Controller.java | 4 +--- .../java/org/apache/heron/scheduler/kubernetes/V1ControllerTest.java | 4 ++-- third_party/java/BUILD | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 7982cd7..e177a56 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -54,7 +54,7 @@ jetty_version = "9.4.6.v20170531" jersey_version = "2.25.1" -kubernetes_client_version = "11.0.0" +kubernetes_client_version = "14.0.0" load("@rules_jvm_external//:defs.bzl", "maven_install") load("@rules_jvm_external//:specs.bzl", "maven") @@ -68,6 +68,7 @@ maven_install( "antlr:antlr:2.7.7", "org.apache.zookeeper:zookeeper:3.6.3", "io.kubernetes:client-java:" + kubernetes_client_version, + "io.kubernetes:client-java-api-fluent:" + kubernetes_client_version, "com.esotericsoftware:kryo:5.2.0", "org.apache.avro:avro:1.7.4", "org.apache.mesos:mesos:0.22.0", diff --git a/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/V1Controller.java b/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/V1Controller.java index 669b128..9f00816 100644 --- a/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/V1Controller.java +++ b/heron/schedulers/src/java/org/apache/heron/scheduler/kubernetes/V1Controller.java @@ -294,7 +294,7 @@ public class V1Controller extends KubernetesController { */ V1StatefulSet getStatefulSet() throws ApiException { return appsClient.readNamespacedStatefulSet(getStatefulSetName(true), getNamespace(), - null, null, null); + null); } /** @@ -1115,8 +1115,6 @@ public class V1Controller extends KubernetesController { return coreClient.readNamespacedConfigMap( configMapName, getNamespace(), - null, - null, null); } catch (ApiException e) { final String message = "Error retrieving ConfigMaps"; diff --git a/heron/schedulers/tests/java/org/apache/heron/scheduler/kubernetes/V1ControllerTest.java b/heron/schedulers/tests/java/org/apache/heron/scheduler/kubernetes/V1ControllerTest.java index a4975fd..162b401 100644 --- a/heron/schedulers/tests/java/org/apache/heron/scheduler/kubernetes/V1ControllerTest.java +++ b/heron/schedulers/tests/java/org/apache/heron/scheduler/kubernetes/V1ControllerTest.java @@ -1422,8 +1422,8 @@ public class V1ControllerTest { .withName(volumeName) .withNewNfs() .withServer(server) - .withNewPath(pathOnNFS) - .withNewReadOnly(readOnly) + .withPath(pathOnNFS) + .withReadOnly(Boolean.parseBoolean(readOnly)) .endNfs() .build() ); diff --git a/third_party/java/BUILD b/third_party/java/BUILD index 7fce083..3314f32 100644 --- a/third_party/java/BUILD +++ b/third_party/java/BUILD @@ -238,6 +238,7 @@ java_library( "@maven//:io_gsonfire_gson_fire", "@maven//:io_kubernetes_client_java", "@maven//:io_kubernetes_client_java_api", + "@maven//:io_kubernetes_client_java_api_fluent", "@maven//:io_kubernetes_client_java_proto", "@maven//:io_swagger_swagger_annotations", "@maven//:log4j_log4j",
