From e953d19175f1430e92ea5ebf973aef3c9e4104d0 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Wed, 18 Oct 2023 10:53:00 +0800 Subject: [PATCH] remove the KubeletVersion from ignorePreflightErrors from v1.29/latest as skew policy is now n-3 --- kinder/ci/kubeadm-periodic.tests.md | 4 +++- .../templates/workflows/skew-kubelet-x-on-y.yaml | 1 - .../update-workflows/templates/workflows/skew-x-on-y.yaml | 1 - kinder/ci/workflows/skew-kubelet-1.26-on-latest.yaml | 1 - kinder/ci/workflows/skew-kubelet-1.27-on-latest.yaml | 1 - kinder/ci/workflows/skew-kubelet-1.28-on-latest.yaml | 1 - kinder/ci/workflows/skew-latest-on-1.28.yaml | 1 - 7 files changed, 3 insertions(+), 7 deletions(-) diff --git a/kinder/ci/kubeadm-periodic.tests.md b/kinder/ci/kubeadm-periodic.tests.md index 84b66ff9..8bae78c5 100644 --- a/kinder/ci/kubeadm-periodic.tests.md +++ b/kinder/ci/kubeadm-periodic.tests.md @@ -71,11 +71,13 @@ Workflow file names: [`skew-[x]-on-[y]`](./workflows) Kubelet X on Y tests are meant to verify the proper functioning of a version X kubelet against version Y (X+1 or X+2) kubeadm and control plane. The coverage of X == Y is already covered by the `regular-*` tests. -Note that for the time being kubeadm version X does not support skew against a kubelet version X-2, +Before v1.28, note that for the time being kubeadm version X does not support skew against a kubelet version X-2, similarly to how kubeadm does not support X-2 skew with the control plane. This requires skipping the `KubeletVersion` preflight check. In the future if these X-2 tests are no longer possible with kubeadm they would have to be adapted on the kinder side or dropped. +After v1.29, kubeadm version X does not support skew against a kubelet version X-4. + Workflow file names: [`skew-kubelet-[x]-on-[y]`](./workflows) ### External etcd with secret copy tests diff --git a/kinder/ci/tools/update-workflows/templates/workflows/skew-kubelet-x-on-y.yaml b/kinder/ci/tools/update-workflows/templates/workflows/skew-kubelet-x-on-y.yaml index 6018be37..55a6df80 100644 --- a/kinder/ci/tools/update-workflows/templates/workflows/skew-kubelet-x-on-y.yaml +++ b/kinder/ci/tools/update-workflows/templates/workflows/skew-kubelet-x-on-y.yaml @@ -7,7 +7,6 @@ vars: kubeadmVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubeadmVersion }}` \}\}" kubeletVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubeletVersion }}` \}\}" kubernetesVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubernetesVersion }}` \}\}" - ignorePreflightErrors: "KubeletVersion" ginkgoSkip: "\\[MinimumKubeletVersion:({{ .SkipVersions }})\\]" controlPlaneNodes: 3 tasks: diff --git a/kinder/ci/tools/update-workflows/templates/workflows/skew-x-on-y.yaml b/kinder/ci/tools/update-workflows/templates/workflows/skew-x-on-y.yaml index 6c1782bc..782405d1 100644 --- a/kinder/ci/tools/update-workflows/templates/workflows/skew-x-on-y.yaml +++ b/kinder/ci/tools/update-workflows/templates/workflows/skew-x-on-y.yaml @@ -7,7 +7,6 @@ vars: kubeadmVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubeadmVersion }}` \}\}" kubeletVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubeletVersion }}` \}\}" kubernetesVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubernetesVersion }}` \}\}" - ignorePreflightErrors: "KubeletVersion" controlPlaneNodes: 3 tasks: - import: skew-x-on-y-tasks.yaml diff --git a/kinder/ci/workflows/skew-kubelet-1.26-on-latest.yaml b/kinder/ci/workflows/skew-kubelet-1.26-on-latest.yaml index 09f6c372..f525e8d4 100644 --- a/kinder/ci/workflows/skew-kubelet-1.26-on-latest.yaml +++ b/kinder/ci/workflows/skew-kubelet-1.26-on-latest.yaml @@ -8,7 +8,6 @@ vars: kubeadmVersion: "{{ resolve `ci/latest` }}" kubeletVersion: "{{ resolve `ci/latest-1.26` }}" kubernetesVersion: "{{ resolve `ci/latest` }}" - ignorePreflightErrors: "KubeletVersion" ginkgoSkip: "\\[MinimumKubeletVersion:(1.28|1.29|1.30)\\]" controlPlaneNodes: 3 tasks: diff --git a/kinder/ci/workflows/skew-kubelet-1.27-on-latest.yaml b/kinder/ci/workflows/skew-kubelet-1.27-on-latest.yaml index 4ad1c9bc..91c2bb98 100644 --- a/kinder/ci/workflows/skew-kubelet-1.27-on-latest.yaml +++ b/kinder/ci/workflows/skew-kubelet-1.27-on-latest.yaml @@ -8,7 +8,6 @@ vars: kubeadmVersion: "{{ resolve `ci/latest` }}" kubeletVersion: "{{ resolve `ci/latest-1.27` }}" kubernetesVersion: "{{ resolve `ci/latest` }}" - ignorePreflightErrors: "KubeletVersion" ginkgoSkip: "\\[MinimumKubeletVersion:(1.28|1.29)\\]" controlPlaneNodes: 3 tasks: diff --git a/kinder/ci/workflows/skew-kubelet-1.28-on-latest.yaml b/kinder/ci/workflows/skew-kubelet-1.28-on-latest.yaml index 9dbdbbe5..3e97f611 100644 --- a/kinder/ci/workflows/skew-kubelet-1.28-on-latest.yaml +++ b/kinder/ci/workflows/skew-kubelet-1.28-on-latest.yaml @@ -8,7 +8,6 @@ vars: kubeadmVersion: "{{ resolve `ci/latest` }}" kubeletVersion: "{{ resolve `ci/latest-1.28` }}" kubernetesVersion: "{{ resolve `ci/latest` }}" - ignorePreflightErrors: "KubeletVersion" ginkgoSkip: "\\[MinimumKubeletVersion:(1.29)\\]" controlPlaneNodes: 3 tasks: diff --git a/kinder/ci/workflows/skew-latest-on-1.28.yaml b/kinder/ci/workflows/skew-latest-on-1.28.yaml index 37f75d77..36c09c78 100644 --- a/kinder/ci/workflows/skew-latest-on-1.28.yaml +++ b/kinder/ci/workflows/skew-latest-on-1.28.yaml @@ -8,7 +8,6 @@ vars: kubeadmVersion: "{{ resolve `ci/latest` }}" kubeletVersion: "{{ resolve `ci/latest-1.28` }}" kubernetesVersion: "{{ resolve `ci/latest-1.28` }}" - ignorePreflightErrors: "KubeletVersion" controlPlaneNodes: 3 tasks: - import: skew-x-on-y-tasks.yaml