add calicoctl to artifact

Signed-off-by: pixiake <guofeng@yunify.com>
(cherry picked from commit 4a4c85b36b39b0455288775e2ae9d84b4134a4f8)
Signed-off-by: pixiake <guofeng@yunify.com>

cmd/kk/apis/kubekey/v1alpha2/manifest_types.go

@@ -81,6 +81,10 @@ type DockerCompose struct {
 	Version string `yaml:"version" json:"version"`
 }
 
+type Calicoctl struct {
+	Version string `yaml:"version" json:"version"`
+}
+
 type Components struct {
 	Helm              Helm               `yaml:"helm" json:"helm"`
 	CNI               CNI                `yaml:"cni" json:"cni"`
@@ -90,6 +94,7 @@ type Components struct {
 	DockerRegistry    DockerRegistry     `yaml:"docker-registry" json:"docker-registry"`
 	Harbor            Harbor             `yaml:"harbor" json:"harbor"`
 	DockerCompose     DockerCompose      `yaml:"docker-compose" json:"docker-compose"`
+	Calicoctl         Calicoctl          `yaml:"calicoctl" json:"calicoctl"`
 }
 
 type ManifestRegistry struct {

cmd/kk/pkg/artifact/manifest.go

@@ -163,6 +163,7 @@ func CreateManifest(arg common.Argument, name string) error {
 			CNI:               kubekeyv1alpha2.CNI{Version: kubekeyv1alpha2.DefaultCniVersion},
 			ETCD:              kubekeyv1alpha2.ETCD{Version: kubekeyv1alpha2.DefaultEtcdVersion},
 			Crictl:            kubekeyv1alpha2.Crictl{Version: kubekeyv1alpha2.DefaultCrictlVersion},
+			Calicoctl:         kubekeyv1alpha2.Calicoctl{Version: kubekeyv1alpha2.DefaultCalicoVersion},
 			ContainerRuntimes: containerArr,
 		},
 		Images: imageArr,

cmd/kk/pkg/binaries/kubernetes.go

@@ -108,7 +108,8 @@ func KubernetesArtifactBinariesDownload(manifest *common.ArtifactManifest, path,
 	kubecni := files.NewKubeBinary("kubecni", arch, m.Components.CNI.Version, path, manifest.Arg.DownloadCommand)
 	helm := files.NewKubeBinary("helm", arch, m.Components.Helm.Version, path, manifest.Arg.DownloadCommand)
 	crictl := files.NewKubeBinary("crictl", arch, m.Components.Crictl.Version, path, manifest.Arg.DownloadCommand)
-	binaries := []*files.KubeBinary{kubeadm, kubelet, kubectl, helm, kubecni, etcd}
+	calicoctl := files.NewKubeBinary("calicoctl", arch, m.Components.Calicoctl.Version, path, manifest.Arg.DownloadCommand)
+	binaries := []*files.KubeBinary{kubeadm, kubelet, kubectl, helm, kubecni, etcd, calicoctl}
 
 	containerManagerArr := make([]*files.KubeBinary, 0, 0)
 	containerManagerVersion := make(map[string]struct{})

docs/manifest-example.md

@@ -37,6 +37,8 @@ spec:
       version: v0.9.1
     etcd:
       version: v3.4.13
+    calicoctl:
+      version: v3.23.2
     containerRuntimes:
     - type: docker
       version: 20.10.8
@@ -49,10 +51,10 @@ spec:
     docker-compose:
       version: v2.2.2
   images:
-  - docker.io/calico/cni:v3.20.0
-  - docker.io/calico/kube-controllers:v3.20.0
-  - docker.io/calico/node:v3.20.0
-  - docker.io/calico/pod2daemon-flexvol:v3.20.0
+  - docker.io/calico/cni:v3.23.2
+  - docker.io/calico/kube-controllers:v3.23.2
+  - docker.io/calico/node:v3.23.2
+  - docker.io/calico/pod2daemon-flexvol:v3.23.2
   - docker.io/coredns/coredns:1.8.0
   - docker.io/kubesphere/k8s-dns-node-cache:1.15.12
   - docker.io/kubesphere/kube-apiserver:v1.21.5
@@ -148,4 +150,4 @@ spec:
         skipTLSVerify: false # Allow contacting registries over HTTPS with failed TLS verification.
         plainHTTP: false # Allow contacting registries over HTTP.
         certsPath: "/etc/docker/certs.d/dockerhub.kubekey.local" # Use certificates at path (*.crt, *.cert, *.key) to connect to the registry.
-```
+```