Merge branch 'master' into openeuler-21.09

pixiake · Sep 15, 2021 · c30d932 · c30d932
2 parents 33cd7f7 + 6728143
commit c30d932
Showing 1 changed file with 23 additions and 24 deletions.
diff --git a/pkg/kubernetes/preinstall/prepull_images.go b/pkg/kubernetes/preinstall/prepull_images.go
@@ -11,31 +11,30 @@ import (
 
 // PullImages defines the list of images that need to be downloaded in advance and downloads them.
 func PullImages(mgr *manager.Manager, node *kubekeyapiv1alpha1.HostCfg) error {
-	if !manager.ExistNode(mgr, node) {
-		i := images.Images{}
-		i.Images = []images.Image{
-			GetImage(mgr, "etcd"),
-			GetImage(mgr, "pause"),
-			GetImage(mgr, "kube-apiserver"),
-			GetImage(mgr, "kube-controller-manager"),
-			GetImage(mgr, "kube-scheduler"),
-			GetImage(mgr, "kube-proxy"),
-			GetImage(mgr, "coredns"),
-			GetImage(mgr, "k8s-dns-node-cache"),
-			GetImage(mgr, "calico-kube-controllers"),
-			GetImage(mgr, "calico-cni"),
-			GetImage(mgr, "calico-node"),
-			GetImage(mgr, "calico-flexvol"),
-			GetImage(mgr, "cilium"),
-			GetImage(mgr, "operator-generic"),
-			GetImage(mgr, "flannel"),
-			GetImage(mgr, "kubeovn"),
-			GetImage(mgr, "haproxy"),
-		}
-		if err := i.PullImages(mgr, node); err != nil {
-			return err
-		}
+	i := images.Images{}
+	i.Images = []images.Image{
+		GetImage(mgr, "etcd"),
+		GetImage(mgr, "pause"),
+		GetImage(mgr, "kube-apiserver"),
+		GetImage(mgr, "kube-controller-manager"),
+		GetImage(mgr, "kube-scheduler"),
+		GetImage(mgr, "kube-proxy"),
+		GetImage(mgr, "coredns"),
+		GetImage(mgr, "k8s-dns-node-cache"),
+		GetImage(mgr, "calico-kube-controllers"),
+		GetImage(mgr, "calico-cni"),
+		GetImage(mgr, "calico-node"),
+		GetImage(mgr, "calico-flexvol"),
+		GetImage(mgr, "cilium"),
+		GetImage(mgr, "operator-generic"),
+		GetImage(mgr, "flannel"),
+		GetImage(mgr, "kubeovn"),
+		GetImage(mgr, "haproxy"),
 	}
+	if err := i.PullImages(mgr, node); err != nil {
+		return err
+	}
+
 	return nil
 }