Automatic merge from release/2.3.0 -> release/2.4.0

* commit '0b08b4a3eb96b17b2ea1a51f483d2c48f764348e':
  climc: allow config k8s node docker registry

cmd/climc/shell/k8s/k8s.go

@@ -155,6 +155,7 @@ func initK8sClusterResource(kind string, manager modules.Manager) *ShellCommands
 			return nil
 		},
 	)
+
 	return NewShellCommands(cmdN).AddR(listCmd, getCmd, deleteCmd)
 }
 

cmd/climc/shell/k8s/nodes.go

@@ -67,4 +67,12 @@ func initNode() {
 		fmt.Println(ret)
 		return nil
 	})
+
+	R(&o.NodeConfigDockerRegistryOptions{}, cmdN("config-docker-registry"), "Config node docker daemon registry",
+		func(s *mcclient.ClientSession, args *o.NodeConfigDockerRegistryOptions) error {
+			params := args.Params()
+			ret := k8s.Nodes.BatchPerformAction(s, args.ID, "config-docker-registry", params)
+			printBatchResults(ret, k8s.Nodes.GetColumns(s))
+			return nil
+		})
 }

pkg/mcclient/options/k8s/node.go

@@ -67,3 +67,20 @@ func (o NodeCreateOptions) Params() *jsonutils.JSONDict {
 	}
 	return params
 }
+
+type NodeConfigDockerRegistryOptions struct {
+	IdentsOptions
+	RegistryMirror   []string `help:"Docker registry mirrors, e.g. 'https://registry.docker-cn.com'"`
+	InsecureRegistry []string `help:"Docker insecure registry"`
+}
+
+func (o NodeConfigDockerRegistryOptions) Params() jsonutils.JSONObject {
+	dockerConf := dockerConfig{}
+	for _, rm := range o.RegistryMirror {
+		dockerConf.RegistryMirrors = append(dockerConf.RegistryMirrors, rm)
+	}
+	for _, im := range o.InsecureRegistry {
+		dockerConf.InsecureRegistries = append(dockerConf.InsecureRegistries, im)
+	}
+	return jsonutils.Marshal(dockerConf)
+}