cli: inconsistent precedence for registry flag

Problem: Commands `jaeger install`, `multicluster link` give precedence to `LINKERD_DOCKER_REGISTRY` env var, whereas commands `install`, `upgrade` and `inject` give preference to `--register` flag. Solution: Make the commands consitent by giving precedence to `--register` flag in all commands. Fixes: #11115 Signed-off-by: Harsh Soni <[email protected]>
linkerd · Jul 24, 2023 · 926ce87 · 926ce87
1 parent bc484be
commit 926ce87
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/jaeger/cmd/install.go b/jaeger/cmd/install.go
@@ -151,13 +151,14 @@ func render(w io.Writer, valuesOverrides map[string]interface{}, registry string
 	}
 
 	regOrig := vals["webhook"].(map[string]interface{})["image"].(map[string]interface{})["name"].(string)
-	if registry != "" {
-		vals["webhook"].(map[string]interface{})["image"].(map[string]interface{})["name"] = pkgcmd.RegistryOverride(regOrig, registry)
-	}
-	// env var overrides CLI flag
+
 	if override := os.Getenv(flags.EnvOverrideDockerRegistry); override != "" {
 		vals["webhook"].(map[string]interface{})["image"].(map[string]interface{})["name"] = pkgcmd.RegistryOverride(regOrig, override)
 	}
+	// CLI flag overrides env variable
+	if registry != "" {
+		vals["webhook"].(map[string]interface{})["image"].(map[string]interface{})["name"] = cmd.RegistryOverride(regOrig, registry)
+	}
 
 	fullValues := map[string]interface{}{
 		"Values": vals,

diff --git a/multicluster/cmd/link.go b/multicluster/cmd/link.go
@@ -53,6 +53,13 @@ type (
 
 func newLinkCommand() *cobra.Command {
 	opts, err := newLinkOptionsWithDefault()
+
+	// Override the default value with env registry path.
+	// If cli cmd contains --registry flag, it will override env variable.
+	if registry := os.Getenv(flags.EnvOverrideDockerRegistry); registry != "" {
+		opts.dockerRegistry = registry
+	}
+
 	var valuesOptions valuespkg.Options
 
 	if err != nil {
@@ -423,10 +430,6 @@ func buildServiceMirrorValues(opts *linkOptions) (*multicluster.Values, error) {
 		return nil, err
 	}
 
-	if reg := os.Getenv(flags.EnvOverrideDockerRegistry); reg != "" {
-		opts.dockerRegistry = reg
-	}
-
 	defaults.TargetClusterName = opts.clusterName
 	defaults.ServiceMirrorRetryLimit = opts.serviceMirrorRetryLimit
 	defaults.LogLevel = opts.logLevel