Repository: linkerd/linkerd2
Pull request #4971 (2020-09-14 22:45:14)

Upgrade `grpc-gateway` dependency to avoid warning in logs
This adds a `replace` statement to `go.mod` to force the newer version `1.14.x` of `github.com/grpc-ecosystem/grpc-gateway` to avoid the following warning in all the controller container logs:

```
WARNING: Package "github.com/golang/protobuf/protoc-gen-go/generator" is deprecated.
A future release of golang/protobuf will delete this package,
which has long been excluded from the compatibility promise.
```

More info [here](https://github.com/golang/protobuf/issues/1104)



Patch:
diff --git a/charts/add-ons/tracing/templates/tracing-rbac.yaml b/charts/add-ons/tracing/templates/tracing-rbac.yaml
index 482d8f5e0..f0b02f9b0 100644
--- a/charts/add-ons/tracing/templates/tracing-rbac.yaml
+++ b/charts/add-ons/tracing/templates/tracing-rbac.yaml
@@ -6,10 +6,10 @@
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: {{.Values.collector.name}}
+  name: linkerd-collector
   namespace: {{.Values.global.namespace}}
   labels:
-    {{.Values.global.controllerComponentLabel}}: {{.Values.collector.name}}
+    {{.Values.global.controllerComponentLabel}}: linkerd-collector
     {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
 ---
 ###
@@ -19,8 +19,8 @@ metadata:
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: {{.Values.jaeger.name}}
+  name: linkerd-jaeger
   namespace: {{.Values.global.namespace}}
   labels:
-    {{.Values.global.controllerComponentLabel}}: {{.Values.jaeger.name}}
+    {{.Values.global.controllerComponentLabel}}: linkerd-jaeger
     {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
diff --git a/charts/add-ons/tracing/templates/tracing.yaml b/charts/add-ons/tracing/templates/tracing.yaml
index 55d1476bd..e84c4f852 100644
--- a/charts/add-ons/tracing/templates/tracing.yaml
+++ b/charts/add-ons/tracing/templates/tracing.yaml
@@ -6,10 +6,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{printf "%s-config" .Values.collector.name}}
+  name: linkerd-collector-config
   namespace: {{.Values.global.namespace}}
   labels:
-    {{.Values.global.controllerComponentLabel}}: {{.Values.collector.name}}
+    {{.Values.global.controllerComponentLabel}}: linkerd-collector
     {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
   annotations:
     {{.Values.global.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.global.linkerdVersion) .Values.global.cliVersion}}
@@ -27,16 +27,16 @@ data:
         retry-on-failure: true
         sender-type: jaeger-thrift-http
         jaeger-thrift-http:
-          collector-endpoint: {{printf "http://%s.%s:14268/api/traces" .Values.jaeger.name .Values.global.namespace }}
+          collector-endpoint: {{printf "http://%s.%s:14268/api/traces" "linkerd-jaeger" .Values.global.namespace }}
           timeout: 5s
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{.Values.collector.name}}
+  name: linkerd-collector
   namespace: {{.Values.global.namespace}}
   labels:
-    {{.Values.global.controllerComponentLabel}}: {{.Values.collector.name}}
+    {{.Values.global.controllerComponentLabel}}: linkerd-collector
     {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
   annotations:
     {{.Values.global.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.global.linkerdVersion) .Values.global.cliVersion}}
@@ -52,10 +52,10 @@ spec:
     protocol: TCP
     targetPort: 9411
   selector:
-    {{.Values.global.controllerComponentLabel}}: {{.Values.collector.name}}
+    {{.Values.global.controllerComponentLabel}}: linkerd-collector
 ---
 {{ $_ := set .Values.global.proxy "workloadKind" "deployment" -}}
-{{ $_ := set .Values.global.proxy "component" .Values.collector.name -}}
+{{ $_ := set .Values.global.proxy "component" "linkerd-collector" -}}
 {{ include "linkerd.proxy.validation" .Values.global.proxy -}}
 apiVersion: apps/v1
 kind: Deployment
@@ -63,18 +63,18 @@ metadata:
   annotations:
     {{.Values.global.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.global.linkerdVersion) .Values.global.cliVersion}}
   labels:
