fix: do not set default image registry (#114)

(cherry picked from commit 5df7e8a)
apecloud · Dec 15, 2023 · 73b949b · 73b949b
1 parent f5649fc
commit 73b949b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/cmd/addon/addon.go b/pkg/cmd/addon/addon.go
@@ -704,7 +704,9 @@ func (o *addonCmdOpts) buildHelmPatch(result map[string]interface{}) error {
 		helmSpec.InstallValues.SetValues = o.addonEnableFlags.SetValues
 	}
 	// set resource registry
-	helmSpec.InstallValues.SetValues = append(helmSpec.InstallValues.SetValues, fmt.Sprintf("%s=%s", types.ImageRegistryKey, viper.Get(types.CfgKeyImageRegistry)))
+	if viper.Get(types.CfgKeyImageRegistry) != "" {
+		helmSpec.InstallValues.SetValues = append(helmSpec.InstallValues.SetValues, fmt.Sprintf("%s=%s", types.ImageRegistryKey, viper.Get(types.CfgKeyImageRegistry)))
+	}
 
 	b, err := json.Marshal(&helmSpec)
 	if err != nil {

diff --git a/pkg/cmd/cli.go b/pkg/cmd/cli.go
@@ -250,7 +250,6 @@ func initConfig() {
 	viper.SetDefault(types.CfgKeyClusterDefaultMemory, "1Gi")
 
 	viper.SetDefault(types.CfgKeyHelmRepoURL, "")
-	viper.SetDefault(types.CfgKeyImageRegistry, "infracreate-registry.cn-zhangjiakou.cr.aliyuncs.com")
 	// If a config file is found, read it in.
 	if err := viper.ReadInConfig(); err == nil {
 		fmt.Fprintln(os.Stderr, "Using config file:", viper.ConfigFileUsed())