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 2024/06/11 06:15:23 UTC

(flink-kubernetes-operator) branch main updated: [FLINK-35052] Reject unsupported versions in the webhook validator

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 ebd72032 [FLINK-35052] Reject unsupported versions in the webhook validator
ebd72032 is described below

commit ebd720329eeea983ce4ecb0083f039fb3c4bae54
Author: Alexander Fedulov <14...@users.noreply.github.com>
AuthorDate: Tue Jun 11 08:15:18 2024 +0200

    [FLINK-35052] Reject unsupported versions in the webhook validator
---
 .../flink/kubernetes/operator/validation/DefaultValidator.java   | 9 ++++++++-
 .../kubernetes/operator/validation/DefaultValidatorTest.java     | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/validation/DefaultValidator.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/validation/DefaultValidator.java
index 3c9035df..6821c01a 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/validation/DefaultValidator.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/validation/DefaultValidator.java
@@ -30,6 +30,7 @@ import org.apache.flink.kubernetes.operator.api.FlinkDeployment;
 import org.apache.flink.kubernetes.operator.api.FlinkSessionJob;
 import org.apache.flink.kubernetes.operator.api.spec.FlinkDeploymentSpec;
 import org.apache.flink.kubernetes.operator.api.spec.FlinkSessionJobSpec;
+import org.apache.flink.kubernetes.operator.api.spec.FlinkVersion;
 import org.apache.flink.kubernetes.operator.api.spec.IngressSpec;
 import org.apache.flink.kubernetes.operator.api.spec.JobManagerSpec;
 import org.apache.flink.kubernetes.operator.api.spec.JobSpec;
@@ -133,10 +134,16 @@ public class DefaultValidator implements FlinkResourceValidator {
 
     private Optional<String> validateFlinkVersion(FlinkDeployment deployment) {
         var spec = deployment.getSpec();
-        if (spec.getFlinkVersion() == null) {
+        var version = spec.getFlinkVersion();
+        if (version == null) {
             return Optional.of("Flink Version must be defined.");
         }
 
+        if (!FlinkVersion.isSupported(version)) {
+            return Optional.of(
+                    "Flink version " + version + " is not supported by this operator version");
+        }
+
         var lastReconciledSpec =
                 deployment.getStatus().getReconciliationStatus().deserializeLastReconciledSpec();
 
diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/validation/DefaultValidatorTest.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/validation/DefaultValidatorTest.java
index c924c71e..84c956a0 100644
--- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/validation/DefaultValidatorTest.java
+++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/validation/DefaultValidatorTest.java
@@ -483,6 +483,12 @@ public class DefaultValidatorTest {
 
         testError(dep -> dep.getSpec().setFlinkVersion(null), "Flink Version must be defined.");
 
+        testError(
+                dep -> dep.getSpec().setFlinkVersion(FlinkVersion.v1_14),
+                "Flink version "
+                        + FlinkVersion.v1_14
+                        + " is not supported by this operator version");
+
         testSuccess(dep -> dep.getSpec().setFlinkVersion(FlinkVersion.v1_15));
 
         testError(