Skip to content

Commit

Permalink
Respect LINKERD_DOCKER_REGISTRY env var
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Leong <[email protected]>
  • Loading branch information
adleong committed Nov 20, 2024
1 parent 9428831 commit 1226b90
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions multicluster/cmd/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 1226b90

Please sign in to comment.