apache · gyfora · Feb 5, 2025 · Jan 29, 2025 · Jan 31, 2025 · Jan 30, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -91,6 +91,7 @@ jobs:
         http-client: [ "okhttp" ]
         java-version: [ "11", "17"]
         flink-version:
+          - "v2_0"
           - "v1_20"
           - "v1_19"
           - "v1_18"
@@ -107,11 +108,11 @@ jobs:
     strategy:
       matrix:
         flink-version:
+          - "v2_0"
           - "v1_20"
           - "v1_19"
           - "v1_18"
           - "v1_17"
-          - "v1_16"
         mode:
          - "native"
          - "standalone"
@@ -143,11 +144,11 @@ jobs:
     strategy:
       matrix:
         flink-version:
+          - "v2_0"
           - "v1_20"
           - "v1_18"
           - "v1_19"
           - "v1_17"
-          - "v1_16"
         mode:
           - "native"
           - "standalone"

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -84,10 +84,19 @@ jobs:
           if [[ "${{ inputs.append-java-version }}" == "true" ]]; then
             FLINK_IMAGE=${FLINK_IMAGE}-java${{ inputs.java-version }}
           fi
+
+          EXAMPLES_JAR="https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.14.4/flink-examples-streaming_2.12-1.14.4.jar"
+          if [[ ${{ inputs.flink-version }} == v2* ]]; then
+            EXAMPLES_JAR="https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming/2.0-preview1/flink-examples-streaming-2.0-preview1.jar"
+          fi
+          ESCAPED_EXAMPLES_JAR=$(printf '%s\n' "$EXAMPLES_JAR" | sed -e 's/[\/&]/\\&/g')
+
           echo FLINK_IMAGE=${FLINK_IMAGE}
