From 870329c7b45c6446444fd231f0318c019ae3558d Mon Sep 17 00:00:00 2001 From: Daniel Holbach Date: Mon, 12 Apr 2021 10:57:51 +0200 Subject: [PATCH 1/2] Bounce kubernetes testing versions This update the test matrix to latest set of 3 minor k8s releases Fixes: #347 Co-Authored-By: Jean-Philippe Evrard --- .github/kind-cluster-1.19.yaml | 10 +++++----- .github/kind-cluster-1.20.yaml | 10 +++++----- .../{kind-cluster-1.18.yaml => kind-cluster-1.21.yaml} | 10 +++++----- .github/workflows/on-pr.yaml | 4 ++-- .github/workflows/periodics-daily.yaml | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) rename .github/{kind-cluster-1.18.yaml => kind-cluster-1.21.yaml} (50%) diff --git a/.github/kind-cluster-1.19.yaml b/.github/kind-cluster-1.19.yaml index 958c86d..05fedd2 100644 --- a/.github/kind-cluster-1.19.yaml +++ b/.github/kind-cluster-1.19.yaml @@ -2,12 +2,12 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.19.4 + image: kindest/node:v1.19.7 - role: control-plane - image: kindest/node:v1.19.4 + image: kindest/node:v1.19.7 - role: control-plane - image: kindest/node:v1.19.4 + image: kindest/node:v1.19.7 - role: worker - image: kindest/node:v1.19.4 + image: kindest/node:v1.19.7 - role: worker - image: kindest/node:v1.19.4 + image: kindest/node:v1.19.7 diff --git a/.github/kind-cluster-1.20.yaml b/.github/kind-cluster-1.20.yaml index fb9dd28..cf06c7f 100644 --- a/.github/kind-cluster-1.20.yaml +++ b/.github/kind-cluster-1.20.yaml @@ -2,12 +2,12 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: "kindest/node:v1.20.0" + image: "kindest/node:v1.20.2" - role: control-plane - image: "kindest/node:v1.20.0" + image: "kindest/node:v1.20.2" - role: control-plane - image: "kindest/node:v1.20.0" + image: "kindest/node:v1.20.2" - role: worker - image: "kindest/node:v1.20.0" + image: "kindest/node:v1.20.2" - role: worker - image: "kindest/node:v1.20.0" + image: "kindest/node:v1.20.2" diff --git a/.github/kind-cluster-1.18.yaml b/.github/kind-cluster-1.21.yaml similarity index 50% rename from .github/kind-cluster-1.18.yaml rename to .github/kind-cluster-1.21.yaml index 699f25a..c957bb7 100644 --- a/.github/kind-cluster-1.18.yaml +++ b/.github/kind-cluster-1.21.yaml @@ -2,12 +2,12 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.18.8 + image: kindest/node:v1.21.1 - role: control-plane - image: kindest/node:v1.18.8 + image: kindest/node:v1.21.1 - role: control-plane - image: kindest/node:v1.18.8 + image: kindest/node:v1.21.1 - role: worker - image: kindest/node:v1.18.8 + image: kindest/node:v1.21.1 - role: worker - image: kindest/node:v1.18.8 + image: kindest/node:v1.21.1 diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml index 1c9c8bb..f6758aa 100644 --- a/.github/workflows/on-pr.yaml +++ b/.github/workflows/on-pr.yaml @@ -97,9 +97,9 @@ jobs: fail-fast: false matrix: kubernetes: - - "1.18" - "1.19" - "1.20" + - "1.21" steps: - uses: actions/checkout@v2 - name: Find go version @@ -169,7 +169,7 @@ jobs: fail-fast: false matrix: kubernetes: - - "1.20" + - "1.21" steps: - uses: actions/checkout@v2 - name: Find go version diff --git a/.github/workflows/periodics-daily.yaml b/.github/workflows/periodics-daily.yaml index 6e5daa1..8e9e345 100644 --- a/.github/workflows/periodics-daily.yaml +++ b/.github/workflows/periodics-daily.yaml @@ -74,9 +74,9 @@ jobs: strategy: matrix: kubernetes: - - "1.18" - "1.19" - "1.20" + - "1.21" steps: - uses: actions/checkout@v2 - name: Find go version @@ -132,4 +132,4 @@ jobs: env: DEBUG: true run: | - ./tests/kind/follow-coordinated-reboot.sh \ No newline at end of file + ./tests/kind/follow-coordinated-reboot.sh From 89d1fe497c022ced428db809c68d55ffd121f98c Mon Sep 17 00:00:00 2001 From: Daniel Holbach Date: Mon, 17 May 2021 13:54:49 +0200 Subject: [PATCH 2/2] use latest kind Signed-off-by: Daniel Holbach --- .github/workflows/on-pr-charts.yaml | 4 ++++ .github/workflows/on-pr.yaml | 3 +++ .github/workflows/periodics-daily.yaml | 1 + 3 files changed, 8 insertions(+) diff --git a/.github/workflows/on-pr-charts.yaml b/.github/workflows/on-pr-charts.yaml index 011bbe7..c9a742b 100644 --- a/.github/workflows/on-pr-charts.yaml +++ b/.github/workflows/on-pr-charts.yaml @@ -36,6 +36,8 @@ jobs: - name: Create default kind cluster uses: helm/kind-action@v1.1.0 + with: + version: v0.11.0 if: ${{ matrix.test-action == 'install' }} - name: Run chart tests @@ -52,6 +54,8 @@ jobs: # Default name for helm/kind-action kind clusters is "chart-testing" - name: Create 1 node kind cluster uses: helm/kind-action@v1.1.0 + with: + version: v0.11.0 - name: Deploy kured on default namespace with its helm chart run: | diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml index f6758aa..a901a30 100644 --- a/.github/workflows/on-pr.yaml +++ b/.github/workflows/on-pr.yaml @@ -130,6 +130,7 @@ jobs: uses: helm/kind-action@v1.1.0 with: config: .github/kind-cluster-${{ matrix.kubernetes }}.yaml + version: v0.11.0 - name: Preload previously built images onto kind cluster run: kind load docker-image docker.io/${{ github.repository_owner }}/kured:${{ github.sha }} --name chart-testing @@ -198,6 +199,8 @@ jobs: # Default name for helm/kind-action kind clusters is "chart-testing" - name: Create 1 node kind cluster uses: helm/kind-action@v1.1.0 + with: + version: v0.11.0 - name: Preload previously built images onto kind cluster run: kind load docker-image docker.io/${{ github.repository_owner }}/kured:${{ github.sha }} --name chart-testing diff --git a/.github/workflows/periodics-daily.yaml b/.github/workflows/periodics-daily.yaml index 8e9e345..3636d2f 100644 --- a/.github/workflows/periodics-daily.yaml +++ b/.github/workflows/periodics-daily.yaml @@ -103,6 +103,7 @@ jobs: uses: helm/kind-action@v1.1.0 with: config: .github/kind-cluster-${{ matrix.kubernetes }}.yaml + version: v0.11.0 - name: Deploy kured on default namespace with its helm chart run: |