You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gy...@apache.org on 2022/03/22 09:58:04 UTC
[flink-kubernetes-operator] branch main updated: [FLINK-26554] Upgrade Operator SDK to avoid cleanup race condition
This is an automated email from the ASF dual-hosted git repository.
gyfora 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 758ed1c [FLINK-26554] Upgrade Operator SDK to avoid cleanup race condition
758ed1c is described below
commit 758ed1c8a391b7abdac147af23f857c032186b0a
Author: Gyula Fora <g_...@apple.com>
AuthorDate: Tue Mar 22 10:36:38 2022 +0100
[FLINK-26554] Upgrade Operator SDK to avoid cleanup race condition
---
.../java/org/apache/flink/kubernetes/operator/FlinkOperator.java | 8 +++++++-
pom.xml | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java
index d0bc217..d674388 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/FlinkOperator.java
@@ -31,6 +31,8 @@ import org.apache.flink.kubernetes.operator.validation.FlinkDeploymentValidator;
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.javaoperatorsdk.operator.Operator;
+import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,7 +53,11 @@ public class FlinkOperator {
namespace = "default";
}
- DefaultConfigurationService configurationService = DefaultConfigurationService.instance();
+ ConfigurationService configurationService =
+ new ConfigurationServiceOverrider(DefaultConfigurationService.instance())
+ .checkingCRDAndValidateLocalModel(false)
+ .build();
+
Operator operator = new Operator(client, configurationService);
FlinkOperatorConfiguration operatorConfiguration =
diff --git a/pom.xml b/pom.xml
index f88f5e1..3753b9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@ under the License.
<maven-failsafe-plugin.version>3.0.0-M4</maven-failsafe-plugin.version>
<maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
- <operator.sdk.version>2.1.1</operator.sdk.version>
+ <operator.sdk.version>2.1.2</operator.sdk.version>
<fabric8.version>5.12.1</fabric8.version>
<lombok.version>1.18.22</lombok.version>