Auto-generated: Update kuttl e2e test files

.github/workflows/kuttl-e2e-test-1.21.yaml

@@ -35,9 +35,20 @@ jobs:
           sudo chmod +x kubectl-storageos
           sudo mv kubectl-storageos $KUBECTL_STORAGEOS
 
+      - name: Install Kind
+        run: |
+          sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
+          sudo chmod +x kind
+
+      - name: Start kind
+        run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.21.yaml
+
+      - name: Load operator image
+        run: kind load docker-image storageos/portal-manager:develop
+
       - name: Install kuttl
         run: |
-          sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
+          sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
           sudo chmod +x $KUTTL
 
       - name: Run kuttl

.github/workflows/kuttl-e2e-test-1.22.yaml

@@ -35,9 +35,20 @@ jobs:
           sudo chmod +x kubectl-storageos
           sudo mv kubectl-storageos $KUBECTL_STORAGEOS
 
+      - name: Install Kind
+        run: |
+          sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
+          sudo chmod +x kind
+
+      - name: Start kind
+        run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.22.yaml
+
+      - name: Load operator image
+        run: kind load docker-image storageos/portal-manager:develop
+
       - name: Install kuttl
         run: |
-          sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
+          sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
           sudo chmod +x $KUTTL
 
       - name: Run kuttl

.github/workflows/kuttl-e2e-test-1.23.yaml

@@ -35,9 +35,20 @@ jobs:
           sudo chmod +x kubectl-storageos
           sudo mv kubectl-storageos $KUBECTL_STORAGEOS
 
+      - name: Install Kind
+        run: |
+          sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
+          sudo chmod +x kind
+
+      - name: Start kind
+        run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.23.yaml
+
+      - name: Load operator image
+        run: kind load docker-image storageos/portal-manager:develop
+
       - name: Install kuttl
         run: |
-          sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
+          sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
           sudo chmod +x $KUTTL
 
       - name: Run kuttl

.github/workflows/kuttl-e2e-test-1.24.yaml

@@ -9,7 +9,6 @@ jobs:
     env:
       KUTTL: /usr/local/bin/kubectl-kuttl
       KUBECTL_STORAGEOS: /usr/local/bin/kubectl-storageos
-      KIND: /usr/local/bin/kind
       PLUGIN_PATH: ./kubectl-storageos
       OPERATOR_IMAGE: storageos/portal-manager:develop
     steps:
@@ -36,19 +35,22 @@ jobs:
           sudo chmod +x kubectl-storageos
           sudo mv kubectl-storageos $KUBECTL_STORAGEOS
 
-      - name: Install kind
+      - name: Install Kind
         run: |
-          sudo curl -Lo $KIND https://kind.sigs.k8s.io/dl/v0.14.0/kind-linux-amd64
-          sudo chmod +x $KIND
+          sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
+          sudo chmod +x kind
+
+      - name: Start kind
+        run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.24.yaml
+
+      - name: Load operator image
+        run: kind load docker-image storageos/portal-manager:develop
 
       - name: Install kuttl
         run: |
-          sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
+          sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
           sudo chmod +x $KUTTL
 
-      - name: Run kind
-        run: kind create cluster --image=storageos/kind-node:v1.24.2
-
       - name: Run kuttl
         run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.24.yaml
         env:

.github/workflows/kuttl-e2e-test-1.20.yaml → .github/workflows/kuttl-e2e-test-1.25.yaml

@@ -1,10 +1,10 @@
-name: e2e test 1.20
+name: e2e test 1.25
 
 on: [push, pull_request]
 
 jobs:
   test:
-    name: e2e test 1.20
+    name: e2e test 1.25
     runs-on: ubuntu-18.04
     env:
       KUTTL: /usr/local/bin/kubectl-kuttl
@@ -35,13 +35,24 @@ jobs:
           sudo chmod +x kubectl-storageos
           sudo mv kubectl-storageos $KUBECTL_STORAGEOS
 
+      - name: Install Kind
+        run: |
+          sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
+          sudo chmod +x kind
+
+      - name: Start kind
+        run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.25.yaml
+
+      - name: Load operator image
+        run: kind load docker-image storageos/portal-manager:develop
+
       - name: Install kuttl
         run: |
-          sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
+          sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
           sudo chmod +x $KUTTL
 
       - name: Run kuttl