+          echo EXAMPLES_JAR=${EXAMPLES_JAR}
           sed -i "s/image: flink:.*/image: ${FLINK_IMAGE}/" e2e-tests/data/*.yaml
           sed -i "s/flinkVersion: .*/flinkVersion: ${{ inputs.flink-version }}/" e2e-tests/data/*.yaml
           sed -i "s/mode: .*/mode: ${{ inputs.mode }}/" e2e-tests/data/*.yaml
+          sed -i "s/STREAMING_EXAMPLES_JAR_URL/${ESCAPED_EXAMPLES_JAR}/" e2e-tests/data/*.yaml
           git diff HEAD
           echo "Running e2e-tests/$test"
           bash e2e-tests/${{ inputs.test }} || exit 1

diff --git a/docs/content.zh/docs/custom-resource/autoscaler.md b/docs/content.zh/docs/custom-resource/autoscaler.md
@@ -177,7 +177,7 @@ We suggest setting this based on your actual objective, such us 10,30,60 minutes
 ### Basic configuration example
 ```yaml
 ...
-flinkVersion: v1_17
+flinkVersion: v1_20
 flinkConfiguration:
     job.autoscaler.enabled: "true"
     job.autoscaler.stabilization.interval: 1m

diff --git a/docs/content.zh/docs/custom-resource/job-management.md b/docs/content.zh/docs/custom-resource/job-management.md
@@ -111,8 +111,8 @@ kind: FlinkDeployment
 metadata:
   name: basic-checkpoint-ha-example
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
     state.savepoints.dir: file:///flink-data/savepoints

diff --git a/docs/content.zh/docs/custom-resource/overview.md b/docs/content.zh/docs/custom-resource/overview.md
@@ -114,8 +114,8 @@ metadata:
   namespace: default
   name: basic-example
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
   serviceAccount: flink

diff --git a/docs/content.zh/docs/custom-resource/pod-template.md b/docs/content.zh/docs/custom-resource/pod-template.md
@@ -46,8 +46,8 @@ metadata:
   namespace: default
   name: pod-template-example
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
   serviceAccount: flink

diff --git a/docs/content.zh/docs/operations/ingress.md b/docs/content.zh/docs/operations/ingress.md
@@ -35,8 +35,8 @@ metadata:
   namespace: default
   name: advanced-ingress
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   ingress:
     template: "flink.k8s.io/{{namespace}}/{{name}}(/|$)(.*)"
     className: "nginx"

diff --git a/docs/content/docs/custom-resource/autoscaler.md b/docs/content/docs/custom-resource/autoscaler.md
@@ -177,7 +177,7 @@ We suggest setting this based on your actual objective, such us 10,30,60 minutes
 ### Basic configuration example
 ```yaml
 ...
-flinkVersion: v1_17
+flinkVersion: v1_20
 flinkConfiguration:
     job.autoscaler.enabled: "true"
     job.autoscaler.stabilization.interval: 1m

diff --git a/docs/content/docs/custom-resource/job-management.md b/docs/content/docs/custom-resource/job-management.md
@@ -111,8 +111,8 @@ kind: FlinkDeployment
 metadata:
   name: basic-checkpoint-ha-example
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
     state.savepoints.dir: file:///flink-data/savepoints

diff --git a/docs/content/docs/custom-resource/overview.md b/docs/content/docs/custom-resource/overview.md
@@ -117,8 +117,8 @@ metadata:
   namespace: default
   name: basic-example
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
   serviceAccount: flink

diff --git a/docs/content/docs/custom-resource/pod-template.md b/docs/content/docs/custom-resource/pod-template.md
@@ -49,8 +49,8 @@ metadata:
   namespace: default
   name: pod-template-example
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
   serviceAccount: flink

diff --git a/docs/content/docs/custom-resource/reference.md b/docs/content/docs/custom-resource/reference.md
@@ -112,11 +112,12 @@ This serves as a full reference for FlinkDeployment and FlinkSessionJob custom r
 | v1_13 | No longer supported since 1.7 operator release. |
 | v1_14 | No longer supported since 1.7 operator release. |
 | v1_15 | Deprecated since 1.10 operator release. |
-| v1_16 |  |
+| v1_16 | Deprecated since 1.11 operator release. |
 | v1_17 |  |
 | v1_18 |  |
 | v1_19 |  |
 | v1_20 |  |
+| v2_0 |  |
 | majorVersion | int | The major integer from the Flink semver. For example for Flink 1.18.1 this would be 1. |
 | minorVersion | int | The minor integer from the Flink semver. For example for Flink 1.18.1 this would be 18. |
 

diff --git a/docs/content/docs/operations/ingress.md b/docs/content/docs/operations/ingress.md
@@ -35,8 +35,8 @@ metadata:
   namespace: default
   name: advanced-ingress
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   ingress:
     template: "flink.k8s.io/{{namespace}}/{{name}}(/|$)(.*)"
     className: "nginx"

diff --git a/e2e-tests/data/autoscaler.yaml b/e2e-tests/data/autoscaler.yaml
@@ -22,8 +22,8 @@ metadata:
   namespace: default
   name: flink-autoscaler-e2e
 spec:
-  image: flink:1.18
-  flinkVersion: v1_18
+  image: flink:1.20
+  flinkVersion: v1_20
   ingress:
     template: "/{{namespace}}/{{name}}(/|$)(.*)"
     className: "nginx"

diff --git a/e2e-tests/data/flinkdep-cr.yaml b/e2e-tests/data/flinkdep-cr.yaml
@@ -22,16 +22,16 @@ metadata:
   namespace: default
   name: flink-example-statemachine
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   ingress:
     template: "/{{namespace}}/{{name}}(/|$)(.*)"
     className: "nginx"
     annotations:
       nginx.ingress.kubernetes.io/rewrite-target: "/$2"
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
-    high-availability: org.apache.flink.kubernetes.highavailability.KubernetesHaServicesFactory
+    high-availability.type: kubernetes
     high-availability.storageDir: file:///opt/flink/volume/flink-ha
     state.checkpoints.dir: file:///opt/flink/volume/flink-cp
     state.savepoints.dir: file:///opt/flink/volume/flink-sp
@@ -44,7 +44,7 @@ spec:
           image: busybox:1.35.0
           imagePullPolicy: IfNotPresent
           # Use wget or other tools to get user jars from remote storage
-          command: [ 'wget', 'https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.14.4/flink-examples-streaming_2.12-1.14.4.jar', '-O', '/flink-artifact/myjob.jar' ]
+          command: [ 'wget', 'STREAMING_EXAMPLES_JAR_URL', '-O', '/flink-artifact/myjob.jar' ]
           volumeMounts:
             - mountPath: /flink-artifact
               name: flink-artifact

diff --git a/e2e-tests/data/multi-sessionjob.yaml b/e2e-tests/data/multi-sessionjob.yaml
@@ -22,16 +22,16 @@ metadata:
   namespace: default
   name: session-cluster-1
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   ingress:
     template: "/{{namespace}}/{{name}}(/|$)(.*)"
     className: "nginx"
     annotations:
       nginx.ingress.kubernetes.io/rewrite-target: "/$2"
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
-    high-availability: org.apache.flink.kubernetes.highavailability.KubernetesHaServicesFactory
+    high-availability.type: kubernetes
     high-availability.storageDir: file:///opt/flink/volume/flink-ha
     state.checkpoints.dir: file:///opt/flink/volume/flink-cp
     state.savepoints.dir: file:///opt/flink/volume/flink-sp
@@ -70,16 +70,16 @@ metadata:
   namespace: flink
   name: session-cluster-1
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   ingress:
     template: "/{{namespace}}/{{name}}(/|$)(.*)"
     className: "nginx"
     annotations:
       nginx.ingress.kubernetes.io/rewrite-target: "/$2"
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
-    high-availability: org.apache.flink.kubernetes.highavailability.KubernetesHaServicesFactory
+    high-availability.type: kubernetes
     high-availability.storageDir: file:///opt/flink/volume/flink-ha
     state.checkpoints.dir: file:///opt/flink/volume/flink-cp
     state.savepoints.dir: file:///opt/flink/volume/flink-sp
@@ -120,7 +120,7 @@ metadata:
 spec:
   deploymentName: session-cluster-1
   job:
-    jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.14.4/flink-examples-streaming_2.12-1.14.4.jar
+    jarURI: STREAMING_EXAMPLES_JAR_URL
     parallelism: 2
     upgradeMode: savepoint
     entryClass: org.apache.flink.streaming.examples.statemachine.StateMachineExample
@@ -134,7 +134,7 @@ metadata:
 spec:
   deploymentName: session-cluster-1
   job:
-    jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.14.4/flink-examples-streaming_2.12-1.14.4.jar
+    jarURI: STREAMING_EXAMPLES_JAR_URL
     parallelism: 2
     upgradeMode: savepoint
     entryClass: org.apache.flink.streaming.examples.statemachine.StateMachineExample

diff --git a/e2e-tests/data/sessionjob-cr.yaml b/e2e-tests/data/sessionjob-cr.yaml
@@ -22,16 +22,16 @@ metadata:
   namespace: default
   name: session-cluster-1
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   ingress:
     template: "/{{namespace}}/{{name}}(/|$)(.*)"
     className: "nginx"
     annotations:
       nginx.ingress.kubernetes.io/rewrite-target: "/$2"
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
-    high-availability: org.apache.flink.kubernetes.highavailability.KubernetesHaServicesFactory
+    high-availability.type: kubernetes
     high-availability.storageDir: file:///opt/flink/volume/flink-ha
     state.checkpoints.dir: file:///opt/flink/volume/flink-cp
     state.savepoints.dir: file:///opt/flink/volume/flink-sp
@@ -73,7 +73,7 @@ metadata:
 spec:
   deploymentName: session-cluster-1
   job:
-    jarURI: https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming_2.12/1.14.4/flink-examples-streaming_2.12-1.14.4.jar
+    jarURI: STREAMING_EXAMPLES_JAR_URL
     parallelism: 2
     upgradeMode: savepoint
     entryClass: org.apache.flink.streaming.examples.statemachine.StateMachineExample

diff --git a/e2e-tests/utils.sh b/e2e-tests/utils.sh
@@ -231,8 +231,14 @@ function delete_operator_pod_with_leadership() {
 function debug_and_show_logs {
     echo "Debugging failed e2e test:"
     echo "Currently existing Kubernetes resources"
+    kubectl get flinkdeployments
+    kubectl get flinksessionjobs
     kubectl get all
+    kubectl get configmaps
+    kubectl describe flinkdeployments
+    kubectl describe flinksessionjobs
     kubectl describe all
+    kubectl describe configmaps
 
     operator_pod_namespace=$(get_operator_pod_namespace)
     operator_pod_names=$(get_operator_pod_name)

diff --git a/examples/advanced-ingress.yaml b/examples/advanced-ingress.yaml
@@ -21,8 +21,8 @@ kind: FlinkDeployment
 metadata:
   name: advanced-ingress
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   ingress:
     template: "/{{namespace}}/{{name}}(/|$)(.*)"
     className: "nginx"

diff --git a/examples/autoscaling/autoscaling-dynamic.yaml b/examples/autoscaling/autoscaling-dynamic.yaml
@@ -22,7 +22,7 @@ metadata:
   name: autoscaling-dynamic
 spec:
   image: autoscaling-example
-  flinkVersion: v1_18
+  flinkVersion: v1_20
   flinkConfiguration:
     job.autoscaler.enabled: "true"
     job.autoscaler.stabilization.interval: "1m"

diff --git a/examples/autoscaling/autoscaling.yaml b/examples/autoscaling/autoscaling.yaml
@@ -22,7 +22,7 @@ metadata:
   name: autoscaling-example
 spec:
   image: autoscaling-example
-  flinkVersion: v1_18
+  flinkVersion: v1_20
   flinkConfiguration:
     job.autoscaler.enabled: "true"
     job.autoscaler.stabilization.interval: "1m"

diff --git a/examples/basic-checkpoint-ha.yaml b/examples/basic-checkpoint-ha.yaml
@@ -21,8 +21,8 @@ kind: FlinkDeployment
 metadata:
   name: basic-checkpoint-ha-example
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
     state.savepoints.dir: file:///flink-data/savepoints

diff --git a/examples/basic-ingress.yaml b/examples/basic-ingress.yaml
@@ -21,8 +21,8 @@ kind: FlinkDeployment
 metadata:
   name: basic-ingress
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   ingress:
     template: "{{name}}.{{namespace}}.flink.k8s.io"
   flinkConfiguration:

diff --git a/examples/basic-reactive.yaml b/examples/basic-reactive.yaml
@@ -21,8 +21,8 @@ kind: FlinkDeployment
 metadata:
   name: basic-reactive-example
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   flinkConfiguration:
     scheduler-mode: REACTIVE
     taskmanager.numberOfTaskSlots: "2"

diff --git a/examples/basic-session-deployment-and-job.yaml b/examples/basic-session-deployment-and-job.yaml
@@ -21,8 +21,8 @@ kind: FlinkDeployment
 metadata:
   name: basic-session-deployment-example
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   jobManager:
     resource:
       memory: "2048m"

diff --git a/examples/basic-session-deployment-only.yaml b/examples/basic-session-deployment-only.yaml
@@ -21,8 +21,8 @@ kind: FlinkDeployment
 metadata:
   name: basic-session-deployment-only-example
 spec:
-  image: flink:1.17
-  flinkVersion: v1_17
+  image: flink:1.20
+  flinkVersion: v1_20
   flinkConfiguration:
     taskmanager.numberOfTaskSlots: "2"
   serviceAccount: flink