Merge branch 'apache:main' into main

Author: wangyang377

.asf.yaml

@@ -21,6 +21,8 @@ github:
     release-1.8: {}
     release-1.9: {}
     release-1.10: {}
+    release-1.11: {}
+    release-1.12: {}
 
 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:
@@ -37,7 +37,7 @@ jobs:
     name: maven build
     strategy:
       matrix:
-        java-version: [ 11, 17, 21 ]
+        java-version: [ 17, 21 ]
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java-version }}
@@ -76,7 +76,7 @@ jobs:
     strategy:
       matrix:
         http-client: [ "okhttp", "jdk", "jetty", "vertx" ]
-        java-version: [ "11", "17", "21" ]
+        java-version: [ "17", "21" ]
     uses: ./.github/workflows/e2e.yaml
     with:
       java-version: ${{ matrix.java-version }}
@@ -89,11 +89,12 @@ jobs:
     strategy:
       matrix:
         http-client: [ "okhttp" ]
-        java-version: [ "11", "17"]
+        java-version: [ "17"]
         flink-version:
+          - "v2_1"
+          - "v2_0"
           - "v1_20"
           - "v1_19"
-          - "v1_18"
     uses: ./.github/workflows/e2e.yaml
     with:
       java-version: ${{ matrix.java-version }}
@@ -107,11 +108,10 @@ jobs:
     strategy:
       matrix:
         flink-version:
+          - "v2_1"
+          - "v2_0"
           - "v1_20"
           - "v1_19"
-          - "v1_18"
-          - "v1_17"
-          - "v1_16"
         mode:
          - "native"
          - "standalone"
@@ -120,19 +120,18 @@ jobs:
           - test_multi_sessionjob.sh
           - test_autoscaler.sh
           - test_dynamic_config.sh
+          - test_dynamic_flink_conf.sh
         exclude:
           - mode: standalone
             test: test_autoscaler.sh
           - mode: standalone
             test: test_dynamic_config.sh
-          - flink-version: v1_16
-            test: test_autoscaler.sh
-          - flink-version: v1_16
-            test: test_dynamic_config.sh
+          - mode: standalone
+            test: test_dynamic_flink_conf.sh
 
     uses: ./.github/workflows/e2e.yaml
     with:
-      java-version: 11
+      java-version: 17
       flink-version: ${{ matrix.flink-version }}
       test: ${{ matrix.test }}
       namespace: "flink"
@@ -143,51 +142,32 @@ jobs:
     strategy:
       matrix:
         flink-version:
+          - "v2_1"
+          - "v2_0"
           - "v1_20"
-          - "v1_18"
           - "v1_19"
-          - "v1_17"
-          - "v1_16"
         mode:
           - "native"
           - "standalone"
         test:
           - test_application_kubernetes_ha.sh
           - test_application_operations.sh
           - test_dynamic_config.sh
+          - test_dynamic_flink_conf.sh
           - test_sessionjob_kubernetes_ha.sh
           - test_sessionjob_operations.sh
           - test_autoscaler.sh
           - test_flink_operator_ha.sh
           - test_snapshot.sh
+          - test_batch_job.sh
         exclude:
-          - flink-version: v1_16
-            test: test_autoscaler.sh
           - mode: standalone
             test: test_autoscaler.sh
-          - flink-version: v1_16
-            test: test_dynamic_config.sh
-          - flink-version: v1_16
-            test: test_flink_operator_ha.sh
-          - flink-version: v1_16
-            test: test_snapshot.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_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_19
             test: test_snapshot.sh
     uses: ./.github/workflows/e2e.yaml
     with:
-      java-version: 11
+      java-version: 17
       flink-version: ${{ matrix.flink-version }}
       test: ${{ matrix.test }}
       mode: ${{ matrix.mode }}

.github/workflows/docker_push.yml

