Skip to content

Commit

Permalink
Merge pull request #2620 from neolit123/1.24-switch-all-workflows-to-…
Browse files Browse the repository at this point in the history 
…containerd

kinder: switch all workflows to containerd
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Dec 8, 2021
2 parents e55c2a2 + 6fe0dde commit 26157e6
Show file tree
Hide file tree
Showing 17 changed files with 32 additions and 18 deletions.
2 changes: 1 addition & 1 deletion kinder/ci/tools/update-workflows/templates/workflows/discovery-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/tools/update-workflows/templates/workflows/external-ca-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/tools/update-workflows/templates/workflows/external-etcd-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/tools/update-workflows/templates/workflows/patches-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/tools/update-workflows/templates/workflows/presubmit-upgrade-latest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/tools/update-workflows/templates/workflows/skew-x-on-y-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...er/ci/tools/update-workflows/templates/workflows/upgrade-latest-no-addon-config-maps.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/tools/update-workflows/templates/workflows/upgrade-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/workflows/discovery-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/workflows/external-ca-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/workflows/external-etcd-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/workflows/patches-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/workflows/presubmit-upgrade-latest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/workflows/skew-x-on-y-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/workflows/upgrade-latest-no-addon-config-maps.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion kinder/ci/workflows/upgrade-tasks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 16 additions & 2 deletions kinder/pkg/cluster/manager/actions/cluster-info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ package actions

import (
"fmt"
"github.com/pkg/errors"
"strings"

"github.com/pkg/errors"

versionutils "k8s.io/apimachinery/pkg/util/version"
"k8s.io/kubeadm/kinder/pkg/cluster/status"
)
Expand Down Expand Up @@ -66,12 +67,25 @@ func CluterInfo(c *status.Cluster) error {
"--",
}

var lines []string
var err error

// Get the version of etcdctl from the etcd binary
// Retry the version command for a while to avoid "exec" flakes
versionArgs := append(etcdArgs, "etcd", "--version")
lines, err := cp1.Command("kubectl", versionArgs...).RunAndCapture()
versionArgs = append([]string{"--request-timeout=2"}, versionArgs...) // Ensure shorter timeout
for i := 0; i < 10; i++ {
lines, err = cp1.Command("kubectl", versionArgs...).RunAndCapture()
if err == nil {
break
}
cp1.Infof("Could not execute 'etcd --version' inside %q (attempt %d/%d): %v\n", cp1.Name(), i+1, 10,
errors.Wrap(err, strings.Join(lines, "\n")))
}
if err != nil {
return err
}

etcdctlVersion, err := parseEtcdctlVersion(lines)
if err != nil {
return err
Expand Down

0 comments on commit 26157e6

Please sign in to comment.