From bee03a37a4acfac7168ee3e1d9a9f6be31ef1936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BE=84=E6=BD=AD?= <zty98751@alibaba-inc.com>
Date: Fri, 7 Jul 2023 17:53:44 +0800
Subject: [PATCH] Release 1.1 (#412)

---
 Makefile.core.mk                       | 4 ++--
 VERSION                                | 2 +-
 helm/core/Chart.yaml                   | 4 ++--
 helm/core/values.yaml                  | 8 ++++----
 helm/higress/Chart.lock                | 8 ++++----
 helm/higress/Chart.yaml                | 8 ++++----
 pkg/ingress/kube/ingress/controller.go | 3 ++-
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Makefile.core.mk b/Makefile.core.mk
index bf9016c7d..221c67743 100644
--- a/Makefile.core.mk
+++ b/Makefile.core.mk
@@ -142,8 +142,8 @@ install: pre-install
 	cd helm/higress; helm dependency build
 	helm install higress helm/higress -n higress-system --create-namespace --set 'global.local=true'
 
-ENVOY_LATEST_IMAGE_TAG ?= 1.0.0
-ISTIO_LATEST_IMAGE_TAG ?= 1.0.0
+ENVOY_LATEST_IMAGE_TAG ?= 1.1.0
+ISTIO_LATEST_IMAGE_TAG ?= 1.1.0
 
 install-dev: pre-install
 	helm install higress helm/core -n higress-system --create-namespace --set 'controller.tag=$(TAG)' --set 'gateway.replicas=1' --set 'gateway.tag=$(ENVOY_LATEST_IMAGE_TAG)' --set 'global.local=true'
diff --git a/VERSION b/VERSION
index b18d46540..795460fce 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v1.0.1
+v1.1.0
diff --git a/helm/core/Chart.yaml b/helm/core/Chart.yaml
index a908e6e23..b03276aa1 100644
--- a/helm/core/Chart.yaml
+++ b/helm/core/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.0.0
+appVersion: 1.1.0
 description: Helm chart for deploying higress gateways
 icon: https://higress.io/img/higress_logo_small.png
 home: http://higress.io/
@@ -10,4 +10,4 @@ name: higress-core
 sources:
 - http://github.com/alibaba/higress
 type: application
-version: 1.0.0
+version: 1.1.0
diff --git a/helm/core/values.yaml b/helm/core/values.yaml
index fb5df572b..24011a564 100644
--- a/helm/core/values.yaml
+++ b/helm/core/values.yaml
@@ -45,7 +45,7 @@ global:
   # Dev builds from prow are on gcr.io
   hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress
   # Default tag for Istio images.
-  tag: 1.0.0
+  tag: 1.1.0
 
   # Specify image pull policy if default behavior isn't desired.
   # Default behavior: latest images will be Always else IfNotPresent.
@@ -369,7 +369,7 @@ gateway:
   name: "higress-gateway"
   replicas: 2
   image: gateway
-  tag: "1.0.0"
+  tag: "1.1.0"
   # revision declares which revision this gateway is a part of
   revision: ""
 
@@ -457,7 +457,7 @@ controller:
   name: "higress-controller"
   replicas: 1
   image: higress
-  tag: "1.0.0"
+  tag: "1.1.0"
   env: {}
 
   labels: {}
@@ -547,7 +547,7 @@ pilot:
   rollingMaxUnavailable: 25%
 
   hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress
-  tag: 1.0.0
+  tag: 1.1.0
 
   # Can be a full hub/image:tag
   image: pilot
diff --git a/helm/higress/Chart.lock b/helm/higress/Chart.lock
index d35352e65..418949bcc 100644
--- a/helm/higress/Chart.lock
+++ b/helm/higress/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: higress-core
   repository: file://../core
-  version: 1.0.0
+  version: 1.1.0
 - name: higress-console
   repository: https://higress.io/helm-charts/
-  version: 1.0.1
-digest: sha256:cb0808ac6feff2bebf1184969defe5d0b7bf6d12d45e9bd39751df94af731dc0
-generated: "2023-06-16T10:15:54.5326712+08:00"
+  version: 1.0.2
+digest: sha256:497a19e7dfd4864a4ff1560516319c90cbfdc5f69d0766f6aefeadbf4a61f48c
+generated: "2023-07-06T10:42:05.393585+08:00"
diff --git a/helm/higress/Chart.yaml b/helm/higress/Chart.yaml
index 4ab5ed57d..a70a4e3f1 100644
--- a/helm/higress/Chart.yaml
+++ b/helm/higress/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.0.1
+appVersion: 1.1.0
 description: Helm chart for deploying Higress gateways
 icon: https://higress.io/img/higress_logo_small.png
 home: http://higress.io/
@@ -12,9 +12,9 @@ sources:
 dependencies:
 - name: higress-core
   repository: "file://../core"
-  version: 1.0.0
+  version: 1.1.0
 - name: higress-console
   repository: "https://higress.io/helm-charts/"
-  version: 1.0.1
+  version: 1.0.2
 type: application
-version: 1.0.1
+version: 1.1.0
diff --git a/pkg/ingress/kube/ingress/controller.go b/pkg/ingress/kube/ingress/controller.go
index d84c7fd19..1b2c4eec9 100644
--- a/pkg/ingress/kube/ingress/controller.go
+++ b/pkg/ingress/kube/ingress/controller.go
@@ -293,8 +293,9 @@ func (c *controller) HasSynced() bool {
 }
 
 func (c *controller) List() []config.Config {
+	c.mutex.RLock()
 	out := make([]config.Config, 0, len(c.ingresses))
-
+	c.mutex.RUnlock()
 	for _, raw := range c.ingressInformer.GetStore().List() {
 		ing, ok := raw.(*ingress.Ingress)
 		if !ok {