Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.

Commit cecf0e4

Browse files
authored
Auto-generated: Update kuttl e2e test files (#73)
* Generated test files for new kind node image and removed test files for oldest kind node image. * Manually deploy kind for 1.24 kuttl test * update kind version * nit Co-authored-by: nolancon <nolancon@users.noreply.github.com>
1 parent 9457293 commit cecf0e4

File tree

10 files changed

+23
-16
lines changed

10 files changed

+23
-16
lines changed

.github/workflows/kuttl-e2e-test-1.19.yaml renamed to .github/workflows/kuttl-e2e-test-1.24.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
name: e2e test 1.19
1+
name: e2e test 1.24
22

33
on: [push, pull_request]
44

55
jobs:
66
test:
7-
name: e2e test 1.19
7+
name: e2e test 1.24
88
runs-on: ubuntu-18.04
99
env:
1010
KUTTL: /usr/local/bin/kubectl-kuttl
1111
KUBECTL_STORAGEOS: /usr/local/bin/kubectl-storageos
12+
KIND: /usr/local/bin/kind
1213
PLUGIN_PATH: ./kubectl-storageos
1314
OPERATOR_IMAGE: storageos/portal-manager:develop
1415
steps:
@@ -35,13 +36,21 @@ jobs:
3536
sudo chmod +x kubectl-storageos
3637
sudo mv kubectl-storageos $KUBECTL_STORAGEOS
3738
39+
- name: Install kind
40+
run: |
41+
sudo curl -Lo $KIND https://kind.sigs.k8s.io/dl/v0.14.0/kind-linux-amd64
42+
sudo chmod +x $KIND
43+
3844
- name: Install kuttl
3945
run: |
4046
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
4147
sudo chmod +x $KUTTL
4248
49+
- name: Run kind
50+
run: kind create cluster --image=storageos/kind-node:v1.24.2
51+
4352
- name: Run kuttl
44-
run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.19.yaml
53+
run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.24.yaml
4554
env:
4655
TENANT_ID: ${{ secrets.TENANT_ID }}
4756
URL: ${{ secrets.URL }}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ MANIFESTS_IMAGE ?= storageos/portal-manager-manifests:test
1414
# Generate kuttl e2e tests for the following storageos/kind-node versions
1515
# TEST_KIND_NODES is not intended to be updated manually.
1616
# Please run 'LATEST_KIND_NODE=<latest-kind-node> make update-kind-nodes'.
17-
TEST_KIND_NODES ?= 1.19.0,1.20.5,1.21.0,1.22.3,1.23.0
17+
TEST_KIND_NODES ?= 1.20.5,1.21.0,1.22.3,1.23.0,1.24.2
1818
REPO ?= portal-manager
1919

2020
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)

e2e/kind/kind-config-1.19.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

e2e/kind/kind-config-1.20.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kind: Cluster
2-
apiVersion: kind.sigs.k8s.io/v1alpha3
2+
apiVersion: kind.sigs.k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
55
image: storageos/kind-node:v1.20.5

e2e/kind/kind-config-1.21.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kind: Cluster
2-
apiVersion: kind.sigs.k8s.io/v1alpha3
2+
apiVersion: kind.sigs.k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
55
image: storageos/kind-node:v1.21.0

e2e/kind/kind-config-1.22.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kind: Cluster
2-
apiVersion: kind.sigs.k8s.io/v1alpha3
2+
apiVersion: kind.sigs.k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
55
image: storageos/kind-node:v1.22.3

e2e/kind/kind-config-1.23.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
kind: Cluster
2-
apiVersion: kind.sigs.k8s.io/v1alpha3
2+
apiVersion: kind.sigs.k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
55
image: storageos/kind-node:v1.23.0

e2e/kind/kind-config-1.24.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
kind: Cluster
2+
apiVersion: kind.sigs.k8s.io/v1alpha4
3+
nodes:
4+
- role: control-plane
5+
image: storageos/kind-node:v1.24.2
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ apiVersion: kuttl.dev/v1beta1
22
kind: TestSuite
33
testDirs:
44
- ./e2e/tests/stable
5-
kindConfig: e2e/kind/kind-config-1.19.yaml
6-
startKIND: true
75
kindContainers:
86
- storageos/portal-manager:develop
97
timeout: 600

hack/generate-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ do
2727

2828
cat <<EOF > "${file}"
2929
kind: Cluster
30-
apiVersion: kind.sigs.k8s.io/v1alpha3
30+
apiVersion: kind.sigs.k8s.io/v1alpha4
3131
nodes:
3232
- role: control-plane
3333
image: storageos/kind-node:v${kind_node}

0 commit comments

Comments
 (0)