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

Commit 3065415

Browse files
nolanconmhmxs
nolancon
and
mhmxs
authored
Auto-generated: Update kuttl e2e test files (#77)
* Generated test files for new kind node image and removed test files for oldest kind node image. * Self manage Kind in e2e tests * Load operator image to Kind * Change Kind API version to the right one Co-authored-by: nolancon <nolancon@users.noreply.github.com> Co-authored-by: Richard Kovacs <kovacsricsi@gmail.com>
1 parent ec8256d commit 3065415

18 files changed

+92
-33
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,20 @@ jobs:
3535
sudo chmod +x kubectl-storageos
3636
sudo mv kubectl-storageos $KUBECTL_STORAGEOS
3737
38+
- name: Install Kind
39+
run: |
40+
sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
41+
sudo chmod +x kind
42+
43+
- name: Start kind
44+
run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.21.yaml
45+
46+
- name: Load operator image
47+
run: kind load docker-image storageos/portal-manager:develop
48+
3849
- name: Install kuttl
3950
run: |
40-
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
51+
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
4152
sudo chmod +x $KUTTL
4253
4354
- name: Run kuttl

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,20 @@ jobs:
3535
sudo chmod +x kubectl-storageos
3636
sudo mv kubectl-storageos $KUBECTL_STORAGEOS
3737
38+
- name: Install Kind
39+
run: |
40+
sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
41+
sudo chmod +x kind
42+
43+
- name: Start kind
44+
run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.22.yaml
45+
46+
- name: Load operator image
47+
run: kind load docker-image storageos/portal-manager:develop
48+
3849
- name: Install kuttl
3950
run: |
40-
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
51+
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
4152
sudo chmod +x $KUTTL
4253
4354
- name: Run kuttl

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,20 @@ jobs:
3535
sudo chmod +x kubectl-storageos
3636
sudo mv kubectl-storageos $KUBECTL_STORAGEOS
3737
38+
- name: Install Kind
39+
run: |
40+
sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
41+
sudo chmod +x kind
42+
43+
- name: Start kind
44+
run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.23.yaml
45+
46+
- name: Load operator image
47+
run: kind load docker-image storageos/portal-manager:develop
48+
3849
- name: Install kuttl
3950
run: |
40-
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
51+
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
4152
sudo chmod +x $KUTTL
4253
4354
- name: Run kuttl

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ jobs:
99
env:
1010
KUTTL: /usr/local/bin/kubectl-kuttl
1111
KUBECTL_STORAGEOS: /usr/local/bin/kubectl-storageos
12-
KIND: /usr/local/bin/kind
1312
PLUGIN_PATH: ./kubectl-storageos
1413
OPERATOR_IMAGE: storageos/portal-manager:develop
1514
steps:
@@ -36,19 +35,22 @@ jobs:
3635
sudo chmod +x kubectl-storageos
3736
sudo mv kubectl-storageos $KUBECTL_STORAGEOS
3837
39-
- name: Install kind
38+
- name: Install Kind
4039
run: |
41-
sudo curl -Lo $KIND https://kind.sigs.k8s.io/dl/v0.14.0/kind-linux-amd64
42-
sudo chmod +x $KIND
40+
sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
41+
sudo chmod +x kind
42+
43+
- name: Start kind
44+
run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.24.yaml
45+
46+
- name: Load operator image
47+
run: kind load docker-image storageos/portal-manager:develop
4348

4449
- name: Install kuttl
4550
run: |
46-
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
51+
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
4752
sudo chmod +x $KUTTL
4853
49-
- name: Run kind
50-
run: kind create cluster --image=storageos/kind-node:v1.24.2
51-
5254
- name: Run kuttl
5355
run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.24.yaml
5456
env:

.github/workflows/kuttl-e2e-test-1.20.yaml renamed to .github/workflows/kuttl-e2e-test-1.25.yaml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: e2e test 1.20
1+
name: e2e test 1.25
22

33
on: [push, pull_request]
44

55
jobs:
66
test:
7-
name: e2e test 1.20
7+
name: e2e test 1.25
88
runs-on: ubuntu-18.04
99
env:
1010
KUTTL: /usr/local/bin/kubectl-kuttl
@@ -35,13 +35,24 @@ jobs:
3535
sudo chmod +x kubectl-storageos
3636
sudo mv kubectl-storageos $KUBECTL_STORAGEOS
3737
38+
- name: Install Kind
39+
run: |
40+
sudo curl -Lo kind https://github.com/kubernetes-sigs/kind/releases/download/v0.15.0/kind-linux-amd64
41+
sudo chmod +x kind
42+
43+
- name: Start kind
44+
run: kind create cluster --retain --wait 2m --config e2e/kind/kind-config-1.25.yaml
45+
46+
- name: Load operator image
47+
run: kind load docker-image storageos/portal-manager:develop
48+
3849
- name: Install kuttl
3950
run: |
40-
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
51+
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.13.0/kubectl-kuttl_0.13.0_linux_x86_64
4152
sudo chmod +x $KUTTL
4253
4354
- name: Run kuttl
44-
run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.20.yaml
55+
run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.25.yaml
4556
env:
4657
TENANT_ID: ${{ secrets.TENANT_ID }}
4758
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.20.5,1.21.0,1.22.3,1.23.0,1.24.2
17+
TEST_KIND_NODES ?= 1.21.0,1.22.3,1.23.0,1.24.2,1.25.0
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.20.yaml‎

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

‎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/v1alpha4
2+
apiVersion: kind.x-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/v1alpha4
2+
apiVersion: kind.x-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/v1alpha4
2+
apiVersion: kind.x-k8s.io/v1alpha4
33
nodes:
44
- role: control-plane
55
image: storageos/kind-node:v1.23.0

0 commit comments

Comments
 (0)