Repository: linkerd/linkerd2
Pull request #4951 (2020-09-09 08:07:59)

tracing: Move default values into addon-chart
This branch updates the tracing add-on's values into their own chart's values.yaml
(just like grafana and prometheus). This prevents them from being saved into
`linkerd-config-addons` where only the overridden values are stored. Thus allowing
us to change the defaults.

This also
-  Updates the check command to fall back to default values, if there are no
overridden name fields.
- Updates jaeger to `1.19.2`

Signed-off-by: Tarun Pothulapati <tarunpothulapati@outlook.com>

<!--  Thanks for sending a pull request!

If you already have a well-structured git commit message, chances are GitHub
set the title and description of this PR to the git commit message subject and
body, respectively. If so, you may delete these instructions and submit your PR.

If this is your first time, please read our contributor guide:
https://github.com/linkerd/linkerd2/blob/main/CONTRIBUTING.md

The title and description of your Pull Request should match the git commit
subject and body, respectively. Git commit messages are structured as follows:

```
Subject

Problem

Solution

Validation

Fixes #[GitHub issue ID]

DCO Sign off
```

Example git commit message:

```
Introduce Pull Request Template

GitHub's community guidelines recommend a pull request template, the repo was
lacking one.

Introduce a `PULL_REQUEST_TEMPLATE.md` file.

Once merged, the
[Community profile checklist](https://github.com/linkerd/linkerd2/community)
should indicate the repo now provides a pull request template.

Fixes #3321

Signed-off-by: Jane Smith <jane.smith@example.com>
```

Note the git commit message subject becomes the pull request title.

For more details around git commits, see the section on Committing in our
contributor guide:
https://github.com/linkerd/linkerd2/blob/main/CONTRIBUTING.md#committing
-->



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/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 {