From dd0cc31d1e2f4cbd5bab2962ed768f6bb2cd9a78 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Wed, 8 Dec 2021 21:48:32 +0200 Subject: [PATCH] kinder: switch all workflows to containerd Switch all e2e test workflows to use containerd as the CR for the time being. Dockershim is being removed from k/k and until cri-dockerd gains maintainer traction we should avoid setting up our selfs for the sake of testing Docker as the CR. Technically the dockershim removal only affects "latest" workflows but this change will apply it to all k/k branches. Once and if cri-dockerd is testable we can add a single workflow for Docker as the CR. --- .../update-workflows/templates/workflows/discovery-tasks.yaml | 2 +- .../update-workflows/templates/workflows/external-ca-tasks.yaml | 2 +- .../templates/workflows/external-etcd-tasks.yaml | 2 +- .../update-workflows/templates/workflows/patches-tasks.yaml | 2 +- .../templates/workflows/presubmit-upgrade-latest.yaml | 2 +- .../update-workflows/templates/workflows/skew-x-on-y-tasks.yaml | 2 +- .../workflows/upgrade-latest-no-addon-config-maps.yaml | 2 +- .../update-workflows/templates/workflows/upgrade-tasks.yaml | 2 +- kinder/ci/workflows/discovery-tasks.yaml | 2 +- kinder/ci/workflows/external-ca-tasks.yaml | 2 +- kinder/ci/workflows/external-etcd-tasks.yaml | 2 +- kinder/ci/workflows/patches-tasks.yaml | 2 +- kinder/ci/workflows/presubmit-upgrade-latest.yaml | 2 +- kinder/ci/workflows/skew-x-on-y-tasks.yaml | 2 +- kinder/ci/workflows/upgrade-latest-no-addon-config-maps.yaml | 2 +- kinder/ci/workflows/upgrade-tasks.yaml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/kinder/ci/tools/update-workflows/templates/workflows/discovery-tasks.yaml b/kinder/ci/tools/update-workflows/templates/workflows/discovery-tasks.yaml index bcd891f3..4f2dfd7f 100644 --- a/kinder/ci/tools/update-workflows/templates/workflows/discovery-tasks.yaml +++ b/kinder/ci/tools/update-workflows/templates/workflows/discovery-tasks.yaml @@ -7,7 +7,7 @@ vars: # vars defines default values for variable used by tasks in this workflow; # those values might be overridden when importing this files. kubernetesVersion: v1.16.0 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-discovery kubeadmVerbosity: 6 diff --git a/kinder/ci/tools/update-workflows/templates/workflows/external-ca-tasks.yaml b/kinder/ci/tools/update-workflows/templates/workflows/external-ca-tasks.yaml index dd0aa942..6a5bfaff 100644 --- a/kinder/ci/tools/update-workflows/templates/workflows/external-ca-tasks.yaml +++ b/kinder/ci/tools/update-workflows/templates/workflows/external-ca-tasks.yaml @@ -6,7 +6,7 @@ vars: # vars defines default values for variable used by tasks in this workflow; # those values might be overridden when importing this files. kubernetesVersion: v1.16.0 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-external-ca kubeadmVerbosity: 6 diff --git a/kinder/ci/tools/update-workflows/templates/workflows/external-etcd-tasks.yaml b/kinder/ci/tools/update-workflows/templates/workflows/external-etcd-tasks.yaml index 662f4073..f2b4252b 100644 --- a/kinder/ci/tools/update-workflows/templates/workflows/external-etcd-tasks.yaml +++ b/kinder/ci/tools/update-workflows/templates/workflows/external-etcd-tasks.yaml @@ -4,7 +4,7 @@ summary: | cluster with an external etcd cluster. vars: kubernetesVersion: v1.14.1 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-external-etcd kubeadmVerbosity: 6 diff --git a/kinder/ci/tools/update-workflows/templates/workflows/patches-tasks.yaml b/kinder/ci/tools/update-workflows/templates/workflows/patches-tasks.yaml index cb6a9ddb..63150f7d 100644 --- a/kinder/ci/tools/update-workflows/templates/workflows/patches-tasks.yaml +++ b/kinder/ci/tools/update-workflows/templates/workflows/patches-tasks.yaml @@ -6,7 +6,7 @@ vars: # vars defines default values for variable used by tasks in this workflow; # those values might be overridden when importing this files. kubernetesVersion: v1.16.0 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-patches kubeadmVerbosity: 6 diff --git a/kinder/ci/tools/update-workflows/templates/workflows/presubmit-upgrade-latest.yaml b/kinder/ci/tools/update-workflows/templates/workflows/presubmit-upgrade-latest.yaml index b10d65b5..654c3776 100644 --- a/kinder/ci/tools/update-workflows/templates/workflows/presubmit-upgrade-latest.yaml +++ b/kinder/ci/tools/update-workflows/templates/workflows/presubmit-upgrade-latest.yaml @@ -8,7 +8,7 @@ vars: upgradeVersion: "{{ resolve `ci/latest` }}" controlPlaneNodes: 3 workerNodes: 2 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-pull kubeadmVerbosity: 6 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 49b2c639..28a417a0 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 @@ -11,7 +11,7 @@ vars: kubernetesVersion: v1.12.8 controlPlaneNodes: 1 workerNodes: 2 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-xony kubeadmVerbosity: 6 diff --git a/kinder/ci/tools/update-workflows/templates/workflows/upgrade-latest-no-addon-config-maps.yaml b/kinder/ci/tools/update-workflows/templates/workflows/upgrade-latest-no-addon-config-maps.yaml index eed78f89..ef928153 100644 --- a/kinder/ci/tools/update-workflows/templates/workflows/upgrade-latest-no-addon-config-maps.yaml +++ b/kinder/ci/tools/update-workflows/templates/workflows/upgrade-latest-no-addon-config-maps.yaml @@ -6,7 +6,7 @@ vars: initVersion: "{{ resolve `ci/latest` }}" controlPlaneNodes: 1 workerNodes: 1 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-upgrade kubeadmVerbosity: 6 diff --git a/kinder/ci/tools/update-workflows/templates/workflows/upgrade-tasks.yaml b/kinder/ci/tools/update-workflows/templates/workflows/upgrade-tasks.yaml index 9677779c..df56c314 100644 --- a/kinder/ci/tools/update-workflows/templates/workflows/upgrade-tasks.yaml +++ b/kinder/ci/tools/update-workflows/templates/workflows/upgrade-tasks.yaml @@ -9,7 +9,7 @@ vars: upgradeVersion: v1.13.5 controlPlaneNodes: 1 workerNodes: 2 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-upgrade kubeadmVerbosity: 6 diff --git a/kinder/ci/workflows/discovery-tasks.yaml b/kinder/ci/workflows/discovery-tasks.yaml index 5ed9af93..2af39517 100644 --- a/kinder/ci/workflows/discovery-tasks.yaml +++ b/kinder/ci/workflows/discovery-tasks.yaml @@ -8,7 +8,7 @@ vars: # vars defines default values for variable used by tasks in this workflow; # those values might be overridden when importing this files. kubernetesVersion: v1.16.0 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-discovery kubeadmVerbosity: 6 diff --git a/kinder/ci/workflows/external-ca-tasks.yaml b/kinder/ci/workflows/external-ca-tasks.yaml index 1c33cb3d..737d8bf2 100644 --- a/kinder/ci/workflows/external-ca-tasks.yaml +++ b/kinder/ci/workflows/external-ca-tasks.yaml @@ -7,7 +7,7 @@ vars: # vars defines default values for variable used by tasks in this workflow; # those values might be overridden when importing this files. kubernetesVersion: v1.16.0 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-external-ca kubeadmVerbosity: 6 diff --git a/kinder/ci/workflows/external-etcd-tasks.yaml b/kinder/ci/workflows/external-etcd-tasks.yaml index 9f7e6cf1..978c171d 100644 --- a/kinder/ci/workflows/external-etcd-tasks.yaml +++ b/kinder/ci/workflows/external-etcd-tasks.yaml @@ -5,7 +5,7 @@ summary: | cluster with an external etcd cluster. vars: kubernetesVersion: v1.14.1 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-external-etcd kubeadmVerbosity: 6 diff --git a/kinder/ci/workflows/patches-tasks.yaml b/kinder/ci/workflows/patches-tasks.yaml index 8b39e328..368347fc 100644 --- a/kinder/ci/workflows/patches-tasks.yaml +++ b/kinder/ci/workflows/patches-tasks.yaml @@ -7,7 +7,7 @@ vars: # vars defines default values for variable used by tasks in this workflow; # those values might be overridden when importing this files. kubernetesVersion: v1.16.0 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-patches kubeadmVerbosity: 6 diff --git a/kinder/ci/workflows/presubmit-upgrade-latest.yaml b/kinder/ci/workflows/presubmit-upgrade-latest.yaml index 2d5e5449..a56c3c5b 100644 --- a/kinder/ci/workflows/presubmit-upgrade-latest.yaml +++ b/kinder/ci/workflows/presubmit-upgrade-latest.yaml @@ -9,7 +9,7 @@ vars: upgradeVersion: "{{ resolve `ci/latest` }}" controlPlaneNodes: 3 workerNodes: 2 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-pull kubeadmVerbosity: 6 diff --git a/kinder/ci/workflows/skew-x-on-y-tasks.yaml b/kinder/ci/workflows/skew-x-on-y-tasks.yaml index 4dd01905..543ccd60 100644 --- a/kinder/ci/workflows/skew-x-on-y-tasks.yaml +++ b/kinder/ci/workflows/skew-x-on-y-tasks.yaml @@ -12,7 +12,7 @@ vars: kubernetesVersion: v1.12.8 controlPlaneNodes: 1 workerNodes: 2 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-xony kubeadmVerbosity: 6 diff --git a/kinder/ci/workflows/upgrade-latest-no-addon-config-maps.yaml b/kinder/ci/workflows/upgrade-latest-no-addon-config-maps.yaml index 4a1917a4..832c847c 100644 --- a/kinder/ci/workflows/upgrade-latest-no-addon-config-maps.yaml +++ b/kinder/ci/workflows/upgrade-latest-no-addon-config-maps.yaml @@ -7,7 +7,7 @@ vars: initVersion: "{{ resolve `ci/latest` }}" controlPlaneNodes: 1 workerNodes: 1 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-upgrade kubeadmVerbosity: 6 diff --git a/kinder/ci/workflows/upgrade-tasks.yaml b/kinder/ci/workflows/upgrade-tasks.yaml index ed9ae438..d6690cd9 100644 --- a/kinder/ci/workflows/upgrade-tasks.yaml +++ b/kinder/ci/workflows/upgrade-tasks.yaml @@ -10,7 +10,7 @@ vars: upgradeVersion: v1.13.5 controlPlaneNodes: 1 workerNodes: 2 - baseImage: kindest/base:v20190403-1ebf15f + baseImage: kindest/base:v20191105-ee880e9b # has containerd image: kindest/node:test clusterName: kinder-upgrade kubeadmVerbosity: 6