From 3a55c111ce5a71b3b628941ee5f39d0f4ef09901 Mon Sep 17 00:00:00 2001
From: nolancon <nolancon@users.noreply.github.com>
Date: Mon, 19 Dec 2022 12:17:47 +0000
Subject: [PATCH 1/2] Generated test files for new kind node image and removed
 test files for oldest kind node image.

---
 ...{kuttl-e2e-test-1.21.yaml => kuttl-e2e-test-1.26.yaml} | 8 ++++----
 Makefile                                                  | 2 +-
 e2e/kind/{kind-config-1.21.yaml => kind-config-1.26.yaml} | 2 +-
 ...{portal-manager-1.21.yaml => portal-manager-1.26.yaml} | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename .github/workflows/{kuttl-e2e-test-1.21.yaml => kuttl-e2e-test-1.26.yaml} (96%)
 rename e2e/kind/{kind-config-1.21.yaml => kind-config-1.26.yaml} (67%)
 rename e2e/kuttl/{portal-manager-1.21.yaml => portal-manager-1.26.yaml} (78%)

diff --git a/.github/workflows/kuttl-e2e-test-1.21.yaml b/.github/workflows/kuttl-e2e-test-1.26.yaml
similarity index 96%
rename from .github/workflows/kuttl-e2e-test-1.21.yaml
rename to .github/workflows/kuttl-e2e-test-1.26.yaml
index 875ed372..33ed2a21 100644
--- a/.github/workflows/kuttl-e2e-test-1.21.yaml
+++ b/.github/workflows/kuttl-e2e-test-1.26.yaml
@@ -1,10 +1,10 @@
-name: e2e test 1.21
+name: e2e test 1.26
 
 on: [push, pull_request]
 
 jobs:
   test:
-    name: e2e test 1.21
+    name: e2e test 1.26
     runs-on: ubuntu-latest
     env:
       KUTTL: /usr/local/bin/kubectl-kuttl
@@ -41,7 +41,7 @@ jobs:
           sudo chmod +x kind
 
       - name: Start kind
-        run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.21.yaml
+        run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.26.yaml
 
       - name: Load operator image
         run: kind load docker-image storageos/portal-manager:develop 
@@ -52,7 +52,7 @@ jobs:
           sudo chmod +x $KUTTL
 
       - name: Run kuttl
-        run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.21.yaml
+        run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.26.yaml
         env:
           TENANT_ID: ${{ secrets.TENANT_ID }}
           URL: ${{ secrets.URL }}
diff --git a/Makefile b/Makefile
index 709e513e..477445b5 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ MANIFESTS_IMAGE ?= storageos/portal-manager-manifests:test
 # Generate kuttl e2e tests for the following storageos/kind-node versions
 # TEST_KIND_NODES is not intended to be updated manually.
 # Please run 'LATEST_KIND_NODE=<latest-kind-node> make update-kind-nodes'.
-TEST_KIND_NODES ?= 1.21.0,1.22.3,1.23.0,1.24.2,1.25.0
+TEST_KIND_NODES ?= 1.22.3,1.23.0,1.24.2,1.25.0,1.26.0
 REPO ?= portal-manager
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
diff --git a/e2e/kind/kind-config-1.21.yaml b/e2e/kind/kind-config-1.26.yaml
similarity index 67%
rename from e2e/kind/kind-config-1.21.yaml
rename to e2e/kind/kind-config-1.26.yaml
index 8d960aa3..8bf5ea49 100644
--- a/e2e/kind/kind-config-1.21.yaml
+++ b/e2e/kind/kind-config-1.26.yaml
@@ -2,4 +2,4 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: storageos/kind-node:v1.21.0
+  image: storageos/kind-node:v1.26.0
diff --git a/e2e/kuttl/portal-manager-1.21.yaml b/e2e/kuttl/portal-manager-1.26.yaml
similarity index 78%
rename from e2e/kuttl/portal-manager-1.21.yaml
rename to e2e/kuttl/portal-manager-1.26.yaml
index 44770bad..e45accda 100644
--- a/e2e/kuttl/portal-manager-1.21.yaml
+++ b/e2e/kuttl/portal-manager-1.26.yaml
@@ -2,7 +2,7 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestSuite
 testDirs:
 - ./e2e/tests/stable
-kindConfig: e2e/kind/kind-config-1.21.yaml
+kindConfig: e2e/kind/kind-config-1.26.yaml
 startKIND: false
 kindContainers:
   - storageos/portal-manager:develop

From 99f226909d8f513378de8dae8911ae8408ffd1e3 Mon Sep 17 00:00:00 2001
From: nolancon <conor.nolan@ondat.io>
Date: Mon, 19 Dec 2022 13:00:49 +0000
Subject: [PATCH 2/2] Add CLI to test asertion

---
 e2e/tests/stable/portal/00-assert.yaml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/e2e/tests/stable/portal/00-assert.yaml b/e2e/tests/stable/portal/00-assert.yaml
index 22613c60..ff6dc5ec 100644
--- a/e2e/tests/stable/portal/00-assert.yaml
+++ b/e2e/tests/stable/portal/00-assert.yaml
@@ -130,6 +130,17 @@ status:
 ---
 apiVersion: apps/v1
 kind: Deployment
+metadata:
+  name: storageos-cli
+  namespace: storageos
+  labels:
+    app: storageos
+    app.kubernetes.io/component: storageos-cli
+status:
+  readyReplicas: 1
+---
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: storageos-scheduler
   namespace: storageos
@@ -206,6 +217,10 @@ status:
     reason: Ready
     status: "True"
     type: CSIReady
+  - message: CLI Ready
+    reason: Ready
+    status: "True"
+    type: CLIReady
   - message: Cluster Ready
     reason: Ready
     status: "True"