From abc9b9a6ddb336bb2edaf3b6d0a0bbec6739539f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Fri, 5 Apr 2024 13:36:08 +0200 Subject: [PATCH] Use all supported kind versions in tests (#2814) * Revert "Bump kindest/node from v1.23.17 to v1.29.1 (#2604)" This reverts commit aca7df0bd371b2fb4ed18b8d9bb9def43a978e50. * Stop dependabot from updating minor Kind image versions --- .github/dependabot.yml | 4 ++++ kind-1.23.yaml | 2 +- kind-1.24.yaml | 2 +- kind-1.25.yaml | 2 +- kind-1.26.yaml | 2 +- kind-1.27.yaml | 2 +- kind-1.28.yaml | 2 +- kind-1.29.yaml | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2630cf2af1..eb8aabb598 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -39,6 +39,10 @@ updates: directory: / schedule: interval: weekly + ignore: + # Ignore minor version updates for kind node images + - dependency-name: "kindest/node*" + update-types: [ "version-update:semver-minor" ] - package-ecosystem: docker directory: /cmd/otel-allocator diff --git a/kind-1.23.yaml b/kind-1.23.yaml index fc1adafc28..09a2521d81 100644 --- a/kind-1.23.yaml +++ b/kind-1.23.yaml @@ -2,7 +2,7 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144 + image: kindest/node:v1.23.17@sha256:59c989ff8a517a93127d4a536e7014d28e235fb3529d9fba91b3951d461edfdb kubeadmConfigPatches: - | kind: InitConfiguration diff --git a/kind-1.24.yaml b/kind-1.24.yaml index fc1adafc28..0d76591c1a 100644 --- a/kind-1.24.yaml +++ b/kind-1.24.yaml @@ -2,7 +2,7 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144 + image: kindest/node:v1.24.15@sha256:7db4f8bea3e14b82d12e044e25e34bd53754b7f2b0e9d56df21774e6f66a70ab kubeadmConfigPatches: - | kind: InitConfiguration diff --git a/kind-1.25.yaml b/kind-1.25.yaml index fc1adafc28..340110f545 100644 --- a/kind-1.25.yaml +++ b/kind-1.25.yaml @@ -2,7 +2,7 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144 + image: kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8 kubeadmConfigPatches: - | kind: InitConfiguration diff --git a/kind-1.26.yaml b/kind-1.26.yaml index fc1adafc28..5a7ae790d4 100644 --- a/kind-1.26.yaml +++ b/kind-1.26.yaml @@ -2,7 +2,7 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144 + image: kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb kubeadmConfigPatches: - | kind: InitConfiguration diff --git a/kind-1.27.yaml b/kind-1.27.yaml index fc1adafc28..53b8f092b3 100644 --- a/kind-1.27.yaml +++ b/kind-1.27.yaml @@ -2,7 +2,7 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144 + image: kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 kubeadmConfigPatches: - | kind: InitConfiguration diff --git a/kind-1.28.yaml b/kind-1.28.yaml index fc1adafc28..711640f952 100644 --- a/kind-1.28.yaml +++ b/kind-1.28.yaml @@ -2,7 +2,7 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144 + image: kindest/node:v1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31 kubeadmConfigPatches: - | kind: InitConfiguration diff --git a/kind-1.29.yaml b/kind-1.29.yaml index fc1adafc28..66c8d46ec4 100644 --- a/kind-1.29.yaml +++ b/kind-1.29.yaml @@ -2,7 +2,7 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.29.1@sha256:a0cc28af37cf39b019e2b448c54d1a3f789de32536cb5a5db61a49623e527144 + image: kindest/node:v1.29.0@sha256:54a50c9354f11ce0aa56a85d2cacb1b950f85eab3fe1caf988826d1f89bf37eb kubeadmConfigPatches: - | kind: InitConfiguration