Revert "[FLINK-36332] consistent version usage"

This reverts commit 7f4fb88.

Author: SamBarker

.github/workflows/ci.yml

@@ -77,7 +77,7 @@ jobs:
     strategy:
       matrix:
         http-client: [ "okhttp", "jdk", "jetty", "vertx" ]
-        flink_version: [ { tag: "v1_20", image: "flink:1.20" } ]
+        version: [ "v1_20" ]
         mode: [ "native" ]
         namespace: [ "default" ]
         java-version: [ "11", "17", "21" ]
@@ -116,8 +116,8 @@ jobs:
           kubectl get pods -n ${{ matrix.namespace }}
       - name: Run Flink e2e tests
         run: |
-          sed -i "s/image: flink:.*/image: ${{ matrix.flink_version.image }}/" e2e-tests/data/*.yaml
-          sed -i "s/flinkVersion: .*/flinkVersion: ${{ matrix.flink_version.tag }}/" e2e-tests/data/*.yaml
+          sed -i "s/image: flink:.*/image: ${{ matrix.image }}/" e2e-tests/data/*.yaml
+          sed -i "s/flinkVersion: .*/flinkVersion: ${{ matrix.version }}/" e2e-tests/data/*.yaml
           sed -i "s/mode: .*/mode: ${{ matrix.mode }}/" e2e-tests/data/*.yaml
           git diff HEAD
           echo "Running e2e-tests/$test"
@@ -158,9 +158,9 @@ jobs:
             test: test_dynamic_config.sh
           - flink_version.tag: "v1_17"
             test: test_dynamic_config.sh
-          - flink_version.tag: "v1_16"
+          - flink_version: { tag: "v1_16", image: "flink:1.16" }
             test: test_autoscaler.sh
-          - flink_version.tag: "v1_16"
+          - flink_version: { tag: "v1_16", image: "flink:1.16" }
             test: test_dynamic_config.sh
     steps:
       - uses: actions/checkout@v4
@@ -234,21 +234,21 @@ jobs:
         exclude:
           - mode: standalone
             test: test_snapshot.sh
-          - flink_version.tag: "v1_16"
+          - flink_version: { tag: "v1_16", image: "flink:1.16" }
             test: test_flink_operator_ha.sh
-          - flink_version.tag: "v1_16"
+          - flink_version: { tag: "v1_16", image: "flink:1.16" }
             test: test_snapshot.sh
-          - flink_version.tag: "v1_17"
+          - flink_version: { tag: "v1_17", image: "flink:1.17" }
             test: test_flink_operator_ha.sh
-          - flink_version.tag: "v1_17"
+          - flink_version: { tag: "v1_17", image: "flink:1.17" }
             test: test_snapshot.sh
-          - flink_version.tag: "v1_18"
+          - flink_version: { tag: "v1_18", image: "flink:1.18" }
             test: test_dynamic_config.sh
-          - flink_version.tag: "v1_18"
+          - flink_version: { tag: "v1_18", image: "flink:1.18" }
             test: test_flink_operator_ha.sh
-          - flink_version.tag: "v1_18"
+          - flink_version: { tag: "v1_18", image: "flink:1.18" }
             test: test_snapshot.sh
-          - flink_version.tag: "v1_19"
+          - flink_version: { tag: "v1_19", image: "flink:1.19" }
             test: test_snapshot.sh
     steps:
       - uses: actions/checkout@v4