Updating the B/G e2e tests

Author: schongloo

e2e-tests/data/bluegreen-laststate.yaml

@@ -19,7 +19,7 @@
 apiVersion: flink.apache.org/v1beta1
 kind: FlinkBlueGreenDeployment
 metadata:
-  name: basic-bluegreen-example
+  name: basic-bg-laststate-example
 spec:
   configuration:
     kubernetes.operator.bluegreen.deployment-deletion.delay: "1s"
@@ -32,8 +32,8 @@ spec:
         execution.checkpointing.interval: "10s"
         execution.checkpointing.storage: "filesystem"
         state.backend.incremental: "true"
-        state.checkpoints.dir: "file:///flink-data/checkpoints"
-        state.savepoints.dir: "file:///flink-data/savepoints"
+        state.checkpoints.dir: file:///opt/flink/volume/flink-cp
+        state.savepoints.dir: file:///opt/flink/volume/flink-sp
         state.checkpoints.num-retained: "5"
         taskmanager.numberOfTaskSlots: "1"
       serviceAccount: flink
@@ -45,22 +45,18 @@ spec:
           spec:
             containers:
               - name: flink-main-container
+                resources:
+                  requests:
+                    ephemeral-storage: 2048Mi
+                  limits:
+                    ephemeral-storage: 2048Mi
                 volumeMounts:
-                  - mountPath: /flink-data/checkpoints
-                    name: checkpoint-volume
-                  - mountPath: /flink-data/savepoints
-                    name: savepoint-volume
+                  - mountPath: /opt/flink/volume
+                    name: flink-volume
             volumes:
-              - name: checkpoint-volume
-                hostPath:
-                  # directory location on host
-                  path: /tmp/flink/checkpoints
-                  type: Directory
-              - name: savepoint-volume
-                hostPath:
-                  # directory location on host
-                  path: /tmp/flink/savepoints
-                  type: Directory
+              - name: flink-volume
+                persistentVolumeClaim:
+                  claimName: flink-bg-laststate
       taskManager:
         resource:
           memory: 2G
@@ -75,3 +71,29 @@ spec:
           - "--sleep"
           - "30"
         upgradeMode: last-state
+      mode: native
+
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: flink-bg-laststate
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 1Gi
+
+---
+apiVersion: networking.k8s.io/v1
+kind: IngressClass
+metadata:
+  annotations:
+    ingressclass.kubernetes.io/is-default-class: "true"
+  labels:
+    app.kubernetes.io/component: controller
+  name: nginx
+spec:
+  controller: k8s.io/ingress-nginx

e2e-tests/data/bluegreen-stateless.yaml

@@ -19,7 +19,7 @@
 apiVersion: flink.apache.org/v1beta1
 kind: FlinkBlueGreenDeployment
 metadata:
-  name: basic-bluegreen-example
+  name: basic-bg-stateless-example
 spec:
   configuration:
     kubernetes.operator.bluegreen.deployment-deletion.delay: "2s"
@@ -49,3 +49,4 @@ spec:
           - "--sleep"
           - "30"
         upgradeMode: stateless
+      mode: native

e2e-tests/test_bluegreen_laststate.sh

@@ -26,10 +26,10 @@
 SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
 source "${SCRIPT_DIR}/utils.sh"
 
-CLUSTER_ID="basic-bluegreen-example"
+CLUSTER_ID="basic-bg-laststate-example"
 BG_CLUSTER_ID=$CLUSTER_ID
-BLUE_CLUSTER_ID="basic-bluegreen-example-blue"
-GREEN_CLUSTER_ID="basic-bluegreen-example-green"
+BLUE_CLUSTER_ID=$CLUSTER_ID"-blue"
+GREEN_CLUSTER_ID=$CLUSTER_ID"-green"
 
 APPLICATION_YAML="${SCRIPT_DIR}/data/bluegreen-laststate.yaml"
 APPLICATION_IDENTIFIER="flinkbgdep/$CLUSTER_ID"
@@ -63,16 +63,16 @@ wait_for_status $APPLICATION_IDENTIFIER '.status.blueGreenState' ACTIVE_GREEN ${
 
 green_initialSavepointPath=$(kubectl get -oyaml $GREEN_APPLICATION_IDENTIFIER | yq '.spec.job.initialSavepointPath')
 
-if [[ $green_initialSavepointPath == '/flink-data/savepoints/savepoint-'* ]]; then
+echo "Deleting test B/G resources" $BG_CLUSTER_ID
+kubectl delete flinkbluegreendeployments/$BG_CLUSTER_ID &
+echo "Waiting for deployment to be deleted..."
+kubectl wait --for=delete flinkbluegreendeployments/$BG_CLUSTER_ID
+
+if [[ $green_initialSavepointPath == '/opt/flink/volume/flink-sp/savepoint-'* ]]; then
   echo 'Green deployment started from the expected initialSavepointPath: ' $green_initialSavepointPath
 else
-  echo 'Unexpected initialSavepointPath: ' $green_initialSavepointPath
+  echo 'Unexpected initialSavepointPath:' $green_initialSavepointPath
   exit 1
 fi;
 
-echo "Deleting test B/G resources " $BG_CLUSTER_ID
-kubectl delete flinkbluegreendeployments/$BG_CLUSTER_ID &
-echo "Waiting for deployment to be deleted..."
-kubectl wait --for=delete flinkbluegreendeployments/$BG_CLUSTER_ID
-
 echo "Successfully run the Flink Blue/Green Deployments test"

e2e-tests/test_bluegreen_stateless.sh

@@ -26,10 +26,10 @@
 SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
 source "${SCRIPT_DIR}/utils.sh"
 
-CLUSTER_ID="basic-bluegreen-example"
+CLUSTER_ID="basic-bg-stateless-example"
 BG_CLUSTER_ID=$CLUSTER_ID
-BLUE_CLUSTER_ID="basic-bluegreen-example-blue"
-GREEN_CLUSTER_ID="basic-bluegreen-example-green"
+BLUE_CLUSTER_ID=$CLUSTER_ID"-blue"
+GREEN_CLUSTER_ID=$CLUSTER_ID"-green"
 
 APPLICATION_YAML="${SCRIPT_DIR}/data/bluegreen-stateless.yaml"
 APPLICATION_IDENTIFIER="flinkbgdep/$CLUSTER_ID"
@@ -53,7 +53,7 @@ kubectl wait --for=delete deployment --timeout=${TIMEOUT}s --selector="app=${BLU
 wait_for_status $APPLICATION_IDENTIFIER '.status.jobStatus.state' RUNNING ${TIMEOUT} || exit 1
 wait_for_status $APPLICATION_IDENTIFIER '.status.blueGreenState' ACTIVE_GREEN ${TIMEOUT} || exit 1
 
-echo "Deleting test B/G resources " $BG_CLUSTER_ID
+echo "Deleting test B/G resources" $BG_CLUSTER_ID
 kubectl delete flinkbluegreendeployments/$BG_CLUSTER_ID &
 echo "Waiting for deployment to be deleted..."
 kubectl wait --for=delete flinkbluegreendeployments/$BG_CLUSTER_ID