Skip to content

Commit 3eda1f3

Browse files
authored
rel: Release v2.0.0 (#1298)
1 parent 6439b2d commit 3eda1f3

14 files changed

+20
-80
lines changed

.github/workflows/build-and-test-plugin.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@ jobs:
6464
restore-keys: |
6565
${{ runner.os }}-go
6666
67-
- name: Setup Submodule Caches
68-
uses: actions/cache@v4
69-
with:
70-
path: |-
71-
.git/modules
72-
key: ${{ runner.os }}-submodules-cache-${{ github.run_id }}
73-
restore-keys: ${{ runner.os }}-submodules-cache
74-
7567
- run: git stash # restore patch
7668

7769
- name: "Run Ingress WasmPlugins Tests"

.github/workflows/build-and-test.yaml

-24
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,6 @@ jobs:
3737
key: ${{ runner.os }}-go-${{ github.run_id }}
3838
restore-keys: ${{ runner.os }}-go
3939

40-
- name: Setup Submodule Caches
41-
uses: actions/cache@v4
42-
with:
43-
path: |-
44-
.git/modules
45-
key: ${{ runner.os }}-submodules-cache-${{ github.run_id }}
46-
restore-keys: ${{ runner.os }}-submodules-cache
47-
4840
- run: git stash # restore patch
4941

5042
# test
@@ -83,14 +75,6 @@ jobs:
8375
key: ${{ runner.os }}-go-${{ github.run_id }}
8476
restore-keys: ${{ runner.os }}-go
8577

86-
- name: Setup Submodule Caches
87-
uses: actions/cache@v4
88-
with:
89-
path: |-
90-
.git/modules
91-
key: ${{ runner.os }}-submodules-cache-${{ github.run_id }}
92-
restore-keys: ${{ runner.os }}-submodules-cache
93-
9478
- run: git stash # restore patch
9579

9680
- name: "Build Higress Binary"
@@ -137,14 +121,6 @@ jobs:
137121
~/go/pkg/mod
138122
key: ${{ runner.os }}-go-${{ github.run_id }}
139123
restore-keys: ${{ runner.os }}-go
140-
141-
- name: Setup Submodule Caches
142-
uses: actions/cache@v4
143-
with:
144-
path: |-
145-
.git/modules
146-
key: ${{ runner.os }}-submodules-cache-${{ github.run_id }}
147-
restore-keys: ${{ runner.os }}-submodules-cache
148124

149125
- run: git stash # restore patch
150126

.github/workflows/build-image-and-push.yaml

-30
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,6 @@ jobs:
4444
key: ${{ runner.os }}-go-${{ github.run_id }}
4545
restore-keys: ${{ runner.os }}-go
4646

47-
- name: Setup Submodule Caches
48-
uses: actions/cache@v4
49-
with:
50-
path: |-
51-
envoy
52-
istio
53-
.git/modules
54-
key: ${{ runner.os }}-submodules-new-${{ github.run_id }}
55-
restore-keys: ${{ runner.os }}-submodules-new
56-
5747
- name: Calculate Docker metadata
5848
id: docker-meta
5949
uses: docker/metadata-action@v5
@@ -120,16 +110,6 @@ jobs:
120110
key: ${{ runner.os }}-go-${{ github.run_id }}
121111
restore-keys: ${{ runner.os }}-go
122112

123-
- name: Setup Submodule Caches
124-
uses: actions/cache@v4
125-
with:
126-
path: |-
127-
envoy
128-
istio
129-
.git/modules
130-
key: ${{ runner.os }}-submodules-${{ github.run_id }}
131-
restore-keys: ${{ runner.os }}-submodules-new
132-
133113
- name: Set up Docker Buildx
134114
uses: docker/setup-buildx-action@v1
135115

@@ -208,16 +188,6 @@ jobs:
208188
key: ${{ runner.os }}-go-${{ github.run_id }}
209189
restore-keys: ${{ runner.os }}-go
210190

211-
- name: Setup Submodule Caches
212-
uses: actions/cache@v4
213-
with:
214-
path: |-
215-
envoy
216-
istio
217-
.git/modules
218-
key: ${{ runner.os }}-submodules-${{ github.run_id }}
219-
restore-keys: ${{ runner.os }}-submodules-new
220-
221191
- name: Set up Docker Buildx
222192
uses: docker/setup-buildx-action@v1
223193

Makefile.core.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ docker-buildx-push: clean-env docker.higress-buildx
144144
export PARENT_GIT_TAG:=$(shell cat VERSION)
145145
export PARENT_GIT_REVISION:=$(TAG)
146146

147-
export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.0.0-rc.1/envoy-symbol-ARCH.tar.gz
147+
export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.0.0/envoy-symbol-ARCH.tar.gz
148148

149149
build-envoy: prebuild
150150
./tools/hack/build-envoy.sh
@@ -187,8 +187,8 @@ install: pre-install
187187
cd helm/higress; helm dependency build
188188
helm install higress helm/higress -n higress-system --create-namespace --set 'global.local=true'
189189

190-
ENVOY_LATEST_IMAGE_TAG ?= a6c313d41b3b54f0e3ed81fc676c520160cfed05
191-
ISTIO_LATEST_IMAGE_TAG ?= a9a55b3895bbf64a1ad8f724b2de3de017831e38
190+
ENVOY_LATEST_IMAGE_TAG ?= 7722dc383cd5d566d1b10a738f79a4cba1a18304
191+
ISTIO_LATEST_IMAGE_TAG ?= 7722dc383cd5d566d1b10a738f79a4cba1a18304
192192

193193
install-dev: pre-install
194194
helm install higress helm/core -n higress-system --create-namespace --set 'controller.tag=$(TAG)' --set 'gateway.replicas=1' --set 'pilot.tag=$(ISTIO_LATEST_IMAGE_TAG)' --set 'gateway.tag=$(ENVOY_LATEST_IMAGE_TAG)' --set 'global.local=true'

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.0.0-rc.1
1+
v2.0.0

go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ require (
119119
github.com/google/uuid v1.3.1 // indirect
120120
github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect
121121
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
122-
github.com/gorilla/mux v1.8.0 // indirect
123122
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
124123
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
125124
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
@@ -176,13 +175,13 @@ require (
176175
github.com/prometheus/common v0.45.0 // indirect
177176
github.com/prometheus/procfs v0.12.0 // indirect
178177
github.com/prometheus/prometheus v0.45.0 // indirect
179-
github.com/ryanuber/go-glob v1.0.0 // indirect
180178
github.com/sergi/go-diff v1.2.0 // indirect
181179
github.com/shopspring/decimal v1.3.1 // indirect
182180
github.com/sirupsen/logrus v1.9.3 // indirect
183181
github.com/spaolacci/murmur3 v1.1.0 // indirect
184182
github.com/spf13/cast v1.5.1 // indirect
185183
github.com/stoewer/go-strcase v1.3.0 // indirect
184+
github.com/tetratelabs/wazero v1.7.3 // indirect
186185
github.com/tidwall/match v1.1.1 // indirect
187186
github.com/tidwall/pretty v1.2.0 // indirect
188187
github.com/toolkits/concurrent v0.0.0-20150624120057-a4371d70e3e3 // indirect

go.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
16231623
github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w=
16241624
github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk=
16251625
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
1626-
github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
16271626
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
16281627
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
16291628
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
@@ -1705,6 +1704,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
17051704
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
17061705
github.com/tebeka/strftime v0.1.3 h1:5HQXOqWKYRFfNyBMNVc9z5+QzuBtIXy03psIhtdJYto=
17071706
github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ=
1707+
github.com/tetratelabs/wazero v1.7.3 h1:PBH5KVahrt3S2AHgEjKu4u+LlDbbk+nsGE3KLucy6Rw=
1708+
github.com/tetratelabs/wazero v1.7.3/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y=
17081709
github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=
17091710
github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
17101711
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=

helm/core/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 2.0.0-rc.1
2+
appVersion: 2.0.0
33
description: Helm chart for deploying higress gateways
44
icon: https://higress.io/img/higress_logo_small.png
55
home: http://higress.io/
@@ -10,4 +10,4 @@ name: higress-core
1010
sources:
1111
- http://github.com/alibaba/higress
1212
type: application
13-
version: 2.0.0-rc.1
13+
version: 2.0.0

helm/core/templates/controller-deployment.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ spec:
133133
env:
134134
- name: PILOT_ENABLE_QUIC_LISTENERS
135135
value: "true"
136+
- name: VALIDATION_WEBHOOK_CONFIG_NAME
137+
value: ""
136138
- name: ISTIO_DUAL_STACK
137139
value: "{{ .Values.global.enableIPv6 }}"
138140
- name: PILOT_ENABLE_HEADLESS_SERVICE_POD_LISTENERS

helm/higress/Chart.lock

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
dependencies:
22
- name: higress-core
33
repository: file://../core
4-
version: 2.0.0-rc.1
4+
version: 2.0.0
55
- name: higress-console
66
repository: https://higress.io/helm-charts/
77
version: 1.4.2
8-
digest: sha256:10375e19aff1cc31e4d450ee5c3124ed684c8bcd2f4c019ea88abf7e3d381d76
9-
generated: "2024-08-15T19:39:04.526398+08:00"
8+
digest: sha256:be29317070535e11fd94b74e50c5d69106eb8625273d2649325011871ed97558
9+
generated: "2024-09-10T22:34:46.04304732+08:00"

helm/higress/Chart.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 2.0.0-rc.1
2+
appVersion: 2.0.0
33
description: Helm chart for deploying Higress gateways
44
icon: https://higress.io/img/higress_logo_small.png
55
home: http://higress.io/
@@ -12,9 +12,9 @@ sources:
1212
dependencies:
1313
- name: higress-core
1414
repository: "file://../core"
15-
version: 2.0.0-rc.1
15+
version: 2.0.0
1616
- name: higress-console
1717
repository: "https://higress.io/helm-charts/"
1818
version: 1.4.2
1919
type: application
20-
version: 2.0.0-rc.1
20+
version: 2.0.0

istio/proxy

Submodule proxy updated 1 file

0 commit comments

Comments
 (0)