From eb088bc55162b850b503a980b097bf17ac17f0a4 Mon Sep 17 00:00:00 2001
From: Sam Barker <sbarker@redhat.com>
Date: Thu, 10 Oct 2024 10:23:02 +1300
Subject: [PATCH] [FLINK-36460] Expand the matrix for the smoke test.

The goal is to remove namespace from the main CI run based on https://github.com/apache/flink-kubernetes-operator/pull/881#discussion_r1790257507
---
 .github/workflows/ci.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bff879088c..4cdde37992 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,15 +68,15 @@ jobs:
           mvn -B verify -Dit.skip=false
           cd ..
   e2e_smoke_test:
-    name: HTTP Client smoke test
+    name: Operator smoke test
     runs-on: ubuntu-latest
     strategy:
       matrix:
         http-client: [ "okhttp", "jdk", "jetty", "vertx" ]
         version: ["v1_20"]
         mode: ["native"]
-        namespace: ["default"]
-        java-version: ["21"]
+        namespace: ["default", "flink"]
+        java-version: ["11", "17", "21"]
         test:
           - test_application_operations.sh
     steps:
@@ -107,12 +107,9 @@ jobs:
           docker images
       - name: Start the operator
         run: |
-          if [[ "${{ matrix.test }}" == "test_flink_operator_ha.sh" ]]; then
-            sed -i "s/# kubernetes.operator.leader-election.enabled: false/kubernetes.operator.leader-election.enabled: true/" helm/flink-kubernetes-operator/conf/flink-conf.yaml
-            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
-          helm --debug install flink-kubernetes-operator -n ${{ matrix.namespace }} helm/flink-kubernetes-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-latest ${{ matrix.extraArgs }}
+          source e2e-tests/utils.sh
+          create_namespace flink
+          helm --debug install flink-kubernetes-operator -n ${{ matrix.namespace }} helm/flink-kubernetes-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-latest --create-namespace --set "watchNamespaces={default,flink}"
           kubectl wait --for=condition=Available --timeout=120s -n ${{ matrix.namespace }} deploy/flink-kubernetes-operator
           kubectl get pods -n ${{ matrix.namespace }}
       - name: Run Flink e2e tests
@@ -139,10 +136,9 @@ jobs:
         version: ["v1_20","v1_19","v1_18","v1_17","v1_16"]
         namespace: ["default","flink"]
         mode: ["native", "standalone"]
-        java-version: [ 11, 17, 21 ]
+        java-version: [ 11 ]
         test:
           - test_application_kubernetes_ha.sh
-          - test_application_operations.sh
           - test_dynamic_config.sh
           - test_sessionjob_kubernetes_ha.sh
           - test_sessionjob_operations.sh