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/02/23 09:39:28 UTC

[flink-kubernetes-operator] branch main updated: [FLINK-26324] Remove duplicate condition judgment

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 e4cecf3  [FLINK-26324] Remove duplicate condition judgment
e4cecf3 is described below

commit e4cecf3daf459a0becf1fbd04c8ba491c91e4332
Author: Junfan Zhang <ju...@outlook.com>
AuthorDate: Wed Feb 23 17:21:43 2022 +0800

    [FLINK-26324] Remove duplicate condition judgment
    
    Closes #16
---
 .../operator/utils/FlinkConfigBuilder.java         | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/FlinkConfigBuilder.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/FlinkConfigBuilder.java
index 89fe458..e117d89 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/FlinkConfigBuilder.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/FlinkConfigBuilder.java
@@ -112,18 +112,16 @@ public class FlinkConfigBuilder {
 
     public FlinkConfigBuilder applyJobManagerSpec() throws IOException {
         if (spec.getJobManager() != null) {
-            if (spec.getJobManager() != null) {
-                setResource(spec.getJobManager().getResource(), effectiveConfig, true);
-                setPodTemplate(
-                        spec.getPodTemplate(),
-                        spec.getJobManager().getPodTemplate(),
-                        effectiveConfig,
-                        true);
-                if (spec.getJobManager().getReplicas() > 0) {
-                    effectiveConfig.set(
-                            KubernetesConfigOptions.KUBERNETES_JOBMANAGER_REPLICAS,
-                            spec.getJobManager().getReplicas());
-                }
+            setResource(spec.getJobManager().getResource(), effectiveConfig, true);
+            setPodTemplate(
+                    spec.getPodTemplate(),
+                    spec.getJobManager().getPodTemplate(),
+                    effectiveConfig,
+                    true);
+            if (spec.getJobManager().getReplicas() > 0) {
+                effectiveConfig.set(
+                        KubernetesConfigOptions.KUBERNETES_JOBMANAGER_REPLICAS,
+                        spec.getJobManager().getReplicas());
             }
         }
         return this;