This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 72231cf1 [FLINK-33403] Bump flink version to 1.18.1 for
flink-kubernetes-operator
72231cf1 is described below
commit 72231cf1e577b9d8d5ea2dbfdade277a368b315d
Author: 1996fanrui <[email protected]>
AuthorDate: Tue Oct 31 10:26:25 2023 +0800
[FLINK-33403] Bump flink version to 1.18.1 for flink-kubernetes-operator
---
.../generated/auto_scaler_configuration.html | 2 +-
.../shortcodes/generated/dynamic_section.html | 4 +-
.../kubernetes_operator_config_configuration.html | 4 +-
.../standalone/StandaloneAutoscalerExecutor.java | 2 +-
.../flink/autoscaler/topology/JobTopology.java | 4 +-
.../runtime/jobgraph/JobResourceRequirements.java | 101 -----------------
.../jobgraph/JobVertexResourceRequirements.java | 120 ---------------------
.../messages/job/JobResourceRequirementsBody.java | 87 ---------------
.../job/JobResourceRequirementsHeaders.java | 73 -------------
.../job/JobResourcesRequirementsUpdateHeaders.java | 78 --------------
.../operator/config/FlinkConfigManager.java | 8 +-
.../KubernetesStandaloneClusterDescriptor.java | 23 ++--
pom.xml | 2 +-
13 files changed, 27 insertions(+), 481 deletions(-)
diff --git a/docs/layouts/shortcodes/generated/auto_scaler_configuration.html
b/docs/layouts/shortcodes/generated/auto_scaler_configuration.html
index 218bf697..aa5ff525 100644
--- a/docs/layouts/shortcodes/generated/auto_scaler_configuration.html
+++ b/docs/layouts/shortcodes/generated/auto_scaler_configuration.html
@@ -40,7 +40,7 @@
</tr>
<tr>
<td><h5>job.autoscaler.history.max.age</h5></td>
- <td style="word-wrap: break-word;">86400000 ms</td>
+ <td style="word-wrap: break-word;">1 d</td>
<td>Duration</td>
<td>Maximum age for past scaling decisions to retain.</td>
</tr>
diff --git a/docs/layouts/shortcodes/generated/dynamic_section.html
b/docs/layouts/shortcodes/generated/dynamic_section.html
index 02bd4d9e..a51a6e75 100644
--- a/docs/layouts/shortcodes/generated/dynamic_section.html
+++ b/docs/layouts/shortcodes/generated/dynamic_section.html
@@ -76,7 +76,7 @@
</tr>
<tr>
<td><h5>kubernetes.operator.jm-deployment.shutdown-ttl</h5></td>
- <td style="word-wrap: break-word;">86400000 ms</td>
+ <td style="word-wrap: break-word;">1 d</td>
<td>Duration</td>
<td>Time after which jobmanager pods of terminal application
deployments are shut down.</td>
</tr>
@@ -160,7 +160,7 @@
</tr>
<tr>
<td><h5>kubernetes.operator.savepoint.history.max.age</h5></td>
- <td style="word-wrap: break-word;">86400000 ms</td>
+ <td style="word-wrap: break-word;">1 d</td>
<td>Duration</td>
<td>Maximum age for savepoint history entries to retain. Due to
lazy clean-up, the most recent savepoint may live longer than the max age.</td>
</tr>
diff --git
a/docs/layouts/shortcodes/generated/kubernetes_operator_config_configuration.html
b/docs/layouts/shortcodes/generated/kubernetes_operator_config_configuration.html
index e4778ed9..00beffd0 100644
---
a/docs/layouts/shortcodes/generated/kubernetes_operator_config_configuration.html
+++
b/docs/layouts/shortcodes/generated/kubernetes_operator_config_configuration.html
@@ -166,7 +166,7 @@
</tr>
<tr>
<td><h5>kubernetes.operator.jm-deployment.shutdown-ttl</h5></td>
- <td style="word-wrap: break-word;">86400000 ms</td>
+ <td style="word-wrap: break-word;">1 d</td>
<td>Duration</td>
<td>Time after which jobmanager pods of terminal application
deployments are shut down.</td>
</tr>
@@ -358,7 +358,7 @@
</tr>
<tr>
<td><h5>kubernetes.operator.savepoint.history.max.age</h5></td>
- <td style="word-wrap: break-word;">86400000 ms</td>
+ <td style="word-wrap: break-word;">1 d</td>
<td>Duration</td>
<td>Maximum age for savepoint history entries to retain. Due to
lazy clean-up, the most recent savepoint may live longer than the max age.</td>
</tr>
diff --git
a/flink-autoscaler-standalone/src/main/java/org/apache/flink/autoscaler/standalone/StandaloneAutoscalerExecutor.java
b/flink-autoscaler-standalone/src/main/java/org/apache/flink/autoscaler/standalone/StandaloneAutoscalerExecutor.java
index 74109ac3..54eddccf 100644
---
a/flink-autoscaler-standalone/src/main/java/org/apache/flink/autoscaler/standalone/StandaloneAutoscalerExecutor.java
+++
b/flink-autoscaler-standalone/src/main/java/org/apache/flink/autoscaler/standalone/StandaloneAutoscalerExecutor.java
@@ -24,7 +24,7 @@ import
org.apache.flink.autoscaler.event.AutoScalerEventHandler;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.util.concurrent.ExecutorThreadFactory;
-import
org.apache.flink.shaded.guava30.com.google.common.util.concurrent.ThreadFactoryBuilder;
+import
org.apache.flink.shaded.guava31.com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/topology/JobTopology.java
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/topology/JobTopology.java
index 49fa11ba..80285540 100644
---
a/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/topology/JobTopology.java
+++
b/flink-autoscaler/src/main/java/org/apache/flink/autoscaler/topology/JobTopology.java
@@ -19,8 +19,8 @@ package org.apache.flink.autoscaler.topology;
import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableMap;
-import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableSet;
+import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableMap;
+import org.apache.flink.shaded.guava31.com.google.common.collect.ImmutableSet;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/runtime/jobgraph/JobResourceRequirements.java
b/flink-autoscaler/src/main/java/org/apache/flink/runtime/jobgraph/JobResourceRequirements.java
deleted file mode 100644
index ec517d7f..00000000
---
a/flink-autoscaler/src/main/java/org/apache/flink/runtime/jobgraph/JobResourceRequirements.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.runtime.jobgraph;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
-import static org.apache.flink.util.Preconditions.checkNotNull;
-
-/** Copied from Flink. Should be removed once the client dependency is
upgraded to 1.18. */
-public class JobResourceRequirements implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static Builder newBuilder() {
- return new Builder();
- }
-
- /** Builder. */
- public static final class Builder {
-
- private final Map<JobVertexID, JobVertexResourceRequirements>
vertexResources =
- new HashMap<>();
-
- public Builder setParallelismForJobVertex(
- JobVertexID jobVertexId, int lowerBound, int upperBound) {
- vertexResources.put(
- jobVertexId,
- new JobVertexResourceRequirements(
- new
JobVertexResourceRequirements.Parallelism(lowerBound, upperBound)));
- return this;
- }
-
- public JobResourceRequirements build() {
- return new JobResourceRequirements(vertexResources);
- }
- }
-
- private final Map<JobVertexID, JobVertexResourceRequirements>
vertexResources;
-
- public JobResourceRequirements(
- Map<JobVertexID, JobVertexResourceRequirements> vertexResources) {
- this.vertexResources =
- Collections.unmodifiableMap(new
HashMap<>(checkNotNull(vertexResources)));
- }
-
- public JobVertexResourceRequirements.Parallelism
getParallelism(JobVertexID jobVertexId) {
- return Optional.ofNullable(vertexResources.get(jobVertexId))
- .map(JobVertexResourceRequirements::getParallelism)
- .orElseThrow(
- () ->
- new IllegalStateException(
- "No requirement set for vertex " +
jobVertexId));
- }
-
- public Map<JobVertexID, JobVertexResourceRequirements>
getJobVertexParallelisms() {
- return vertexResources;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- final JobResourceRequirements that = (JobResourceRequirements) o;
- return Objects.equals(vertexResources, that.vertexResources);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(vertexResources);
- }
-
- @Override
- public String toString() {
- return "JobResourceRequirements{" + "vertexResources=" +
vertexResources + '}';
- }
-}
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/runtime/jobgraph/JobVertexResourceRequirements.java
b/flink-autoscaler/src/main/java/org/apache/flink/runtime/jobgraph/JobVertexResourceRequirements.java
deleted file mode 100644
index 3753daa3..00000000
---
a/flink-autoscaler/src/main/java/org/apache/flink/runtime/jobgraph/JobVertexResourceRequirements.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.runtime.jobgraph;
-
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-import static org.apache.flink.util.Preconditions.checkNotNull;
-
-/** Copied from Flink. Should be removed once the client dependency is
upgraded to 1.18. */
-public class JobVertexResourceRequirements implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private static final String FIELD_NAME_PARALLELISM = "parallelism";
-
- /** Parallelisms. */
- public static class Parallelism implements Serializable {
-
- private static final String FIELD_NAME_LOWER_BOUND = "lowerBound";
- private static final String FIELD_NAME_UPPER_BOUND = "upperBound";
-
- @JsonProperty(FIELD_NAME_LOWER_BOUND)
- private final int lowerBound;
-
- @JsonProperty(FIELD_NAME_UPPER_BOUND)
- private final int upperBound;
-
- @JsonCreator
- public Parallelism(
- @JsonProperty(FIELD_NAME_LOWER_BOUND) int lowerBound,
- @JsonProperty(FIELD_NAME_UPPER_BOUND) int upperBound) {
- this.lowerBound = lowerBound;
- this.upperBound = upperBound;
- }
-
- public int getLowerBound() {
- return lowerBound;
- }
-
- public int getUpperBound() {
- return upperBound;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- final Parallelism that = (Parallelism) o;
- return lowerBound == that.lowerBound && upperBound ==
that.upperBound;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(lowerBound, upperBound);
- }
-
- @Override
- public String toString() {
- return "Parallelism{" + "lowerBound=" + lowerBound + ",
upperBound=" + upperBound + '}';
- }
- }
-
- @JsonProperty(FIELD_NAME_PARALLELISM)
- private final Parallelism parallelism;
-
- public JobVertexResourceRequirements(
- @JsonProperty(FIELD_NAME_PARALLELISM) Parallelism parallelism) {
- this.parallelism = checkNotNull(parallelism);
- }
-
- public Parallelism getParallelism() {
- return parallelism;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- final JobVertexResourceRequirements that =
(JobVertexResourceRequirements) o;
- return parallelism.equals(that.parallelism);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(parallelism);
- }
-
- @Override
- public String toString() {
- return "JobVertexResourceRequirements{" + "parallelism=" + parallelism
+ '}';
- }
-}
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/runtime/rest/messages/job/JobResourceRequirementsBody.java
b/flink-autoscaler/src/main/java/org/apache/flink/runtime/rest/messages/job/JobResourceRequirementsBody.java
deleted file mode 100644
index a0b8e47e..00000000
---
a/flink-autoscaler/src/main/java/org/apache/flink/runtime/rest/messages/job/JobResourceRequirementsBody.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.runtime.rest.messages.job;
-
-import org.apache.flink.runtime.jobgraph.JobResourceRequirements;
-import org.apache.flink.runtime.jobgraph.JobVertexID;
-import org.apache.flink.runtime.jobgraph.JobVertexResourceRequirements;
-import org.apache.flink.runtime.rest.messages.RequestBody;
-import org.apache.flink.runtime.rest.messages.ResponseBody;
-import org.apache.flink.runtime.rest.messages.json.JobVertexIDKeyDeserializer;
-import org.apache.flink.runtime.rest.messages.json.JobVertexIDKeySerializer;
-
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonAnyGetter;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonAnySetter;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnore;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-import javax.annotation.Nullable;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-
-/** Copied from Flink. Should be removed once the client dependency is
upgraded to 1.18. */
-public class JobResourceRequirementsBody implements RequestBody, ResponseBody {
-
- @JsonAnySetter
- @JsonAnyGetter
- @JsonSerialize(keyUsing = JobVertexIDKeySerializer.class)
- @JsonDeserialize(keyUsing = JobVertexIDKeyDeserializer.class)
- private final Map<JobVertexID, JobVertexResourceRequirements>
jobVertexResourceRequirements;
-
- public JobResourceRequirementsBody() {
- this(null);
- }
-
- public JobResourceRequirementsBody(@Nullable JobResourceRequirements
jobResourceRequirements) {
- if (jobResourceRequirements != null) {
- this.jobVertexResourceRequirements =
jobResourceRequirements.getJobVertexParallelisms();
- } else {
- this.jobVertexResourceRequirements = new HashMap<>();
- }
- }
-
- @JsonIgnore
- public Optional<JobResourceRequirements> asJobResourceRequirements() {
- if (jobVertexResourceRequirements.isEmpty()) {
- return Optional.empty();
- }
- return Optional.of(new
JobResourceRequirements(jobVertexResourceRequirements));
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) {
- return true;
- }
- if (o == null || getClass() != o.getClass()) {
- return false;
- }
- final JobResourceRequirementsBody that = (JobResourceRequirementsBody)
o;
- return Objects.equals(jobVertexResourceRequirements,
that.jobVertexResourceRequirements);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(jobVertexResourceRequirements);
- }
-}
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/runtime/rest/messages/job/JobResourceRequirementsHeaders.java
b/flink-autoscaler/src/main/java/org/apache/flink/runtime/rest/messages/job/JobResourceRequirementsHeaders.java
deleted file mode 100644
index 2286e982..00000000
---
a/flink-autoscaler/src/main/java/org/apache/flink/runtime/rest/messages/job/JobResourceRequirementsHeaders.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.runtime.rest.messages.job;
-
-import org.apache.flink.runtime.rest.HttpMethodWrapper;
-import org.apache.flink.runtime.rest.messages.EmptyRequestBody;
-import org.apache.flink.runtime.rest.messages.JobIDPathParameter;
-import org.apache.flink.runtime.rest.messages.JobMessageParameters;
-import org.apache.flink.runtime.rest.messages.RuntimeMessageHeaders;
-
-import
org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus;
-
-/** Copied from Flink. Should be removed once the client dependency is
upgraded to 1.18. */
-public class JobResourceRequirementsHeaders
- implements RuntimeMessageHeaders<
- EmptyRequestBody, JobResourceRequirementsBody,
JobMessageParameters> {
-
- public static final JobResourceRequirementsHeaders INSTANCE =
- new JobResourceRequirementsHeaders();
-
- private static final String URL = "/jobs/:" + JobIDPathParameter.KEY +
"/resource-requirements";
-
- @Override
- public HttpMethodWrapper getHttpMethod() {
- return HttpMethodWrapper.GET;
- }
-
- @Override
- public String getTargetRestEndpointURL() {
- return URL;
- }
-
- @Override
- public Class<JobResourceRequirementsBody> getResponseClass() {
- return JobResourceRequirementsBody.class;
- }
-
- @Override
- public HttpResponseStatus getResponseStatusCode() {
- return HttpResponseStatus.OK;
- }
-
- @Override
- public String getDescription() {
- return "Request details on the job's resource requirements.";
- }
-
- @Override
- public Class<EmptyRequestBody> getRequestClass() {
- return EmptyRequestBody.class;
- }
-
- @Override
- public JobMessageParameters getUnresolvedMessageParameters() {
- return new JobMessageParameters();
- }
-}
diff --git
a/flink-autoscaler/src/main/java/org/apache/flink/runtime/rest/messages/job/JobResourcesRequirementsUpdateHeaders.java
b/flink-autoscaler/src/main/java/org/apache/flink/runtime/rest/messages/job/JobResourcesRequirementsUpdateHeaders.java
deleted file mode 100644
index 9f8d78cd..00000000
---
a/flink-autoscaler/src/main/java/org/apache/flink/runtime/rest/messages/job/JobResourcesRequirementsUpdateHeaders.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.runtime.rest.messages.job;
-
-import org.apache.flink.runtime.rest.HttpMethodWrapper;
-import org.apache.flink.runtime.rest.messages.EmptyResponseBody;
-import org.apache.flink.runtime.rest.messages.JobIDPathParameter;
-import org.apache.flink.runtime.rest.messages.JobMessageParameters;
-import org.apache.flink.runtime.rest.messages.RuntimeMessageHeaders;
-
-import
org.apache.flink.shaded.netty4.io.netty.handler.codec.http.HttpResponseStatus;
-
-/** Copied from Flink. Should be removed once the client dependency is
upgraded to 1.18. */
-public class JobResourcesRequirementsUpdateHeaders
- implements RuntimeMessageHeaders<
- JobResourceRequirementsBody, EmptyResponseBody,
JobMessageParameters> {
-
- public static final JobResourcesRequirementsUpdateHeaders INSTANCE =
- new JobResourcesRequirementsUpdateHeaders();
-
- private static final String URL = "/jobs/:" + JobIDPathParameter.KEY +
"/resource-requirements";
-
- @Override
- public HttpMethodWrapper getHttpMethod() {
- return HttpMethodWrapper.PUT;
- }
-
- @Override
- public String getTargetRestEndpointURL() {
- return URL;
- }
-
- @Override
- public Class<EmptyResponseBody> getResponseClass() {
- return EmptyResponseBody.class;
- }
-
- @Override
- public HttpResponseStatus getResponseStatusCode() {
- return HttpResponseStatus.OK;
- }
-
- @Override
- public String getDescription() {
- return "Request to update job's resource requirements.";
- }
-
- @Override
- public Class<JobResourceRequirementsBody> getRequestClass() {
- return JobResourceRequirementsBody.class;
- }
-
- @Override
- public JobMessageParameters getUnresolvedMessageParameters() {
- return new JobMessageParameters();
- }
-
- @Override
- public String operationId() {
- return "updateJobResourceRequirements";
- }
-}
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigManager.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigManager.java
index 0bca875a..47a5ca15 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigManager.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigManager.java
@@ -32,10 +32,10 @@ import
org.apache.flink.kubernetes.operator.reconciler.ReconciliationUtils;
import org.apache.flink.kubernetes.operator.utils.EnvUtils;
import org.apache.flink.kubernetes.operator.utils.FlinkUtils;
-import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheLoader;
-import org.apache.flink.shaded.guava30.com.google.common.cache.LoadingCache;
+import org.apache.flink.shaded.guava31.com.google.common.cache.Cache;
+import org.apache.flink.shaded.guava31.com.google.common.cache.CacheBuilder;
+import org.apache.flink.shaded.guava31.com.google.common.cache.CacheLoader;
+import org.apache.flink.shaded.guava31.com.google.common.cache.LoadingCache;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git
a/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/standalone/KubernetesStandaloneClusterDescriptor.java
b/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/standalone/KubernetesStandaloneClusterDescriptor.java
index 751223f8..31a5f4cf 100644
---
a/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/standalone/KubernetesStandaloneClusterDescriptor.java
+++
b/flink-kubernetes-standalone/src/main/java/org/apache/flink/kubernetes/operator/standalone/KubernetesStandaloneClusterDescriptor.java
@@ -34,6 +34,7 @@ import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.kubernetes.KubernetesClusterDescriptor;
import org.apache.flink.kubernetes.configuration.KubernetesConfigOptions;
import org.apache.flink.kubernetes.kubeclient.Endpoint;
+import org.apache.flink.kubernetes.kubeclient.FlinkKubeClientFactory;
import org.apache.flink.kubernetes.kubeclient.FlinkPod;
import
org.apache.flink.kubernetes.kubeclient.KubernetesJobManagerSpecification;
import
org.apache.flink.kubernetes.operator.kubeclient.FlinkStandaloneKubeClient;
@@ -67,15 +68,15 @@ public class KubernetesStandaloneClusterDescriptor extends
KubernetesClusterDesc
private final Configuration flinkConfig;
- private final FlinkStandaloneKubeClient client;
+ private final FlinkStandaloneKubeClient standaloneKubeClient;
private final String clusterId;
public KubernetesStandaloneClusterDescriptor(
Configuration flinkConfig, FlinkStandaloneKubeClient client) {
- super(flinkConfig, client);
+ super(flinkConfig, FlinkKubeClientFactory.getInstance());
this.flinkConfig = checkNotNull(flinkConfig);
- this.client = checkNotNull(client);
+ this.standaloneKubeClient = checkNotNull(client);
this.clusterId =
checkNotNull(
flinkConfig.getString(KubernetesConfigOptions.CLUSTER_ID),
@@ -149,8 +150,8 @@ public class KubernetesStandaloneClusterDescriptor extends
KubernetesClusterDesc
KubernetesJobManagerSpecification jmSpec =
getJobManagerSpec(clusterSpecification);
Deployment tmDeployment =
getTaskManagerDeployment(clusterSpecification);
- client.createJobManagerComponent(jmSpec);
- client.createTaskManagerDeployment(tmDeployment);
+ standaloneKubeClient.createJobManagerComponent(jmSpec);
+ standaloneKubeClient.createTaskManagerDeployment(tmDeployment);
return createClusterClientProvider(clusterId);
} catch (Exception e) {
@@ -158,7 +159,7 @@ public class KubernetesStandaloneClusterDescriptor extends
KubernetesClusterDesc
LOG.warn(
"Failed to create the Kubernetes cluster \"{}\", try
to clean up the residual resources.",
clusterId);
- client.stopAndCleanupCluster(clusterId);
+ standaloneKubeClient.stopAndCleanupCluster(clusterId);
} catch (Exception e1) {
LOG.info(
"Failed to stop and clean up the Kubernetes cluster
\"{}\".",
@@ -181,7 +182,9 @@ public class KubernetesStandaloneClusterDescriptor extends
KubernetesClusterDesc
.map(
file ->
KubernetesUtils.loadPodFromTemplateFile(
- client, file,
Constants.MAIN_CONTAINER_NAME))
+ standaloneKubeClient,
+ file,
+ Constants.MAIN_CONTAINER_NAME))
.orElse(new FlinkPod.Builder().build());
return
StandaloneKubernetesJobManagerFactory.buildKubernetesJobManagerSpecification(
@@ -198,7 +201,9 @@ public class KubernetesStandaloneClusterDescriptor extends
KubernetesClusterDesc
.map(
file ->
KubernetesUtils.loadPodFromTemplateFile(
- client, file,
Constants.MAIN_CONTAINER_NAME))
+ standaloneKubeClient,
+ file,
+ Constants.MAIN_CONTAINER_NAME))
.orElse(new FlinkPod.Builder().build());
return
StandaloneKubernetesTaskManagerFactory.buildKubernetesTaskManagerDeployment(
@@ -209,7 +214,7 @@ public class KubernetesStandaloneClusterDescriptor extends
KubernetesClusterDesc
return () -> {
final Configuration configuration = new Configuration(flinkConfig);
- final Optional<Endpoint> restEndpoint =
client.getRestEndpoint(clusterId);
+ final Optional<Endpoint> restEndpoint =
standaloneKubeClient.getRestEndpoint(clusterId);
if (restEndpoint.isPresent()) {
configuration.setString(RestOptions.ADDRESS,
restEndpoint.get().getAddress());
diff --git a/pom.xml b/pom.xml
index 3fe65467..3b08a129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@ under the License.
<lombok.version>1.18.30</lombok.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<commons-io.version>2.11.0</commons-io.version>
- <flink.version>1.17.1</flink.version>
+ <flink.version>1.18.1</flink.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.17.1</log4j.version>
