fix update image registry and repository

DaoCloud · Apr 26, 2024 · a6f2c15 · a6f2c15
1 parent 2b4af0c
commit a6f2c15
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/internal/chart/chart.go b/internal/chart/chart.go
@@ -13,16 +13,21 @@ import (
 
 var (
 	repositoryRegex = regexp.MustCompile(`(?m)(repository:[[:blank:]])(.*)(/)`)
-	registryRegex   = regexp.MustCompile(`(?m)(registry:[[:blank:]])(.*)(.*$)`)
+	registryRegex   = regexp.MustCompile(`(?m)(registry|imageRegistry:[[:blank:]])(.*)(.*$)`)
 )
 
 // updateValuesFile performs some substitutions to a given values.yaml file.
 func updateValuesFile(valuesFile string, targetRepo *api.Target) error {
-	if err := updateContainerImageRegistry(valuesFile, targetRepo); err != nil {
-		return errors.Annotatef(err, "error updating %s file", valuesFile)
+	if targetRepo.ContainerRegistry != "" {
+		if err := updateContainerImageRegistry(valuesFile, targetRepo); err != nil {
+			return errors.Annotatef(err, "error updating %s file", valuesFile)
+		}
 	}
-	if err := updateContainerImageRepository(valuesFile, targetRepo); err != nil {
-		return errors.Annotatef(err, "error updating %s file", valuesFile)
+
+	if targetRepo.ContainerRepository != "" {
+		if err := updateContainerImageRepository(valuesFile, targetRepo); err != nil {
+			return errors.Annotatef(err, "error updating %s file", valuesFile)
+		}
 	}
 	return nil
 }