[flink-kubernetes-operator] branch main updated: [FLINK-27261] Disable 'web.cancel.enable' for session cluster

[wangyang0918]

This is an automated email from the ASF dual-hosted git repository.

wangyang0918 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 60654f4  [FLINK-27261] Disable 'web.cancel.enable' for session cluster
60654f4 is described below

commit 60654f4f50ba98d482729ba19463986703881e05
Author: Nicholas Jiang <programg...@163.com>
AuthorDate: Wed May 11 17:14:40 2022 +0800

    [FLINK-27261] Disable 'web.cancel.enable' for session cluster
    
    This closes #198.
---
 .../flink/kubernetes/operator/config/FlinkConfigBuilder.java       | 6 ++----
 .../flink/kubernetes/operator/config/FlinkConfigBuilderTest.java   | 7 +++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git 
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilder.java
 
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilder.java
index 727c437..15f2584 100644
--- 
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilder.java
+++ 
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilder.java
@@ -134,12 +134,10 @@ public class FlinkConfigBuilder {
         // Adapt default rest service type from 1.15+
         setDefaultConf(
                 REST_SERVICE_EXPOSED_TYPE, 
KubernetesConfigOptions.ServiceExposedType.ClusterIP);
+        // Set 'web.cancel.enable' to false to avoid users accidentally 
cancelling jobs.
+        setDefaultConf(CANCEL_ENABLE, false);
 
         if (spec.getJob() != null) {
-            // Set 'web.cancel.enable' to false for application deployments to 
avoid users
-            // accidentally cancelling jobs.
-            setDefaultConf(CANCEL_ENABLE, false);
-
             // With last-state upgrade mode, set the default value of
             // 'execution.checkpointing.interval'
             // to 5 minutes when HA is enabled.
diff --git 
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilderTest.java
 
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilderTest.java
index d26d455..2cc456c 100644
--- 
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilderTest.java
+++ 
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilderTest.java
@@ -146,6 +146,13 @@ public class FlinkConfigBuilderTest {
         Assertions.assertEquals(
                 DEFAULT_CHECKPOINTING_INTERVAL,
                 
configuration.get(ExecutionCheckpointingOptions.CHECKPOINTING_INTERVAL));
+
+        deployment = TestUtils.buildSessionCluster();
+        configuration =
+                new FlinkConfigBuilder(deployment, new Configuration())
+                        .applyFlinkConfiguration()
+                        .build();
+        Assertions.assertEquals(false, 
configuration.get(WebOptions.CANCEL_ENABLE));
     }
 
     @Test