From b0b2ff0b71f3cecc21c8888730254c08795bc3e0 Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Fri, 3 May 2019 00:55:53 +0100
Subject: [PATCH] Set default image tags to chart appVersion

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 .../charts/cert-manager/cainjector/templates/deployment.yaml  | 2 +-
 deploy/charts/cert-manager/cainjector/values.yaml             | 4 +++-
 deploy/charts/cert-manager/templates/deployment.yaml          | 2 +-
 deploy/charts/cert-manager/values.yaml                        | 4 +++-
 deploy/charts/cert-manager/webhook/templates/deployment.yaml  | 2 +-
 deploy/charts/cert-manager/webhook/values.yaml                | 4 +++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/deploy/charts/cert-manager/cainjector/templates/deployment.yaml b/deploy/charts/cert-manager/cainjector/templates/deployment.yaml
index 0d8e8d5e8..cd866415c 100644
--- a/deploy/charts/cert-manager/cainjector/templates/deployment.yaml
+++ b/deploy/charts/cert-manager/cainjector/templates/deployment.yaml
@@ -34,7 +34,7 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
           {{- if .Values.global.logLevel }}
diff --git a/deploy/charts/cert-manager/cainjector/values.yaml b/deploy/charts/cert-manager/cainjector/values.yaml
index f482d04f7..8d19ae12f 100644
--- a/deploy/charts/cert-manager/cainjector/values.yaml
+++ b/deploy/charts/cert-manager/cainjector/values.yaml
@@ -34,5 +34,7 @@ resources: {}
 
 image:
   repository: quay.io/jetstack/cert-manager-cainjector
-  tag: v0.8.0-alpha.0
+  # Override the image tag to deploy by setting this variable.
+  # If no value is set, the chart's appVersion will be used.
+  # tag: canary
   pullPolicy: IfNotPresent
diff --git a/deploy/charts/cert-manager/templates/deployment.yaml b/deploy/charts/cert-manager/templates/deployment.yaml
index 948eeb75e..579725cf2 100644
--- a/deploy/charts/cert-manager/templates/deployment.yaml
+++ b/deploy/charts/cert-manager/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
         {{- if .Values.global.logLevel }}
diff --git a/deploy/charts/cert-manager/values.yaml b/deploy/charts/cert-manager/values.yaml
index bdb9a8329..77656686b 100644
--- a/deploy/charts/cert-manager/values.yaml
+++ b/deploy/charts/cert-manager/values.yaml
@@ -31,7 +31,9 @@ strategy: {}
 
 image:
   repository: quay.io/jetstack/cert-manager-controller
-  tag: v0.8.0-alpha.0
+  # Override the image tag to deploy by setting this variable.
+  # If no value is set, the chart's appVersion will be used.
+  # tag: canary
   pullPolicy: IfNotPresent
 
 # Override the namespace used to store DNS provider credentials etc. for ClusterIssuer
diff --git a/deploy/charts/cert-manager/webhook/templates/deployment.yaml b/deploy/charts/cert-manager/webhook/templates/deployment.yaml
index aef1c3537..e5e14e653 100644
--- a/deploy/charts/cert-manager/webhook/templates/deployment.yaml
+++ b/deploy/charts/cert-manager/webhook/templates/deployment.yaml
@@ -34,7 +34,7 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
           {{- if .Values.global.logLevel }}
diff --git a/deploy/charts/cert-manager/webhook/values.yaml b/deploy/charts/cert-manager/webhook/values.yaml
index b62c04622..6a2b90cae 100644
--- a/deploy/charts/cert-manager/webhook/values.yaml
+++ b/deploy/charts/cert-manager/webhook/values.yaml
@@ -30,7 +30,9 @@ resources: {}
 
 image:
   repository: quay.io/jetstack/cert-manager-webhook
-  tag: v0.8.0-alpha.0
+  # Override the image tag to deploy by setting this variable.
+  # If no value is set, the chart's appVersion will be used.
+  # tag: canary
   pullPolicy: IfNotPresent
 
 # if true, the apiserver's cabundle will be automatically injected into the