linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Tarun Pothulapati 2020-05-27 15:02:54 +00:00 committed by GitHub
parent 4879f07334
commit cd8ef3880b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
charts/add-ons/tracing/templates/tracing.yaml
View File

@ -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 -}}

3
charts/linkerd2/templates/prometheus.yaml
View File

@ -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 -}}