Review updates; defensive coding for debug container on registry over…

…ride and correction to README Signed-off-by: Paul Balogh <javaducky@gmail.com>
linkerd · Jan 14, 2020 · f62f4cb · f62f4cb
1 parent 1daf064
commit f62f4cb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/charts/linkerd2/README.md b/charts/linkerd2/README.md
@@ -97,7 +97,7 @@ The following table lists the configurable parameters of the Linkerd2 chart and
 | `controllerUID`                       | User ID for the control plane components                                                                                                                                              | `2103`                               |
 | `identity.issuer.clockSkewAllowance`  | Amount of time to allow for clock skew within a Linkerd cluster                                                                                                                       | `20s`                                |
 | `dashboard.replicas`                  | Number of replicas of dashboard                                                                                                                                                       | `1`                                  |
-| `debugContainer.image.name`           | Docker image for the debug container                                                                                                                                                  | `gcr.io/linkerd-io/proxy`            |
+| `debugContainer.image.name`           | Docker image for the debug container                                                                                                                                                  | `gcr.io/linkerd-io/debug`            |
 | `debugContainer.image.pullPolicy`     | Pull policy for the debug container Docker image                                                                                                                                      | `IfNotPresent`                       |
 | `debugContainer.image.version`        | Tag for the debug container Docker image                                                                                                                                              | latest version                       |
 | `identity.issuer.scheme`              | Which scheme is used for the identity issuer secret format                                                                                                                            | `linkerd.io/tls`                     |

diff --git a/cli/cmd/inject.go b/cli/cmd/inject.go
@@ -367,9 +367,12 @@ func (options *proxyConfigOptions) overrideConfigs(configs *cfg.All, overrideAnn
 	}
 
 	if options.dockerRegistry != "" {
-		currentProxyImage := configs.Proxy.ProxyImage.ImageName
-		currentProxyInitImage := configs.Proxy.ProxyInitImage.ImageName
-		currentDebugImage := configs.Proxy.DebugImage.ImageName
+		currentProxyImage := configs.GetProxy().GetProxyImage().GetImageName()
+		currentProxyInitImage := configs.GetProxy().GetProxyInitImage().GetImageName()
+		currentDebugImage := configs.GetProxy().GetDebugImage().GetImageName()
+		if currentDebugImage == "" {
+			currentDebugImage = k8s.DebugSidecarImage
+		}
 
 		currentRegistry := getFlagValue(configs.GetInstall().GetFlags(), "registry")
 		if currentRegistry == "" {

diff --git a/pkg/k8s/labels.go b/pkg/k8s/labels.go
@@ -218,6 +218,9 @@ const (
 	// DebugSidecarName is the name of the default linkerd debug container
 	DebugSidecarName = "linkerd-debug"
 
+	// DebugSidecarImage is the image name of the default linkerd debug container
+	DebugSidecarImage = "gcr.io/linkerd-io/debug"
+
 	// InitContainerName is the name assigned to the injected init container.
 	InitContainerName = "linkerd-init"