fix: remove image_registry tags from binary tasks (#3066)

Signed-off-by: redscholar <blacktiledhouse@gmail.com>

Author: redscholar

builtin/core/roles/defaults/defaults/main/10-download.yaml

@@ -131,7 +131,10 @@ download:
   images:
     manifests: []
     # Architectures for which images should be downloaded.
-    registry: ""
+    registry: >
+      {{- if .zone | eq "cn" }}
+      hub.kubesphere.com.cn
+      {{- end }}
     # Determines the image pull policy. support strict, warn
     policy: "strict"
     # kubernetes images list

builtin/core/roles/download/package/tasks/binary.yaml

@@ -112,7 +112,6 @@
     dest: "{{ .artifact_dir }}/kubekey/crictl/{{ .item.version }}/{{ .item.arch }}/crictl-{{ .item.version }}-linux-{{ .item.arch }}.tar.gz"
 
 - name: Binary | Ensure Docker binary is present
-  tags: ["image_registry"]
   loop: >
     {{- $result := list -}}
     {{- range $arch := .download.arch }}
@@ -198,7 +197,6 @@
     dest: "{{ .artifact_dir }}/kubekey/cni/calico/{{ .item.version }}/{{ .item.arch }}/calicoctl-linux-{{ .item.arch }}"
 
 - name: Binary | Ensure Docker Registry binary is present
-  tags: ["image_registry"]
   loop: >
     {{- $result := list -}}
     {{- range $arch := .download.arch }}
@@ -216,7 +214,6 @@
     dest: "{{ .artifact_dir }}/kubekey/image-registry/docker-registry/{{ .item.version }}/{{ .item.arch }}/docker-registry-{{ .item.version }}-linux-{{ .item.arch }}.tgz"
 
 - name: Binary | Ensure docker-compose binary is present
-  tags: ["image_registry"]
   loop: >
     {{- $result := list -}}
     {{- range $arch := .download.arch }}
@@ -234,7 +231,6 @@
     dest: "{{ .artifact_dir }}/kubekey/image-registry/docker-compose/{{ .item.version }}/{{ .item.arch }}/docker-compose"
 
 - name: Binary | Ensure Harbor binary is present
-  tags: ["image_registry"]
   loop: >
     {{- $result := list -}}
     {{- range $arch := .download.arch }}
@@ -253,7 +249,6 @@
 
 
 - name: Binary | Ensure keepalived binary is present
-  tags: ["image_registry"]
   loop: >
     {{- $result := list -}}
     {{- range $arch := .download.arch }}

builtin/core/roles/download/tasks/binary.yaml

@@ -119,7 +119,6 @@
     timeout: "{{ .download.timeout }}"
 
 - name: Binary | Ensure Docker binary is present
-  tags: ["image_registry"]
   loop: >
     {{- $result := list -}}
     {{- range $arch := .download.arch }}
@@ -214,7 +213,6 @@
     timeout: "{{ .download.timeout }}"
 
 - name: Binary | Ensure Docker Registry binary is present
-  tags: ["image_registry"]
   loop: >
     {{- $result := list -}}
     {{- range $arch := .download.arch }}
@@ -233,7 +231,6 @@
     timeout: "{{ .download.timeout }}"
 
 - name: Binary | Ensure docker-compose binary is present
-  tags: ["image_registry"]
   loop: >
     {{- $result := list -}}
     {{- range $arch := .download.arch }}
@@ -252,7 +249,6 @@
     timeout: "{{ .download.timeout }}"
 
 - name: Binary | Ensure Harbor binary is present
-  tags: ["image_registry"]
   loop: >
     {{- $result := list -}}
     {{- range $arch := .download.arch }}

cmd/kk/app/options/builtin/artifact.go

@@ -116,7 +116,6 @@ func NewArtifactImagesOptions() *ArtifactImagesOptions {
 func (o *ArtifactImagesOptions) Flags() cliflag.NamedFlagSets {
 	fss := o.CommonOptions.Flags()
 	kfs := fss.FlagSet("config")
-	kfs.StringVar(&o.Kubernetes, "with-kubernetes", o.Kubernetes, fmt.Sprintf("Specify a supported version of kubernetes. default is %s", o.Kubernetes))
 	kfs.BoolVar(&o.Push, "push", o.Push, "Push image to image registry")
 	kfs.BoolVar(&o.Pull, "pull", o.Pull, "Pull image to binary dir")