@@ -42,10 +42,10 @@ 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
+      - name: Set up Docker Build
         uses: docker/setup-buildx-action@v3
 
       - name: Log in to the Container registry

.github/workflows/docs.yaml

@@ -28,8 +28,8 @@ jobs:
       matrix:
         branch:
           - main
-          - release-1.9
-          - release-1.10
+          - release-1.11
+          - release-1.12
     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.13" >> ${GITHUB_ENV}
+          elif [ "${currentBranch}" = "release-1.12" ]; then
             echo "flink_alias=stable" >> ${GITHUB_ENV}
           else
             echo "flink_alias=${currentBranch}" >> ${GITHUB_ENV}

.github/workflows/e2e.yaml

@@ -75,6 +75,9 @@ jobs:
            sed -i "s/# kubernetes.operator.leader-election.lease-name: flink-operator-lease/kubernetes.operator.leader-election.lease-name: flink-operator-lease/" helm/flink-kubernetes-operator/conf/flink-conf.yaml
            sed -i "s/replicas: 1/replicas: 2/" helm/flink-kubernetes-operator/values.yaml
           fi
+          if [[ "${{ inputs.test }}" == "test_dynamic_config.sh" ]]; then          
+           sed -i "s/flink-conf.yaml: |+/config.yaml: |+/" helm/flink-kubernetes-operator/values.yaml
+          fi
           helm --debug install flink-kubernetes-operator -n ${{ inputs.namespace }} helm/flink-kubernetes-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-latest ${{ steps.namespace-creator.outputs.EXTRA_HELM_INSTALL_ARGS }} 
           kubectl wait --for=condition=Available --timeout=120s -n ${{ inputs.namespace }} deploy/flink-kubernetes-operator
           kubectl get pods -n ${{ inputs.namespace }}
@@ -84,10 +87,21 @@ 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.0/flink-examples-streaming-2.0.0.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

.github/workflows/publish_snapshot.yml

@@ -28,16 +28,16 @@ jobs:
     if: github.repository == 'apache/flink-kubernetes-operator'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: main
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          java-version: '17'
+          distribution: 'temurin'
       - name: Cache local Maven repository
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: snapshot-maven-${{ hashFiles('**/pom.xml') }}

.gitignore

@@ -36,3 +36,8 @@ buildNumber.properties
 .idea
 *.iml
 *.DS_Store
+
+.kube
+
+# VSCode settings
+.vscode/

Dockerfile

@@ -16,7 +16,7 @@
 # limitations under the License.
 ################################################################################
 # Build
-ARG JAVA_VERSION=11
+ARG JAVA_VERSION=17
 FROM maven:3.8.8-eclipse-temurin-${JAVA_VERSION} AS build
 ARG SKIP_TESTS=true
 ARG HTTP_CLIENT=okhttp
@@ -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.13-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

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.13-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.13-SNAPSHOT"
 
   # The branch for this version of the Apache Flink Kubernetes Operator
   Branch = "main"
@@ -63,8 +63,8 @@ pygmentsUseClasses = true
   ]
 
   PreviousDocs = [
-    ["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"],
+    ["1.12", "https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-release-1.12"],
+    ["1.11", "https://nightlies.apache.org/flink/flink-kubernetes-operator-docs-release-1.11"],
   ]
 
 [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
@@ -246,13 +246,13 @@ Flink cluster, includes:
 
 You can start a Flink Streaming job with the following ConfigOptions.
 
-```
-# Enable Adaptvie scheduler to play the in-place rescaling.
+```yaml
+# Enable Adaptive scheduler to play the in-place rescaling.
 jobmanager.scheduler : adaptive
 
 # Enable autoscale and scaling
-job.autoscaler.enabled : true
-job.autoscaler.scaling.enabled : true
+job.autoscaler.enabled : "true"
+job.autoscaler.scaling.enabled : "true"
 job.autoscaler.stabilization.interval : 1m
 job.autoscaler.metrics.window : 3m
 ```