remove the KubeletVersion from ignorePreflightErrors from v1.29/lates…

…t as skew policy is now n-3
kubernetes · Oct 18, 2023 · e953d19 · e953d19
1 parent 74420c3
commit e953d19
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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