Skip to content

Commit

Permalink
Merge pull request #3130 from neolit123/1.32-bump-ci-for-1.32
Browse files Browse the repository at this point in the history
kinder: add 1.32 jobs remove 1.28
  • Loading branch information
k8s-ci-robot authored Dec 2, 2024
2 parents bac7146 + df6eef1 commit 33b7812
Show file tree
Hide file tree
Showing 17 changed files with 54 additions and 54 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ version: 1
summary: |
This workflow implements a sequence of tasks used for testing alternative
discovery methods for kubeadm join.
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-discovery-1-28
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-discovery-1-32
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-discovery.yaml
vars:
kubernetesVersion: "{{ resolve `ci/latest-1.28` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.32` }}"
tasks:
- import: discovery-tasks.yaml
2 changes: 1 addition & 1 deletion kinder/ci/workflows/dryrun-1.31.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ summary: |
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-dryrun.yaml
vars:
kubernetesVersion: "{{ resolve `ci/latest-1.31` }}"
upgradeVersion: "{{ resolve `ci/latest` }}"
upgradeVersion: "{{ resolve `ci/latest-1.32` }}"
tasks:
- import: dryrun-tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
This workflow tests the dryrun functioning of the 1.28 version of both kubeadm and Kubernetes
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-dryrun-1-28
This workflow tests the dryrun functioning of the 1.32 version of both kubeadm and Kubernetes
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-dryrun-1-32
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-dryrun.yaml
vars:
kubernetesVersion: "{{ resolve `ci/latest-1.28` }}"
upgradeVersion: "{{ resolve `ci/latest-1.29` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.32` }}"
upgradeVersion: "{{ resolve `ci/latest` }}"
tasks:
- import: dryrun-tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
version: 1
summary: |
This workflow implements a sequence of tasks for testing the external CA functionality.
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-external-ca-1-28
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-external-ca-1-32
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-external-ca.yaml
vars:
kubernetesVersion: "{{ resolve `ci/latest-1.28` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.32` }}"
tasks:
- import: external-ca-tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ version: 1
summary: |
This workflow tests the proper functioning of deploying an HA
cluster with secret copy using an external etcd cluster
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-external-etcd-1-28
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-external-etcd-1-32
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-external-etcd.yaml
vars:
kubernetesVersion: "{{ resolve `ci/latest-1.28` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.32` }}"
tasks:
- import: external-etcd-tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
This workflow tests the proper functioning of the 1.28 version of both kubeadm and Kubernetes
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-1-28
This workflow tests the proper functioning of the 1.32 version of both kubeadm and Kubernetes
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-1-32
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder.yaml
vars:
kubernetesVersion: "{{ resolve `ci/latest-1.28` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.32` }}"
tasks:
- import: regular-tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
This workflow tests the proper functioning of kubeadm version latest with Kubernetes 1.31
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-latest-on-1-31
This workflow tests the proper functioning of kubeadm version 1.32 with Kubernetes 1.31
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-1-32-on-1-31
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-x-on-y.yaml
vars:
kubeadmVersion: "{{ resolve `ci/latest` }}"
kubeadmVersion: "{{ resolve `ci/latest-1.32` }}"
kubeletVersion: "{{ resolve `ci/latest-1.31` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.31` }}"
ignorePreflightErrors: "KubeletVersion"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
This workflow tests the proper functioning of kubeadm and control plane from 1.31 against 1.28 kubelet
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-kubelet-1-28-on-1.31
This workflow tests the proper functioning of kubeadm and control plane from 1.32 against 1.29 kubelet
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-kubelet-1-29-on-1.32
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-kubelet-x-on-y.yaml
vars:
kubeadmVersion: "{{ resolve `ci/latest-1.31` }}"
kubeletVersion: "{{ resolve `ci/latest-1.28` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.31` }}"
kubeadmVersion: "{{ resolve `ci/latest-1.32` }}"
kubeletVersion: "{{ resolve `ci/latest-1.29` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.32` }}"
ignorePreflightErrors: "KubeletVersion"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.29|1.30|1.31)\\]"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.30|1.31|1.32)\\]"
controlPlaneNodes: 3
tasks:
- import: skew-x-on-y-tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
This workflow tests the proper functioning of kubeadm and control plane from 1.30 against 1.28 kubelet
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-kubelet-1-28-on-1.30
This workflow tests the proper functioning of kubeadm and control plane from 1.32 against 1.30 kubelet
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-kubelet-1-30-on-1.32
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-kubelet-x-on-y.yaml
vars:
kubeadmVersion: "{{ resolve `ci/latest-1.30` }}"
kubeletVersion: "{{ resolve `ci/latest-1.28` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.30` }}"
kubeadmVersion: "{{ resolve `ci/latest-1.32` }}"
kubeletVersion: "{{ resolve `ci/latest-1.30` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.32` }}"
ignorePreflightErrors: "KubeletVersion"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.29|1.30)\\]"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.31|1.32)\\]"
controlPlaneNodes: 3
tasks:
- import: skew-x-on-y-tasks.yaml
2 changes: 1 addition & 1 deletion kinder/ci/workflows/skew-kubelet-1.30-on-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ vars:
kubeletVersion: "{{ resolve `ci/latest-1.30` }}"
kubernetesVersion: "{{ resolve `ci/latest` }}"
ignorePreflightErrors: "KubeletVersion"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.31|1.32)\\]"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.32|1.33|1.34)\\]"
controlPlaneNodes: 3
tasks:
- import: skew-x-on-y-tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
This workflow tests the proper functioning of kubeadm and control plane from 1.29 against 1.28 kubelet
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-kubelet-1-28-on-1.29
This workflow tests the proper functioning of kubeadm and control plane from 1.32 against 1.31 kubelet
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-kubelet-1-31-on-1.32
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-kubelet-x-on-y.yaml
vars:
kubeadmVersion: "{{ resolve `ci/latest-1.29` }}"
kubeletVersion: "{{ resolve `ci/latest-1.28` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.29` }}"
kubeadmVersion: "{{ resolve `ci/latest-1.32` }}"
kubeletVersion: "{{ resolve `ci/latest-1.31` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.32` }}"
ignorePreflightErrors: "KubeletVersion"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.29)\\]"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.32)\\]"
controlPlaneNodes: 3
tasks:
- import: skew-x-on-y-tasks.yaml
2 changes: 1 addition & 1 deletion kinder/ci/workflows/skew-kubelet-1.31-on-latest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ vars:
kubeletVersion: "{{ resolve `ci/latest-1.31` }}"
kubernetesVersion: "{{ resolve `ci/latest` }}"
ignorePreflightErrors: "KubeletVersion"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.32)\\]"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.32|1.33)\\]"
controlPlaneNodes: 3
tasks:
- import: skew-x-on-y-tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
This workflow tests the proper functioning of kubeadm and control plane from latest against 1.29 kubelet
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-kubelet-1-29-on-latest
This workflow tests the proper functioning of kubeadm and control plane from latest against 1.32 kubelet
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-kubelet-1-32-on-latest
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-kubelet-x-on-y.yaml
vars:
kubeadmVersion: "{{ resolve `ci/latest` }}"
kubeletVersion: "{{ resolve `ci/latest-1.29` }}"
kubeletVersion: "{{ resolve `ci/latest-1.32` }}"
kubernetesVersion: "{{ resolve `ci/latest` }}"
ignorePreflightErrors: "KubeletVersion"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.31|1.32|1.33)\\]"
ginkgoSkip: "\\[MinimumKubeletVersion:(1.33)\\]"
controlPlaneNodes: 3
tasks:
- import: skew-x-on-y-tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
This workflow tests the proper functioning of kubeadm version 1.29 with Kubernetes 1.28
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-1-29-on-1-28
This workflow tests the proper functioning of kubeadm version latest with Kubernetes 1.32
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-latest-on-1-32
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-x-on-y.yaml
vars:
kubeadmVersion: "{{ resolve `ci/latest-1.29` }}"
kubeletVersion: "{{ resolve `ci/latest-1.28` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.28` }}"
kubeadmVersion: "{{ resolve `ci/latest` }}"
kubeletVersion: "{{ resolve `ci/latest-1.32` }}"
kubernetesVersion: "{{ resolve `ci/latest-1.32` }}"
ignorePreflightErrors: "KubeletVersion"
controlPlaneNodes: 3
tasks:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
this workflow test kubeadm upgrades from Kubernetes 1.28 to 1.29
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-upgrade-1-28-1-29
this workflow test kubeadm upgrades from Kubernetes 1.31 to 1.32
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-upgrade-1-31-1-32
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-upgrade.yaml
vars:
initVersion: "{{ resolve `ci/latest-1.28` }}"
upgradeVersion: "{{ resolve `ci/latest-1.29` }}"
initVersion: "{{ resolve `ci/latest-1.31` }}"
upgradeVersion: "{{ resolve `ci/latest-1.32` }}"
controlPlaneNodes: 3
tasks:
- import: upgrade-tasks.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# AUTOGENERATED by https://git.k8s.io/kubeadm/kinder/ci/tools/update-workflows
version: 1
summary: |
this workflow test kubeadm upgrades from Kubernetes 1.31 to latest
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-upgrade-1-31-latest
this workflow test kubeadm upgrades from Kubernetes 1.32 to latest
test grid > https://testgrid.k8s.io/sig-cluster-lifecycle-kubeadm#kubeadm-kinder-upgrade-1-32-latest
config > https://git.k8s.io/test-infra/config/jobs/kubernetes/sig-cluster-lifecycle/kubeadm-kinder-upgrade.yaml
vars:
initVersion: "{{ resolve `ci/latest-1.31` }}"
initVersion: "{{ resolve `ci/latest-1.32` }}"
upgradeVersion: "{{ resolve `ci/latest` }}"
controlPlaneNodes: 3
tasks:
Expand Down
2 changes: 1 addition & 1 deletion kinder/hack/update-workflows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source "$(dirname "$0")/utils.sh"
cd_root_path

# set kubernetes version
KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.31.0}"
KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.32.0}"

# set skew
KUBERNETES_SKEW="${KUBERNETES_SKEW:-3}"
Expand Down

0 comments on commit 33b7812

Please sign in to comment.