From 8b24a20651c69b547a58e961901922c78553d194 Mon Sep 17 00:00:00 2001
From: Kent Dong <ch3cho@qq.com>
Date: Sat, 19 Aug 2023 10:40:04 +0800
Subject: [PATCH] feat: Update image tag management mechanisms (#495)

---
 helm/core/templates/controller-deployment.yaml | 2 +-
 helm/core/values.yaml                          | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/helm/core/templates/controller-deployment.yaml b/helm/core/templates/controller-deployment.yaml
index c12d8f570..675180f66 100644
--- a/helm/core/templates/controller-deployment.yaml
+++ b/helm/core/templates/controller-deployment.yaml
@@ -33,7 +33,7 @@ spec:
 {{- if contains "/" .Values.pilot.image }}
           image: "{{ .Values.pilot.image }}"
 {{- else }}
-          image: "{{ .Values.pilot.hub | default .Values.global.hub }}/{{ .Values.pilot.image | default "pilot" }}:{{ .Values.pilot.tag | default .Values.global.tag }}"
+          image: "{{ .Values.pilot.hub | default .Values.global.hub }}/{{ .Values.pilot.image | default "pilot" }}:{{ .Values.pilot.tag | default .Chart.AppVersion }}"
 {{- end }}
 {{- if .Values.global.imagePullPolicy }}
           imagePullPolicy: {{ .Values.global.imagePullPolicy }}
diff --git a/helm/core/values.yaml b/helm/core/values.yaml
index 608e8a24a..8e7498cb8 100644
--- a/helm/core/values.yaml
+++ b/helm/core/values.yaml
@@ -44,8 +44,6 @@ global:
   # Releases are published to docker hub under 'istio' project.
   # Dev builds from prow are on gcr.io
   hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress
-  # Default tag for Istio images.
-  tag: 1.1.1
 
   # Specify image pull policy if default behavior isn't desired.
   # Default behavior: latest images will be Always else IfNotPresent.
@@ -369,7 +367,7 @@ gateway:
   name: "higress-gateway"
   replicas: 2
   image: gateway
-  tag: "1.1.1"
+  tag: ""
   # revision declares which revision this gateway is a part of
   revision: ""
 
@@ -457,7 +455,7 @@ controller:
   name: "higress-controller"
   replicas: 1
   image: higress
-  tag: "1.1.1"
+  tag: ""
   env: {}
 
   labels: {}
@@ -547,7 +545,7 @@ pilot:
   rollingMaxUnavailable: 25%
 
   hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress
-  tag: 1.1.1
+  tag: ""
 
   # Can be a full hub/image:tag
   image: pilot