Merge branch 'main' into support-config-yaml

Author: ctrlaltdilj

.asf.yaml

@@ -21,6 +21,7 @@ github:
     release-1.8: {}
     release-1.9: {}
     release-1.10: {}
+    release-1.11: {}
 
 notifications:
   commits:      [email protected]

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ on:
       - release-*
   pull_request:
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
+  group: ${{ github.workflow }}-${{ github.ref_name }}
   cancel-in-progress: true
 
 jobs:
@@ -83,17 +83,36 @@ jobs:
       flink-version: "v1_20"
       http-client: ${{ matrix.http-client }}
       test: test_application_operations.sh
+  java_runtimes:
+    name: Java runtimes smoke test
+    needs: e2e_smoke_test
+    strategy:
+      matrix:
+        http-client: [ "okhttp" ]
+        java-version: [ "11", "17"]
+        flink-version:
+          - "v2_0"
+          - "v1_20"
+          - "v1_19"
+          - "v1_18"
+    uses: ./.github/workflows/e2e.yaml
+    with:
+      java-version: ${{ matrix.java-version }}
+      flink-version: ${{ matrix.flink-version }}
+      http-client: ${{ matrix.http-client }}
+      test: test_application_operations.sh
+      append-java-version: true
   e2e_namespace_tests:
     name: Alternative namespace tests
     needs: e2e_smoke_test
     strategy:
       matrix:
         flink-version:
+          - "v2_0"
           - "v1_20"
-          - "v1_18"
           - "v1_19"
+          - "v1_18"
           - "v1_17"
-          - "v1_16"
         mode:
          - "native"
          - "standalone"
@@ -125,11 +144,11 @@ jobs:
     strategy:
       matrix:
         flink-version:
+          - "v2_0"
           - "v1_20"
           - "v1_18"
           - "v1_19"
           - "v1_17"
-          - "v1_16"
         mode:
           - "native"
           - "standalone"
@@ -142,6 +161,7 @@ jobs:
           - test_autoscaler.sh
           - test_flink_operator_ha.sh
           - test_snapshot.sh
+          - test_batch_job.sh
         exclude:
           - flink-version: v1_16
             test: test_autoscaler.sh
@@ -153,18 +173,24 @@ jobs:
             test: test_flink_operator_ha.sh
           - flink-version: v1_16
             test: test_snapshot.sh
+          - flink-version: v1_16
+            test: test_batch_job.sh
           - flink-version: v1_17
             test: test_dynamic_config.sh
           - flink-version: v1_17
             test: test_flink_operator_ha.sh
           - flink-version: v1_17
             test: test_snapshot.sh
+          - flink-version: v1_17
+            test: test_batch_job.sh
           - flink-version: v1_18
             test: test_dynamic_config.sh
           - flink-version: v1_18
             test: test_flink_operator_ha.sh
           - flink-version: v1_18
             test: test_snapshot.sh
+          - flink-version: v1_18
+            test: test_batch_job.sh
           - flink-version: v1_19
             test: test_snapshot.sh
     uses: ./.github/workflows/e2e.yaml

.github/workflows/docker_push.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
-          image: tonistiigi/binfmt:latest
+          image: tonistiigi/binfmt:qemu-v7.0.0
           platforms: all
 
       - name: Set up Docker Buildx

.github/workflows/docs.yaml

@@ -28,8 +28,8 @@ jobs:
       matrix:
         branch:
           - main
-          - release-1.9
           - release-1.10
+          - release-1.11
     steps:
       - uses: actions/checkout@v3
         with:
@@ -41,8 +41,8 @@ jobs:
           echo "flink_branch=${currentBranch}"
           echo "flink_branch=${currentBranch}" >> ${GITHUB_ENV}
           if [ "${currentBranch}" = "main" ]; then
-            echo "flink_alias=release-1.11" >> ${GITHUB_ENV}
-          elif [ "${currentBranch}" = "release-1.10" ]; then
+            echo "flink_alias=release-1.12" >> ${GITHUB_ENV}
+          elif [ "${currentBranch}" = "release-1.11" ]; then
             echo "flink_alias=stable" >> ${GITHUB_ENV}
           else
             echo "flink_alias=${currentBranch}" >> ${GITHUB_ENV}

.github/workflows/e2e.yaml

@@ -27,6 +27,9 @@ on:
       create-namespace:
         type: boolean
         default: false
+      append-java-version:
+        type: boolean
+        default: false
 
 jobs:
   e2e_test:
@@ -78,10 +81,24 @@ jobs:
       - name: Run Flink e2e tests
         run: |
           FLINK_IMAGE=$(sed --regexp-extended 's/v([0-9]+)_([0-9]+)/flink:\1.\2/g' <<< ${{ inputs.flink-version }} )
+          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"
+          elif [[ "${{ inputs.test }}" == "test_batch_job.sh" ]]; then
+            EXAMPLES_JAR="https://repo1.maven.org/maven2/org/apache/flink/flink-examples-streaming/1.20.1/flink-examples-streaming-1.20.1.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

Dockerfile

@@ -38,7 +38,7 @@ RUN cd /app/tools/license; mkdir jars; cd jars; \
 FROM eclipse-temurin:${JAVA_VERSION}-jre-jammy
 ENV FLINK_HOME=/opt/flink
 ENV FLINK_PLUGINS_DIR=$FLINK_HOME/plugins
-ENV OPERATOR_VERSION=1.11-SNAPSHOT
+ENV OPERATOR_VERSION=1.12-SNAPSHOT
 ENV OPERATOR_JAR=flink-kubernetes-operator-$OPERATOR_VERSION-shaded.jar
 ENV WEBHOOK_JAR=flink-kubernetes-webhook-$OPERATOR_VERSION-shaded.jar
 ENV KUBERNETES_STANDALONE_JAR=flink-kubernetes-standalone-$OPERATOR_VERSION.jar

NOTICE

@@ -1,5 +1,5 @@
 Apache Flink Kubernetes Operator (flink-kubernetes-operator)
-Copyright 2014-2024 The Apache Software Foundation
+Copyright 2014-2025 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

docs/config.toml

@@ -34,11 +34,11 @@ pygmentsUseClasses = true
   # we change the version for the complete docs when forking of a release branch
   # etc.
   # The full version string as referenced in Maven (e.g. 1.2.1)
-  Version = "1.11-SNAPSHOT"
+  Version = "1.12-SNAPSHOT"
 
   # For stable releases, leave the bugfix version out (e.g. 1.2). For snapshot
   # release this should be the same as the regular version
-  VersionTitle = "1.11-SNAPSHOT"
+  VersionTitle = "1.12-SNAPSHOT"
 
   # The branch for this version of the Apache Flink Kubernetes Operator
   Branch = "main"
@@ -63,8 +63,8 @@ pygmentsUseClasses = true
   ]
 
   PreviousDocs = [
+    ["1.11", "https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-release-1.11"],
     ["1.10", "https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-release-1.10"],
-    ["1.9", "https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-release-1.9"],
   ]
 
 [markup]

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

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