From 2357afc5deee8e6fb6a4564e84f73564a66bd0a4 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Wed, 1 Nov 2023 15:24:16 +0800 Subject: [PATCH] per neolit123's comment: leave the ignore error remove to v1.32 --- kinder/ci/kubeadm-periodic.tests.md | 9 ++++----- kinder/ci/tools/update-workflows/config.yaml | 3 --- .../templates/workflows/skew-kubelet-x-on-y.yaml | 2 +- .../templates/workflows/skew-x-on-y-tasks.yaml | 2 +- .../templates/workflows/skew-x-on-y.yaml | 2 +- kinder/ci/workflows/skew-kubelet-1.26-on-latest.yaml | 2 +- kinder/ci/workflows/skew-kubelet-1.27-on-latest.yaml | 2 +- kinder/ci/workflows/skew-kubelet-1.28-on-latest.yaml | 2 +- kinder/ci/workflows/skew-latest-on-1.28.yaml | 2 +- kinder/ci/workflows/skew-x-on-y-tasks.yaml | 2 +- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/kinder/ci/kubeadm-periodic.tests.md b/kinder/ci/kubeadm-periodic.tests.md index 8bae78c5..3b4e6b5c 100644 --- a/kinder/ci/kubeadm-periodic.tests.md +++ b/kinder/ci/kubeadm-periodic.tests.md @@ -71,12 +71,11 @@ 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. -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. +Before kubeadm v1.29, the maximum kubelet skew from the kubeadm version was X-1. This required skipping +the KubeletVersion preflight check. -After v1.29, kubeadm version X does not support skew against a kubelet version X-4. +After kubeadm v1.29, the maximum kubelet skew from the kubeadm version has become X-3 and KubeletVersion +preflight check no longer has to be skipped. Workflow file names: [`skew-kubelet-[x]-on-[y]`](./workflows) diff --git a/kinder/ci/tools/update-workflows/config.yaml b/kinder/ci/tools/update-workflows/config.yaml index 0cb24038..ab609df7 100644 --- a/kinder/ci/tools/update-workflows/config.yaml +++ b/kinder/ci/tools/update-workflows/config.yaml @@ -124,13 +124,10 @@ jobGroups: kubeadmVersion: latest - kubernetesVersion: -1 kubeadmVersion: 0 - ignorePreflightErrors: KubeletVersion - kubernetesVersion: -2 kubeadmVersion: -1 - ignorePreflightErrors: KubeletVersion - kubernetesVersion: -3 kubeadmVersion: -2 - ignorePreflightErrors: KubeletVersion - name: upgrade testInfraJobSpec: 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 ec01622b..6018be37 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,7 @@ vars: kubeadmVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubeadmVersion }}` \}\}" kubeletVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubeletVersion }}` \}\}" kubernetesVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubernetesVersion }}` \}\}" - ignorePreflightErrors: "{{.IgnorePreflightErrors}}" + ignorePreflightErrors: "KubeletVersion" ginkgoSkip: "\\[MinimumKubeletVersion:({{ .SkipVersions }})\\]" controlPlaneNodes: 3 tasks: diff --git a/kinder/ci/tools/update-workflows/templates/workflows/skew-x-on-y-tasks.yaml b/kinder/ci/tools/update-workflows/templates/workflows/skew-x-on-y-tasks.yaml index 4615e28b..a24d372c 100644 --- a/kinder/ci/tools/update-workflows/templates/workflows/skew-x-on-y-tasks.yaml +++ b/kinder/ci/tools/update-workflows/templates/workflows/skew-x-on-y-tasks.yaml @@ -16,7 +16,7 @@ vars: clusterName: kinder-xony kubeadmVerbosity: 6 defaultIgnorePreflightErrors: Swap,SystemVerification,FileContent--proc-sys-net-bridge-bridge-nf-call-iptables, - ignorePreflightErrors: "" + ignorePreflightErrors: "KubeletVersion" ginkgoSkip: "" tasks: - name: pull-base-image 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 8b89850b..6c1782bc 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,7 @@ vars: kubeadmVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubeadmVersion }}` \}\}" kubeletVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubeletVersion }}` \}\}" kubernetesVersion: "\{\{ resolve `ci/{{ ciLabelFor .KubernetesVersion }}` \}\}" - ignorePreflightErrors: "{{.IgnorePreflightErrors}}" + 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 4b6d7b96..09f6c372 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,7 @@ vars: kubeadmVersion: "{{ resolve `ci/latest` }}" kubeletVersion: "{{ resolve `ci/latest-1.26` }}" kubernetesVersion: "{{ resolve `ci/latest` }}" - ignorePreflightErrors: "" + 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 7520bb15..4ad1c9bc 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,7 @@ vars: kubeadmVersion: "{{ resolve `ci/latest` }}" kubeletVersion: "{{ resolve `ci/latest-1.27` }}" kubernetesVersion: "{{ resolve `ci/latest` }}" - ignorePreflightErrors: "" + 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 5ee51d41..9dbdbbe5 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,7 @@ vars: kubeadmVersion: "{{ resolve `ci/latest` }}" kubeletVersion: "{{ resolve `ci/latest-1.28` }}" kubernetesVersion: "{{ resolve `ci/latest` }}" - ignorePreflightErrors: "" + 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 72609e70..37f75d77 100644 --- a/kinder/ci/workflows/skew-latest-on-1.28.yaml +++ b/kinder/ci/workflows/skew-latest-on-1.28.yaml @@ -8,7 +8,7 @@ vars: kubeadmVersion: "{{ resolve `ci/latest` }}" kubeletVersion: "{{ resolve `ci/latest-1.28` }}" kubernetesVersion: "{{ resolve `ci/latest-1.28` }}" - ignorePreflightErrors: "" + ignorePreflightErrors: "KubeletVersion" controlPlaneNodes: 3 tasks: - import: skew-x-on-y-tasks.yaml diff --git a/kinder/ci/workflows/skew-x-on-y-tasks.yaml b/kinder/ci/workflows/skew-x-on-y-tasks.yaml index 3cc34959..8b61b6e3 100644 --- a/kinder/ci/workflows/skew-x-on-y-tasks.yaml +++ b/kinder/ci/workflows/skew-x-on-y-tasks.yaml @@ -17,7 +17,7 @@ vars: clusterName: kinder-xony kubeadmVerbosity: 6 defaultIgnorePreflightErrors: Swap,SystemVerification,FileContent--proc-sys-net-bridge-bridge-nf-call-iptables, - ignorePreflightErrors: "" + ignorePreflightErrors: "KubeletVersion" ginkgoSkip: "" tasks: - name: pull-base-image