From 3e68ae75d14bcdcf81f763bb90882da86d9aa627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BE=84=E6=BD=AD?= <zty98751@alibaba-inc.com>
Date: Mon, 22 May 2023 20:58:19 +0800
Subject: [PATCH] update version to 1.0.0 (#348)

---
 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 ++++----
 test/ingress/e2e_test.go | 4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Makefile.core.mk b/Makefile.core.mk
index 629152503..556d44222 100644
--- a/Makefile.core.mk
+++ b/Makefile.core.mk
@@ -139,8 +139,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-rc
-ISTIO_LATEST_IMAGE_TAG ?= 1.0.0-rc
+ENVOY_LATEST_IMAGE_TAG ?= 1.0.0
+ISTIO_LATEST_IMAGE_TAG ?= 1.0.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 ff0ad4c24..0ec25f750 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v1.0.0-rc
+v1.0.0
diff --git a/helm/core/Chart.yaml b/helm/core/Chart.yaml
index ceb77661a..a908e6e23 100644
--- a/helm/core/Chart.yaml
+++ b/helm/core/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.0.0-rc
+appVersion: 1.0.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-rc
+version: 1.0.0
diff --git a/helm/core/values.yaml b/helm/core/values.yaml
index 1c31ccb77..85715d94c 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-rc
+  tag: 1.0.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-rc"
+  tag: "1.0.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-rc"
+  tag: "1.0.0"
   env: {}
 
   labels: {}
@@ -547,7 +547,7 @@ pilot:
   rollingMaxUnavailable: 25%
 
   hub: higress-registry.cn-hangzhou.cr.aliyuncs.com/higress
-  tag: 1.0.0-rc
+  tag: 1.0.0
 
   # Can be a full hub/image:tag
   image: pilot
diff --git a/helm/higress/Chart.lock b/helm/higress/Chart.lock
index 256b4a502..6d49e9f93 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-rc
+  version: 1.0.0
 - name: higress-console
   repository: https://higress.io/helm-charts/
-  version: 1.0.0-rc.2
-digest: sha256:6cd5c09946a6d365b03fe9bd5e8cf266bc8bdc94017fae8703920a2cb700e4f7
-generated: "2023-05-09T17:16:27.7257491+08:00"
+  version: 1.0.0
+digest: sha256:fb0f1b6816df5f5ac6888a93fb148b55b669affc9ac99336dd1ac818b8f84ace
+generated: "2023-05-22T17:42:02.506864+08:00"
diff --git a/helm/higress/Chart.yaml b/helm/higress/Chart.yaml
index 5633acc41..fa7c2ec52 100644
--- a/helm/higress/Chart.yaml
+++ b/helm/higress/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.0.0-rc.2
+appVersion: 1.0.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-rc
+  version: 1.0.0
 - name: higress-console
   repository: "https://higress.io/helm-charts/"
-  version: 1.0.0-rc.2
+  version: 1.0.0
 type: application
-version: 1.0.0-rc.2
+version: 1.0.0
diff --git a/test/ingress/e2e_test.go b/test/ingress/e2e_test.go
index 3f50bc528..443e7ba6f 100644
--- a/test/ingress/e2e_test.go
+++ b/test/ingress/e2e_test.go
@@ -70,8 +70,8 @@ func TestHigressConformanceTests(t *testing.T) {
 		tests.HTTPRouteWhitelistSourceRange,
 		tests.HTTPRouteCanaryWeight,
 		tests.HTTPRouteMatchPath,
-		tests.HTTPFORCEREDIRCTHTTPS,
-		tests.HTTPREDIRCTASHTTPS,
+		tests.HttpForceRedirectHttps,
+		tests.HttpRedirectAsHttps,
 	}
 
 	cSuite.Run(t, higressTests)