From cd8ef3880bcc192a94c1d1731cce53156b7696c0 Mon Sep 17 00:00:00 2001
From: Tarun Pothulapati <tarunpothulapati@outlook.com>
Date: Wed, 27 May 2020 15:02:54 +0000
Subject: [PATCH] Remove proxy.image.version check in templates (#4432)

This check seems redundant, as the values are being populated early. To make the template files cleaner, this is being removed.
---
 charts/add-ons/tracing/templates/tracing.yaml | 6 ------
 charts/linkerd2/templates/prometheus.yaml     | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/charts/add-ons/tracing/templates/tracing.yaml b/charts/add-ons/tracing/templates/tracing.yaml
index ccba0f959..64007be75 100644
--- a/charts/add-ons/tracing/templates/tracing.yaml
+++ b/charts/add-ons/tracing/templates/tracing.yaml
@@ -54,9 +54,6 @@ spec:
   selector:
     {{.Values.global.controllerComponentLabel}}: {{.Values.collector.name}}
 ---
-{{ if empty .Values.global.proxy.image.version -}}
-{{ $_ := set .Values.global.proxy.image "Version" .Values.global.linkerdVersion -}}
-{{ end -}}
 {{ $_ := set .Values.global.proxy "workloadKind" "deployment" -}}
 {{ $_ := set .Values.global.proxy "component" .Values.collector.name -}}
 {{ include "linkerd.proxy.validation" .Values.global.proxy -}}
@@ -165,9 +162,6 @@ spec:
     - name: ui
       port: 16686
 ---
-{{ if empty .Values.global.proxy.image.version -}}
-{{ $_ := set .Values.global.proxy.image "Version" .Values.global.linkerdVersion -}}
-{{ end -}}
 {{ $_ := set .Values.global.proxy "workloadKind" "deployment" -}}
 {{ $_ := set .Values.global.proxy "component" .Values.jaeger.name -}}
 {{ include "linkerd.proxy.validation" .Values.global.proxy -}}
diff --git a/charts/linkerd2/templates/prometheus.yaml b/charts/linkerd2/templates/prometheus.yaml
index c1142d81c..ca4ffb69d 100644
--- a/charts/linkerd2/templates/prometheus.yaml
+++ b/charts/linkerd2/templates/prometheus.yaml
@@ -173,9 +173,6 @@ spec:
     port: 9090
     targetPort: 9090
 ---
-{{ if empty .Values.global.proxy.image.version -}}
-{{ $_ := set .Values.global.proxy.image "Version" .Values.global.linkerdVersion -}}
-{{ end -}}
 {{ $_ := set .Values.global.proxy "workloadKind" "deployment" -}}
 {{ $_ := set .Values.global.proxy "component" "linkerd-prometheus" -}}
 {{ include "linkerd.proxy.validation" .Values.global.proxy -}}