Merge pull request #5540 from luomengY/keadminit_image_repository

Add the  image-repository  address of the container in keadm init/upgrade.

4 files changed, 16 insertions, 0 deletions

diff --git a/keadm/cmd/keadm/app/cmd/cloud/init.go b/keadm/cmd/keadm/app/cmd/cloud/init.go
index fd70ff6d0..e040070ce 100644
--- a/keadm/cmd/keadm/app/cmd/cloud/init.go
+++ b/keadm/cmd/keadm/app/cmd/cloud/init.go
@@ -98,6 +98,9 @@ func addInitOtherFlags(cmd *cobra.Command, initOpts *types.InitOptions) {
 
 	cmd.Flags().StringVar(&initOpts.ExternalHelmRoot, types.FlagNameExternalHelmRoot, initOpts.ExternalHelmRoot,
 		"Add external helm root path to keadm.")
+
+	cmd.Flags().StringVar(&initOpts.ImageRepository, types.FlagNameImageRepository, initOpts.ImageRepository,
+		"Choose a container image repository to pull the image of the kubedge component.")
 }
 
 func addHelmValueOptionsFlags(cmd *cobra.Command, initOpts *types.InitOptions) {
diff --git a/keadm/cmd/keadm/app/cmd/cloud/upgrade.go b/keadm/cmd/keadm/app/cmd/cloud/upgrade.go
index 21081beb6..cdd72dfc0 100644
--- a/keadm/cmd/keadm/app/cmd/cloud/upgrade.go
+++ b/keadm/cmd/keadm/app/cmd/cloud/upgrade.go
@@ -82,4 +82,7 @@ func addUpgradeOptionFlags(cmd *cobra.Command, opts *types.CloudUpgradeOptions)
 
 	fs.BoolVar(&opts.PrintFinalValues, types.FlagNamePrintFinalValues, false,
 		"Print the final values configuration for debuging")
+
+	fs.StringVar(&opts.ImageRepository, types.FlagNameImageRepository, opts.ImageRepository,
+		"Choose a container image repository to pull the image of the kubedge component.")
 }
diff --git a/keadm/cmd/keadm/app/cmd/common/types.go b/keadm/cmd/keadm/app/cmd/common/types.go
index 5b1a75daa..20bb20242 100644
--- a/keadm/cmd/keadm/app/cmd/common/types.go
+++ b/keadm/cmd/keadm/app/cmd/common/types.go
@@ -35,6 +35,7 @@ type CloudInitUpdateBase struct {
 	Force            bool
 	DryRun           bool
 	PrintFinalValues bool
+	ImageRepository  string
 }
 
 const requiredSetSplitLen = 2
diff --git a/keadm/cmd/keadm/app/cmd/helm/cloudcore.go b/keadm/cmd/keadm/app/cmd/helm/cloudcore.go
index 0eb9d66af..2372c71b6 100644
--- a/keadm/cmd/keadm/app/cmd/helm/cloudcore.go
+++ b/keadm/cmd/keadm/app/cmd/helm/cloudcore.go
@@ -66,6 +66,7 @@ const (
 )
 
 var setsKeyImageTags = []string{"cloudCore.image.tag", "iptablesManager.image.tag", "controllerManager.image.tag"}
+var setsKeyImageRepositories = map[string]string{"cloudCore.image.repository": "cloudcore", "iptablesManager.image.repository": "iptables-manager", "controllerManager.image.repository": "controller-manager"}
 
 var helmSettings = helmcli.New()
 
@@ -307,6 +308,14 @@ func appendDefaultSets(version, advertiseAddress string, opts *types.CloudInitUp
 			}
 		}
 	}
+	if opts.ImageRepository != "" {
+		opts.ImageRepository = strings.TrimSuffix(opts.ImageRepository, "/")
+		for k, v := range setsKeyImageRepositories {
+			if !opts.HasSets(k) {
+				opts.Sets = append(opts.Sets, fmt.Sprintf("%s=%s", k, opts.ImageRepository+"/"+v))
+			}
+		}
+	}
 	if advertiseAddress != "" {
 		for index, addr := range strings.Split(advertiseAddress, ",") {
 			opts.Sets = append(opts.Sets, fmt.Sprintf("%s[%d]=%s",