Skip to content

Commit

Permalink
[FLINK-17565][k8s] Bump fabric8 version from 4.5.2 to 4.9.2
Browse files Browse the repository at this point in the history
This closes apache#12215 .
  • Loading branch information
zhengcanbin committed May 25, 2020
1 parent b19058a commit 42077e9
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 13 deletions.
3 changes: 1 addition & 2 deletions flink-end-to-end-tests/test-scripts/common_kubernetes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ function start_kubernetes_if_not_running {
# here.
# Similarly, the kubelets are marking themself as "low disk space",
# causing Flink to avoid this node (again, failing the test)
# Use fixed version v1.16.9 because fabric8 kubernetes-client could not work with higher version under jdk 8u252
sudo CHANGE_MINIKUBE_NONE_USER=true minikube start --kubernetes-version v1.16.9 --vm-driver=none \
sudo CHANGE_MINIKUBE_NONE_USER=true minikube start --vm-driver=none \
--extra-config=kubelet.image-gc-high-threshold=99 \
--extra-config=kubelet.image-gc-low-threshold=98 \
--extra-config=kubelet.minimum-container-ttl-duration=120m \
Expand Down
3 changes: 2 additions & 1 deletion flink-kubernetes/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ under the License.
<packaging>jar</packaging>

<properties>
<kubernetes.client.version>4.5.2</kubernetes.client.version>
<kubernetes.client.version>4.9.2</kubernetes.client.version>
</properties>

<!-- Set dependency version for transitive dependencies -->
Expand Down Expand Up @@ -128,6 +128,7 @@ under the License.
<include>com.fasterxml.jackson.core:jackson-annotations</include>
<include>com.fasterxml.jackson.core:jackson-databind</include>
<include>com.fasterxml.jackson.dataformat:jackson-dataformat-yaml</include>
<include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310</include>
<include>com.squareup.okhttp3:*</include>
<include>com.squareup.okio:okio</include>
<include>org.yaml:*</include>
Expand Down
7 changes: 4 additions & 3 deletions flink-kubernetes/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ This project bundles the following dependencies under the Apache Software Licens
- com.fasterxml.jackson.core:jackson-core:2.10.1
- com.fasterxml.jackson.core:jackson-databind:2.10.1
- com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.1
- com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.1
- com.github.mifmif:generex:1.0.2
- com.squareup.okhttp3:logging-interceptor:3.12.0
- com.squareup.okhttp3:okhttp:3.12.1
- com.squareup.okio:okio:1.15.0
- io.fabric8:kubernetes-client:4.5.2
- io.fabric8:kubernetes-model:4.5.2
- io.fabric8:kubernetes-model-common:4.5.2
- io.fabric8:kubernetes-client:4.9.2
- io.fabric8:kubernetes-model:4.9.2
- io.fabric8:kubernetes-model-common:4.9.2
- io.fabric8:zjsonpatch:0.3.0
- org.yaml:snakeyaml:1.23

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,10 @@ private void checkUpdatedConfigAndResourceSetting() {
.get(0);

assertEquals(
clusterSpecification.getMasterMemoryMB() + Constants.RESOURCE_UNIT_MB,
String.valueOf(clusterSpecification.getMasterMemoryMB()),
jmContainer.getResources().getRequests().get(Constants.RESOURCE_NAME_MEMORY).getAmount());
assertEquals(
clusterSpecification.getMasterMemoryMB() + Constants.RESOURCE_UNIT_MB,
String.valueOf(clusterSpecification.getMasterMemoryMB()),
jmContainer.getResources().getLimits().get(Constants.RESOURCE_NAME_MEMORY).getAmount());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ public void testMainContainerResourceRequirements() {

final Map<String, Quantity> requests = resourceRequirements.getRequests();
assertEquals(Double.toString(JOB_MANAGER_CPU), requests.get("cpu").getAmount());
assertEquals(JOB_MANAGER_MEMORY + "Mi", requests.get("memory").getAmount());
assertEquals(String.valueOf(JOB_MANAGER_MEMORY), requests.get("memory").getAmount());

final Map<String, Quantity> limits = resourceRequirements.getLimits();
assertEquals(Double.toString(JOB_MANAGER_CPU), limits.get("cpu").getAmount());
assertEquals(JOB_MANAGER_MEMORY + "Mi", limits.get("memory").getAmount());
assertEquals(String.valueOf(JOB_MANAGER_MEMORY), limits.get("memory").getAmount());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,11 @@ public void testMainContainerResourceRequirements() {

final Map<String, Quantity> requests = resourceRequirements.getRequests();
assertEquals(Double.toString(TASK_MANAGER_CPU), requests.get("cpu").getAmount());
assertEquals(TOTAL_PROCESS_MEMORY + "Mi", requests.get("memory").getAmount());
assertEquals(String.valueOf(TOTAL_PROCESS_MEMORY), requests.get("memory").getAmount());

final Map<String, Quantity> limits = resourceRequirements.getLimits();
assertEquals(Double.toString(TASK_MANAGER_CPU), limits.get("cpu").getAmount());
assertEquals(TOTAL_PROCESS_MEMORY + "Mi", limits.get("memory").getAmount());
assertEquals(String.valueOf(TOTAL_PROCESS_MEMORY), limits.get("memory").getAmount());
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void testPodSpec() {

final Map<String, Quantity> requests = resultedMainContainer.getResources().getRequests();
assertEquals(Double.toString(JOB_MANAGER_CPU), requests.get("cpu").getAmount());
assertEquals(JOB_MANAGER_MEMORY + "Mi", requests.get("memory").getAmount());
assertEquals(String.valueOf(JOB_MANAGER_MEMORY), requests.get("memory").getAmount());

assertEquals(1, resultedMainContainer.getCommand().size());
assertEquals(3, resultedMainContainer.getArgs().size());
Expand Down

0 comments on commit 42077e9

Please sign in to comment.