-    app.kubernetes.io/name: {{.Values.collector.name}}
+    app.kubernetes.io/name: linkerd-collector
     app.kubernetes.io/part-of: Linkerd
     app.kubernetes.io/version: {{default .Values.global.linkerdVersion .Values.global.controllerImageVersion}}
-    {{.Values.global.controllerComponentLabel}}: {{.Values.collector.name}}
+    {{.Values.global.controllerComponentLabel}}: linkerd-collector
     {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
-  name: {{.Values.collector.name}}
+  name: linkerd-collector
   namespace: {{.Values.global.namespace}}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      {{.Values.global.controllerComponentLabel}}: {{.Values.collector.name}}
+      {{.Values.global.controllerComponentLabel}}: linkerd-collector
       {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
       {{- include "partials.proxy.labels" .Values.global.proxy | nindent 6}}
   minReadySeconds: 5
@@ -88,7 +88,7 @@ spec:
         prometheus.io/port: "8888"
         prometheus.io/scrape: "true"
       labels:
-        {{.Values.global.controllerComponentLabel}}: {{.Values.collector.name}}
+        {{.Values.global.controllerComponentLabel}}: linkerd-collector
         {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
         {{.Values.global.workloadNamespaceLabel}}: {{.Values.global.namespace}}
         {{- include "partials.proxy.labels" .Values.global.proxy | nindent 8}}
@@ -119,20 +119,20 @@ spec:
         {{- end }}
         volumeMounts:
         - mountPath: /conf
-          name: {{ printf "%s-config-val" .Values.collector.name}}
+          name: linkerd-collector-config-val
       - {{- include "partials.proxy" . | indent 8 | trimPrefix (repeat 7 " ") }}
       {{ if not .Values.global.cniEnabled -}}
       initContainers:
       - {{- include "partials.proxy-init" . | indent 8 | trimPrefix (repeat 7 " ") }}
       {{ end -}}
-      serviceAccountName: {{.Values.collector.name}}
+      serviceAccountName: linkerd-collector
       volumes:
       - configMap:
           items:
           - key: linkerd-collector-config
             path: linkerd-collector-config.yaml
-          name: {{printf "%s-config" .Values.collector.name}}
-        name: {{ printf "%s-config-val" .Values.collector.name}}
+          name: linkerd-collector-config
+        name: linkerd-collector-config-val
       {{ if .Values.global.controlPlaneTracing -}}
       - {{- include "partials.proxy.volumes.labels" . | indent 8 | trimPrefix (repeat 7 " ") }}
       {{ end -}}
@@ -148,17 +148,17 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{.Values.jaeger.name}}
+  name: linkerd-jaeger
   namespace: {{.Values.global.namespace}}
   labels:
-    {{.Values.global.controllerComponentLabel}}: {{.Values.jaeger.name}}
+    {{.Values.global.controllerComponentLabel}}: linkerd-jaeger
     {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
   annotations:
     {{.Values.global.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.global.linkerdVersion) .Values.global.cliVersion}}
 spec:
   type: ClusterIP
   selector:
-    {{.Values.global.controllerComponentLabel}}: {{.Values.jaeger.name}}
+    {{.Values.global.controllerComponentLabel}}: linkerd-jaeger
   ports:
     - name: collection
       port: 14268
@@ -166,7 +166,7 @@ spec:
       port: 16686
 ---
 {{ $_ := set .Values.global.proxy "workloadKind" "deployment" -}}
-{{ $_ := set .Values.global.proxy "component" .Values.jaeger.name -}}
+{{ $_ := set .Values.global.proxy "component" "linkerd-jaeger" -}}
 {{ include "linkerd.proxy.validation" .Values.global.proxy -}}
 apiVersion: apps/v1
 kind: Deployment
@@ -174,18 +174,18 @@ metadata:
   annotations:
     {{.Values.global.createdByAnnotation}}: {{default (printf "linkerd/helm %s" .Values.global.linkerdVersion) .Values.global.cliVersion}}
   labels:
-    app.kubernetes.io/name: {{.Values.jaeger.name}}
+    app.kubernetes.io/name: linkerd-jaeger
     app.kubernetes.io/part-of: Linkerd
     app.kubernetes.io/version: {{default .Values.global.linkerdVersion .Values.global.controllerImageVersion}}
-    {{.Values.global.controllerComponentLabel}}: {{.Values.jaeger.name}}
+    {{.Values.global.controllerComponentLabel}}: linkerd-jaeger
     {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
-  name: {{.Values.jaeger.name}}
+  name: linkerd-jaeger
   namespace: {{.Values.global.namespace}}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      {{.Values.global.controllerComponentLabel}}: {{.Values.jaeger.name}}
+      {{.Values.global.controllerComponentLabel}}: linkerd-jaeger
       {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
       {{- include "partials.proxy.labels" .Values.global.proxy | nindent 6}}
   template:
@@ -197,7 +197,7 @@ spec:
         prometheus.io/port: "8888"
         prometheus.io/scrape: "true"
       labels:
-        {{.Values.global.controllerComponentLabel}}: {{.Values.jaeger.name}}
+        {{.Values.global.controllerComponentLabel}}: linkerd-jaeger
         {{.Values.global.controllerNamespaceLabel}}: {{.Values.global.namespace}}
         {{.Values.global.workloadNamespaceLabel}}: {{.Values.global.namespace}}
         {{- include "partials.proxy.labels" .Values.global.proxy | nindent 8}}
diff --git a/charts/add-ons/tracing/values.yaml b/charts/add-ons/tracing/values.yaml
index 9181f68a2..ea38760c5 100644
--- a/charts/add-ons/tracing/values.yaml
+++ b/charts/add-ons/tracing/values.yaml
@@ -1,1 +1,6 @@
-# Default values for tracing.
\ No newline at end of file
+# Default values for tracing.
+collector:
+  image: omnition/opencensus-collector:0.1.11
+  # resources:
+jaeger:
+  image: jaegertracing/all-in-one:1.19.2
\ No newline at end of file
diff --git a/charts/linkerd2/README.md b/charts/linkerd2/README.md
index 9f5b5eea1..a0fddadf3 100644
--- a/charts/linkerd2/README.md
+++ b/charts/linkerd2/README.md
@@ -233,13 +233,11 @@ The following table lists the configurable parameters for the Tracing Add-On.
 | Parameter                                    | Description                                                            | Default                                |
 |:---------------------------------------------|:-----------------------------------------------------------------------|:---------------------------------------|
 | `tracing.enabled`                            | Flag to enable tracing components to be installed                      | `false`                                |
-| `tracing.collector.name`                     | Name of the trace collector Service                                    | `linkerd-collector`                    |
 | `tracing.collector.image`                    | Docker image for the trace collector                                   | `omnition/opencensus-collector:0.1.10` |
 | `tracing.collector.resources.cpu.limit`      | Maximum amount of CPU units that the trace collector container can use | `1`                                    |
 | `tracing.collector.resources.cpu.request`    | Amount of CPU units that the trace collector container requests        | `200m`                                 |
 | `tracing.collector.resources.memory.limit`   | Maximum amount of memory that the trace collector container can use    | `2Gi`                                  |
 | `tracing.collector.resources.memory.request` | Amount of memory that the trace collector container requests           | `400Mi`                                |
-| `tracing.jaeger.name`                        | Name of the jaeger instance                                            | `linkerd-jaeger`                       |
 | `tracing.jaeger.image`                       | Docker image for the jaeger instance                                   | `jaegertracing/all-in-one:1.8`         |
 | `tracing.jaeger.resources.cpu.limit`         | Maximum amount of CPU units that the jaeger container can use          |                                        |
 | `tracing.jaeger.resources.cpu.request`       | Amount of CPU units that the jaeger container requests                 |                                        |
diff --git a/charts/linkerd2/templates/web.yaml b/charts/linkerd2/templates/web.yaml
index 6604fdd67..16ad82d6d 100644
--- a/charts/linkerd2/templates/web.yaml
+++ b/charts/linkerd2/templates/web.yaml
@@ -72,7 +72,7 @@ spec:
         - -grafana-addr=linkerd-grafana.{{.Values.global.namespace}}.svc.{{.Values.global.clusterDomain}}:3000
         {{- end}}
         {{- if .Values.tracing.enabled }}
-        - -jaeger-addr={{.Values.tracing.jaeger.name}}.{{.Values.global.namespace}}.svc.{{.Values.global.clusterDomain}}:16686
+        - -jaeger-addr=linkerd-jaeger.{{.Values.global.namespace}}.svc.{{.Values.global.clusterDomain}}:16686
         {{- end}}
         - -controller-namespace={{.Values.global.namespace}}
         - -log-level={{.Values.global.controllerLogLevel}}
diff --git a/charts/linkerd2/values.yaml b/charts/linkerd2/values.yaml
index 32a279bb4..1d6d22989 100644
--- a/charts/linkerd2/values.yaml
+++ b/charts/linkerd2/values.yaml
@@ -323,11 +323,9 @@ prometheus:
 
 tracing:
   enabled: false
-  collector:
-    name: linkerd-collector
-    image: omnition/opencensus-collector:0.1.11
-    # resources:
-  jaeger:
-    name: linkerd-jaeger
-    image: jaegertracing/all-in-one:1.17.1
-    # resources:
+  # collector:
+  #  image: omnition/opencensus-collector:0.1.11
+  #  resources:
+  # jaeger:
+  #  image: jaegertracing/all-in-one:1.19.2
+  #  resources:
diff --git a/cli/cmd/install-cni-plugin.go b/cli/cmd/install-cni-plugin.go
index 78d6b7e94..18dd2a51d 100644
--- a/cli/cmd/install-cni-plugin.go
+++ b/cli/cmd/install-cni-plugin.go
@@ -104,6 +104,7 @@ assumes that the 'linkerd install' command will be executed with the
 	cmd.PersistentFlags().StringVar(&options.cniPluginImage, "cni-image", options.cniPluginImage, "Image for the cni-plugin")
 	cmd.PersistentFlags().StringVar(&options.logLevel, "cni-log-level", options.logLevel, "Log level for the cni-plugin")
 	cmd.PersistentFlags().StringVar(&options.destCNINetDir, "dest-cni-net-dir", options.destCNINetDir, "Directory on the host where the CNI configuration will be placed")
+	cmd.PersistentFlags().StringVar(&options.destCNIBinDir, "dest-cni-bin-dir", options.destCNIBinDir, "Directory on the host where the CNI binary will be placed")
 	cmd.PersistentFlags().StringVar(&options.priorityClassName, "priority-class-name", options.priorityClassName, "Pod priorityClassName for CNI daemonset's pods")
 	cmd.PersistentFlags().BoolVar(&options.installNamespace, "install-namespace", options.installNamespace, "Whether to create the CNI namespace or not")
 	cmd.PersistentFlags().BoolVar(
diff --git a/go.mod b/go.mod
index aa573b656..9810da612 100644
--- a/go.mod
+++ b/go.mod
@@ -53,7 +53,7 @@ require (
 	golang.org/x/net v0.0.0-20200202094626-16171245cfb2
 	golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 // indirect
 	golang.org/x/tools v0.0.0-20191009213438-b090f1f24028
-	google.golang.org/grpc v1.29.1
+	google.golang.org/grpc v1.31.1
 	google.golang.org/protobuf v1.24.0
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	k8s.io/api v0.17.4
@@ -67,4 +67,9 @@ require (
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace github.com/wercker/stern => github.com/linkerd/stern v0.0.0-20200331220320-37779ceb2c32
+replace (
+	// to avoid the `github.com/golang/protobuf/protoc-gen-go/generator` deprecation warning
+	// (see https://github.com/golang/protobuf/issues/1104)
+	github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.14.8
+	github.com/wercker/stern => github.com/linkerd/stern v0.0.0-20200331220320-37779ceb2c32
+)
diff --git a/go.sum b/go.sum
index b0a383d9a..3e33bfbee 100644
--- a/go.sum
+++ b/go.sum
@@ -45,6 +45,7 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
@@ -258,11 +259,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmg
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.9.4 h1:5xLhQjsk4zqPf9EHCrja2qFZMx+yBqkO3XgJ14bNnU0=
-github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.9.5 h1:UImYN5qQ8tuGpGE16ZmjvcTtTw24zw1QAp/SlnNrZhI=
-github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/grpc-ecosystem/grpc-gateway v1.14.8 h1:hXClj+iFpmLM8i3lkO6i4Psli4P2qObQuQReiII26U8=
+github.com/grpc-ecosystem/grpc-gateway v1.14.8/go.mod h1:NZE8t6vs6TnwLL/ITkaK8W3ecMLGAbh2jXTclvpiwYo=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -305,10 +303,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/linkerd/linkerd2-proxy-api v0.1.13 h1:wk0EZBk1zD1cvnRK7myv+exKUQQbykGWZqVhly6Ws8I=
 github.com/linkerd/linkerd2-proxy-api v0.1.13/go.mod h1:Fpew8Tsm1D70GtuYg7km/PYeZRMUqlxIxwCrId/G+oQ=
-github.com/linkerd/linkerd2-proxy-init v1.3.3 h1:x561EUgmk5aJNDjE7UEEL0r9U4vtM2IK0thuDcSf81g=
-github.com/linkerd/linkerd2-proxy-init v1.3.3/go.mod h1:M6iaaLLi06ofuIV6x74SDknSFi7VS/MFqa5m+CwHgLY=
-github.com/linkerd/linkerd2-proxy-init v1.3.4 h1:oL0yI8ajRRN0cbm1qXbFokcT48SHjYcy5o3nDNn5Vmg=
-github.com/linkerd/linkerd2-proxy-init v1.3.4/go.mod h1:M6iaaLLi06ofuIV6x74SDknSFi7VS/MFqa5m+CwHgLY=
 github.com/linkerd/linkerd2-proxy-init v1.3.6 h1:qRJJJFc2hn/fWGeO4pyyZZvtkhLrE68THg+MRUyCphE=
 github.com/linkerd/linkerd2-proxy-init v1.3.6/go.mod h1:M6iaaLLi06ofuIV6x74SDknSFi7VS/MFqa5m+CwHgLY=
 github.com/linkerd/stern v0.0.0-20200331220320-37779ceb2c32 h1:BIdntxDGoVcFzrihrNcWjdjA92S28cl+/mOC7bsgb3c=
@@ -418,7 +412,7 @@ github.com/prometheus/procfs v0.0.5 h1:3+auTFlqw+ZaQYJARz6ArODtkaIwtvBTx3N2NehQl
 github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
-github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
@@ -525,7 +519,6 @@ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -542,6 +535,7 @@ golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 h1:rjwSpXsdiK0dV8/Naq3kAw9ymfAeJIyd0upUIElB+lI=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
@@ -550,6 +544,8 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
@@ -640,6 +636,7 @@ google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610 h1:Ygq9/SRJX9+dU0W
 google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
@@ -653,6 +650,8 @@ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQ
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.31.1 h1:SfXqXS5hkufcdZ/mHtYCh53P2b+92WQq/DZcKLgsFRs=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -677,14 +676,13 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/pkg/healthcheck/healthcheck_addons.go b/pkg/healthcheck/healthcheck_addons.go
index c426abb91..6ec27d93d 100644
--- a/pkg/healthcheck/healthcheck_addons.go
+++ b/pkg/healthcheck/healthcheck_addons.go
@@ -172,15 +172,22 @@ func (hc *HealthChecker) addOnCategories() []category {
 					check: func(context.Context) error {
 						if tracing, ok := hc.addOns[l5dcharts.TracingAddOn]; ok {
 
-							collector, err := getMap(tracing, "collector")
-							if err != nil {
-								return err
+							collector, mapError := getMap(tracing, "collector")
+
+							collectorName, keyError := getString(collector, "name")
+
+							if errors.Is(mapError, errorKeyNotFound) || errors.Is(keyError, errorKeyNotFound) {
+								// default name of collector instance
+								collectorName = "linkerd-collector"
+							} else {
+								if mapError != nil {
+									return mapError
+								}
+								if keyError != nil {
+									return keyError
+								}
 							}
 
-							collectorName, err := getString(collector, "name")
-							if err != nil {
-								return err
-							}
 							return hc.checkServiceAccounts([]string{collectorName}, hc.ControlPlaneNamespace, "")
 						}
 						return &SkipError{Reason: "tracing add-on not enabled"}
@@ -191,14 +198,20 @@ func (hc *HealthChecker) addOnCategories() []category {
 					warning:     true,
 					check: func(context.Context) error {
 						if tracing, ok := hc.addOns[l5dcharts.TracingAddOn]; ok {
-							jaeger, err := getMap(tracing, "jaeger")
-							if err != nil {
-								return err
-							}
-
-							jaegerName, err := getString(jaeger, "name")
-							if err != nil {
-								return err
+							jaeger, mapError := getMap(tracing, "jaeger")
+
+							jaegerName, keyError := getString(jaeger, "name")
+
+							if errors.Is(mapError, errorKeyNotFound) || errors.Is(keyError, errorKeyNotFound) {
+								// default name of jaeger instance
+								jaegerName = "linkerd-jaeger"
+							} else {
+								if mapError != nil {
+									return mapError
+								}
+								if keyError != nil {
+									return keyError
+								}
 							}
 
 							return hc.checkServiceAccounts([]string{jaegerName}, hc.ControlPlaneNamespace, "")
@@ -211,17 +224,23 @@ func (hc *HealthChecker) addOnCategories() []category {
 					warning:     true,
 					check: func(context.Context) error {
 						if tracing, ok := hc.addOns[l5dcharts.TracingAddOn]; ok {
-							collector, err := getMap(tracing, "collector")
-							if err != nil {
-								return err
-							}
-
-							collectorName, err := getString(collector, "name")
-							if err != nil {
-								return err
+							collector, mapError := getMap(tracing, "collector")
+
+							collectorName, keyError := getString(collector, "name")
+
+							if errors.Is(mapError, errorKeyNotFound) || errors.Is(keyError, errorKeyNotFound) {
+								// default name of collector instance
+								collectorName = "linkerd-collector"
+							} else {
+								if mapError != nil {
+									return mapError
+								}
+								if keyError != nil {
+									return keyError
+								}
 							}
 
-							_, err = hc.kubeAPI.CoreV1().ConfigMaps(hc.ControlPlaneNamespace).Get(fmt.Sprintf("%s-config", collectorName), metav1.GetOptions{})
+							_, err := hc.kubeAPI.CoreV1().ConfigMaps(hc.ControlPlaneNamespace).Get(fmt.Sprintf("%s-config", collectorName), metav1.GetOptions{})
 							if err != nil {
 								return err
 							}
@@ -350,7 +369,7 @@ func getMap(i interface{}, k string) (map[string]interface{}, error) {
 
 	v, ok := m[k]
 	if !ok {
-		return nil, fmt.Errorf("key '%s' not found in config value", k)
+		return nil, errorKeyNotFound
 	}
 
 	res, ok := v.(map[string]interface{})


Test patch:
diff --git a/cli/cmd/testdata/addon_config_overwrite.yaml b/cli/cmd/testdata/addon_config_overwrite.yaml
index 8f725d4e1..dfc10b4fa 100644
--- a/cli/cmd/testdata/addon_config_overwrite.yaml
+++ b/cli/cmd/testdata/addon_config_overwrite.yaml
@@ -1,5 +1,4 @@
 tracing:
   enabled: true
   collector:
-    name: overwrite-collector
     image: overwrite-collector-image
diff --git a/cli/cmd/testdata/install_addon_control-plane.golden b/cli/cmd/testdata/install_addon_control-plane.golden
index 588fe400b..be622c29e 100644
--- a/cli/cmd/testdata/install_addon_control-plane.golden
+++ b/cli/cmd/testdata/install_addon_control-plane.golden
@@ -1825,13 +1825,7 @@ data:
     prometheus:
       enabled: true
     tracing:
-      collector:
-        image: omnition/opencensus-collector:0.1.11
-        name: linkerd-collector
       enabled: true
-      jaeger:
-        image: jaegertracing/all-in-one:1.17.1
-        name: linkerd-jaeger
 ---
 ###
 ### Grafana
@@ -2868,7 +2862,7 @@ spec:
       containers:
       - args:
         - --query.base-path=/jaeger
-        image: jaegertracing/all-in-one:1.17.1
+        image: jaegertracing/all-in-one:1.19.2
         imagePullPolicy: IfNotPresent
         name: jaeger
         ports:
diff --git a/cli/cmd/testdata/install_helm_output_addons.golden b/cli/cmd/testdata/install_helm_output_addons.golden
index 23ee091a5..b898c1330 100644
--- a/cli/cmd/testdata/install_helm_output_addons.golden
+++ b/cli/cmd/testdata/install_helm_output_addons.golden
@@ -2659,11 +2659,9 @@ data:
     tracing:
       collector:
         image: omnition/opencensus-collector:0.1.11
-        name: linkerd-collector
       enabled: true
       jaeger:
-        image: jaegertracing/all-in-one:1.17.1
-        name: linkerd-jaeger
+        image: jaegertracing/all-in-one:1.19.2
 ---
 # Source: linkerd2/charts/grafana/templates/grafana-rbac.yaml
 ---
@@ -3759,7 +3757,7 @@ spec:
       containers:
       - args:
         - --query.base-path=/jaeger
-        image: jaegertracing/all-in-one:1.17.1
+        image: jaegertracing/all-in-one:1.19.2
         imagePullPolicy: IfNotPresent
         name: jaeger
         ports:
diff --git a/cli/cmd/testdata/install_tracing.golden b/cli/cmd/testdata/install_tracing.golden
index 182033679..b5a450f6d 100644
--- a/cli/cmd/testdata/install_tracing.golden
+++ b/cli/cmd/testdata/install_tracing.golden
@@ -2613,13 +2613,7 @@ data:
     prometheus:
       enabled: true
     tracing:
-      collector:
-        image: omnition/opencensus-collector:0.1.11
-        name: linkerd-collector
       enabled: true
-      jaeger:
-        image: jaegertracing/all-in-one:1.17.1
-        name: linkerd-jaeger
 ---
 ###
 ### Grafana RBAC
@@ -3736,7 +3730,7 @@ spec:
       containers:
       - args:
         - --query.base-path=/jaeger
-        image: jaegertracing/all-in-one:1.17.1
+        image: jaegertracing/all-in-one:1.19.2
         imagePullPolicy: IfNotPresent
         name: jaeger
         ports:
diff --git a/cli/cmd/testdata/install_tracing_overwrite.golden b/cli/cmd/testdata/install_tracing_overwrite.golden
index 3a98615c8..7e774210e 100644
--- a/cli/cmd/testdata/install_tracing_overwrite.golden
+++ b/cli/cmd/testdata/install_tracing_overwrite.golden
@@ -2615,11 +2615,7 @@ data:
     tracing:
       collector:
         image: overwrite-collector-image
-        name: overwrite-collector
       enabled: true
-      jaeger:
-        image: jaegertracing/all-in-one:1.17.1
-        name: linkerd-jaeger
 ---
 ###
 ### Grafana RBAC
@@ -3384,10 +3380,10 @@ spec:
 kind: ServiceAccount
 apiVersion: v1
 metadata:
-  name: overwrite-collector
+  name: linkerd-collector
   namespace: linkerd
   labels:
-    linkerd.io/control-plane-component: overwrite-collector
+    linkerd.io/control-plane-component: linkerd-collector
     linkerd.io/control-plane-ns: linkerd
 ---
 ###
@@ -3410,10 +3406,10 @@ metadata:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: overwrite-collector-config
+  name: linkerd-collector-config
   namespace: linkerd
   labels:
-    linkerd.io/control-plane-component: overwrite-collector
+    linkerd.io/control-plane-component: linkerd-collector
     linkerd.io/control-plane-ns: linkerd
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
@@ -3437,10 +3433,10 @@ data:
 apiVersion: v1
 kind: Service
 metadata:
-  name: overwrite-collector
+  name: linkerd-collector
   namespace: linkerd
   labels:
-    linkerd.io/control-plane-component: overwrite-collector
+    linkerd.io/control-plane-component: linkerd-collector
     linkerd.io/control-plane-ns: linkerd
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
@@ -3456,7 +3452,7 @@ spec:
     protocol: TCP
     targetPort: 9411
   selector:
-    linkerd.io/control-plane-component: overwrite-collector
+    linkerd.io/control-plane-component: linkerd-collector
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -3464,20 +3460,20 @@ metadata:
   annotations:
     linkerd.io/created-by: linkerd/cli dev-undefined
   labels:
-    app.kubernetes.io/name: overwrite-collector
+    app.kubernetes.io/name: linkerd-collector
     app.kubernetes.io/part-of: Linkerd
     app.kubernetes.io/version: install-control-plane-version
-    linkerd.io/control-plane-component: overwrite-collector
+    linkerd.io/control-plane-component: linkerd-collector
     linkerd.io/control-plane-ns: linkerd
-  name: overwrite-collector
+  name: linkerd-collector
   namespace: linkerd
 spec:
   replicas: 1
   selector:
     matchLabels:
-      linkerd.io/control-plane-component: overwrite-collector
+      linkerd.io/control-plane-component: linkerd-collector
       linkerd.io/control-plane-ns: linkerd
-      linkerd.io/proxy-deployment: overwrite-collector
+      linkerd.io/proxy-deployment: linkerd-collector
   minReadySeconds: 5
   progressDeadlineSeconds: 120
   template:
@@ -3490,10 +3486,10 @@ spec:
         prometheus.io/port: "8888"
         prometheus.io/scrape: "true"
       labels:
-        linkerd.io/control-plane-component: overwrite-collector
+        linkerd.io/control-plane-component: linkerd-collector
         linkerd.io/control-plane-ns: linkerd
         linkerd.io/workload-ns: linkerd
-        linkerd.io/proxy-deployment: overwrite-collector
+        linkerd.io/proxy-deployment: linkerd-collector
     spec:
       containers:
       - command:
@@ -3518,7 +3514,7 @@ spec:
             port: 13133
         volumeMounts:
         - mountPath: /conf
-          name: overwrite-collector-config-val
+          name: linkerd-collector-config-val
       - env:
         - name: LINKERD2_PROXY_LOG
           value: warn,linkerd=info
@@ -3634,6 +3630,8 @@ spec:
         - "2102"
         - --inbound-ports-to-ignore
         - 4190,4191
+        - --outbound-ports-to-ignore
+        - "443"
         image: ghcr.io/linkerd/proxy-init:v1.3.6
         imagePullPolicy: IfNotPresent
         name: linkerd-init
@@ -3658,14 +3656,14 @@ spec:
         volumeMounts:
         - mountPath: /run
           name: linkerd-proxy-init-xtables-lock
-      serviceAccountName: overwrite-collector
+      serviceAccountName: linkerd-collector
       volumes:
       - configMap:
           items:
           - key: linkerd-collector-config
             path: linkerd-collector-config.yaml
-          name: overwrite-collector-config
-        name: overwrite-collector-config-val
+          name: linkerd-collector-config
+        name: linkerd-collector-config-val
       - emptyDir: {}
         name: linkerd-proxy-init-xtables-lock
       - emptyDir:
@@ -3734,7 +3732,7 @@ spec:
       containers:
       - args:
         - --query.base-path=/jaeger
-        image: jaegertracing/all-in-one:1.17.1
+        image: jaegertracing/all-in-one:1.19.2
         imagePullPolicy: IfNotPresent
         name: jaeger
         ports:
diff --git a/cli/cmd/upgrade_test.go b/cli/cmd/upgrade_test.go
index 8e7377a78..d6b0bcafd 100644
--- a/cli/cmd/upgrade_test.go
+++ b/cli/cmd/upgrade_test.go
@@ -303,8 +303,8 @@ func TestUpgradeOverwriteTracingAddon(t *testing.T) {
 
 	installOpts.addOnConfig = filepath.Join("testdata", "addon_config.yaml")
 	upgradeOpts.addOnConfig = filepath.Join("testdata", "addon_config_overwrite.yaml")
-	upgradeOpts.traceCollector = "overwrite-collector"
-	upgradeOpts.traceCollectorSvcAccount = "overwrite-collector.default"
+	upgradeOpts.traceCollector = "linkerd-collector"
+	upgradeOpts.traceCollectorSvcAccount = "linkerd-collector.default"
 	install, upgrade, err := renderInstallAndUpgrade(t, installOpts, installFlags, upgradeOpts, upgradeFlags)
 	if err != nil {
 		t.Fatal(err)
@@ -314,11 +314,7 @@ func TestUpgradeOverwriteTracingAddon(t *testing.T) {
 	upgradeManifests := parseManifestList(upgrade.String())
 	diffMap := diffManifestLists(expectedManifests, upgradeManifests)
 	tracingManifests := []string{
-		"ConfigMap/linkerd-config-addons",
-		"Service/overwrite-collector", "ConfigMap/overwrite-collector-config",
-		"ServiceAccount/overwrite-collector", "Deployment/overwrite-collector",
-		"Service/linkerd-collector", "ConfigMap/linkerd-collector-config",
-		"ServiceAccount/linkerd-collector", "Deployment/linkerd-collector",
+		"ConfigMap/linkerd-config-addons", "Deployment/linkerd-collector",
 	}
 	for _, id := range tracingManifests {
 		if _, ok := diffMap[id]; ok {