-        run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.20.yaml
+        run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.25.yaml
         env:
           TENANT_ID: ${{ secrets.TENANT_ID }}
           URL: ${{ secrets.URL }}

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.20.5,1.21.0,1.22.3,1.23.0,1.24.2
+TEST_KIND_NODES ?= 1.21.0,1.22.3,1.23.0,1.24.2,1.25.0
 REPO ?= portal-manager
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)

e2e/kind/kind-config-1.21.yaml

@@ -1,5 +1,5 @@
 kind: Cluster
-apiVersion: kind.sigs.k8s.io/v1alpha4
+apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
   image: storageos/kind-node:v1.21.0

e2e/kind/kind-config-1.22.yaml

@@ -1,5 +1,5 @@
 kind: Cluster
-apiVersion: kind.sigs.k8s.io/v1alpha4
+apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
   image: storageos/kind-node:v1.22.3

e2e/kind/kind-config-1.23.yaml

@@ -1,5 +1,5 @@
 kind: Cluster
-apiVersion: kind.sigs.k8s.io/v1alpha4
+apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
   image: storageos/kind-node:v1.23.0

e2e/kind/kind-config-1.24.yaml

@@ -1,5 +1,5 @@
 kind: Cluster
-apiVersion: kind.sigs.k8s.io/v1alpha4
+apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
   image: storageos/kind-node:v1.24.2

e2e/kind/kind-config-1.25.yaml

@@ -0,0 +1,5 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+- role: control-plane
+  image: storageos/kind-node:v1.25.0

e2e/kuttl/portal-manager-1.21.yaml

@@ -3,7 +3,7 @@ kind: TestSuite
 testDirs:
 - ./e2e/tests/stable
 kindConfig: e2e/kind/kind-config-1.21.yaml
-startKIND: true
+startKIND: false
 kindContainers:
   - storageos/portal-manager:develop
 timeout: 600

e2e/kuttl/portal-manager-1.22.yaml

@@ -3,7 +3,7 @@ kind: TestSuite
 testDirs:
 - ./e2e/tests/stable
 kindConfig: e2e/kind/kind-config-1.22.yaml
-startKIND: true
+startKIND: false
 kindContainers:
   - storageos/portal-manager:develop
 timeout: 600

e2e/kuttl/portal-manager-1.23.yaml

@@ -3,7 +3,7 @@ kind: TestSuite
 testDirs:
 - ./e2e/tests/stable
 kindConfig: e2e/kind/kind-config-1.23.yaml
-startKIND: true
+startKIND: false
 kindContainers:
   - storageos/portal-manager:develop
 timeout: 600

e2e/kuttl/portal-manager-1.24.yaml

@@ -2,6 +2,8 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestSuite
 testDirs:
 - ./e2e/tests/stable
+kindConfig: e2e/kind/kind-config-1.24.yaml
+startKIND: false
 kindContainers:
   - storageos/portal-manager:develop
 timeout: 600

e2e/kuttl/portal-manager-1.20.yaml → e2e/kuttl/portal-manager-1.25.yaml

@@ -2,8 +2,8 @@ apiVersion: kuttl.dev/v1beta1
 kind: TestSuite
 testDirs:
 - ./e2e/tests/stable
-kindConfig: e2e/kind/kind-config-1.20.yaml
-startKIND: true
+kindConfig: e2e/kind/kind-config-1.25.yaml
+startKIND: false
 kindContainers:
   - storageos/portal-manager:develop
 timeout: 600

hack/generate-tests.sh

@@ -27,7 +27,7 @@ do
 
 	cat <<EOF > "${file}"
 kind: Cluster
-apiVersion: kind.sigs.k8s.io/v1alpha4
+apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
   image: storageos/kind-node:v${kind_node}
@@ -44,7 +44,7 @@ kind: TestSuite
 testDirs:
 - ./e2e/tests/stable
 kindConfig: e2e/kind/kind-config-${major}.yaml
-startKIND: true
+startKIND: false
 kindContainers:
   - storageos/portal-manager:develop
 timeout: 600
@@ -93,9 +93,20 @@ jobs:
           sudo chmod +x kubectl-storageos
           sudo mv kubectl-storageos \$KUBECTL_STORAGEOS
 
+      - name: Install Kind
+        run: |
+          sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
+          sudo chmod +x kind
+
+      - name: Start kind
+        run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-${major}.yaml
+
+      - name: Load operator image
+        run: kind load docker-image storageos/portal-manager:develop 
+
       - name: Install kuttl
         run: |
-          sudo curl -Lo \$KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
+          sudo curl -Lo \$KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
           sudo chmod +x \$KUTTL
 
       - name: Run kuttl