Unverified Commit 43a9e08e authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub

Merge pull request #68990 from carlisia/c-pauseversion

Change pause version value to a constant for image
parents 762ddf79 401f3f82
...@@ -246,6 +246,9 @@ const ( ...@@ -246,6 +246,9 @@ const (
// DefaultEtcdVersion indicates the default etcd version that kubeadm uses // DefaultEtcdVersion indicates the default etcd version that kubeadm uses
DefaultEtcdVersion = "3.2.24" DefaultEtcdVersion = "3.2.24"
// PauseVersion indicates the default pause image version for kubeadm
PauseVersion = "3.1"
// Etcd defines variable used internally when referring to etcd component // Etcd defines variable used internally when referring to etcd component
Etcd = "etcd" Etcd = "etcd"
// KubeAPIServer defines variable used internally when referring to kube-apiserver component // KubeAPIServer defines variable used internally when referring to kube-apiserver component
......
...@@ -62,7 +62,7 @@ func GetAllImages(cfg *kubeadmapi.ClusterConfiguration) []string { ...@@ -62,7 +62,7 @@ func GetAllImages(cfg *kubeadmapi.ClusterConfiguration) []string {
imgs = append(imgs, GetKubeControlPlaneImage(constants.KubeProxy, cfg)) imgs = append(imgs, GetKubeControlPlaneImage(constants.KubeProxy, cfg))
// pause, etcd and kube-dns are not available on the ci image repository so use the default image repository. // pause, etcd and kube-dns are not available on the ci image repository so use the default image repository.
imgs = append(imgs, GetGenericImage(cfg.ImageRepository, "pause", "3.1")) imgs = append(imgs, GetGenericImage(cfg.ImageRepository, "pause", constants.PauseVersion))
// if etcd is not external then add the image as it will be required // if etcd is not external then add the image as it will be required
if cfg.Etcd.Local != nil { if cfg.Etcd.Local != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment