From 1226b90983150529d7ce3b13bdf5750545c4b52d Mon Sep 17 00:00:00 2001 From: Alex Leong Date: Wed, 20 Nov 2024 23:32:54 +0000 Subject: [PATCH] Respect LINKERD_DOCKER_REGISTRY env var Signed-off-by: Alex Leong --- multicluster/cmd/install.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/multicluster/cmd/install.go b/multicluster/cmd/install.go index 3bb48cdd8b420..b8b9c88d0447a 100644 --- a/multicluster/cmd/install.go +++ b/multicluster/cmd/install.go @@ -14,6 +14,7 @@ import ( multicluster "github.com/linkerd/linkerd2/multicluster/values" "github.com/linkerd/linkerd2/pkg/charts" partials "github.com/linkerd/linkerd2/pkg/charts/static" + "github.com/linkerd/linkerd2/pkg/cmd" pkgcmd "github.com/linkerd/linkerd2/pkg/cmd" "github.com/linkerd/linkerd2/pkg/flags" "github.com/linkerd/linkerd2/pkg/healthcheck" @@ -233,6 +234,10 @@ func buildMulticlusterInstallValues(ctx context.Context, opts *multiclusterInsta return nil, err } + if reg := os.Getenv(flags.EnvOverrideDockerRegistry); reg != "" { + defaults.LocalServiceMirror.Image.Name = cmd.RegistryOverride(defaults.LocalServiceMirror.Image.Name, reg) + } + defaults.LocalServiceMirror.Image.Version = version.Version defaults.Gateway.Enabled = opts.gateway.Enabled defaults.Gateway.Port = opts.gateway.Port