diff --git a/.github/workflows/build-and-test-plugin.yaml b/.github/workflows/build-and-test-plugin.yaml index 688c5d97a..ba0f5ce5f 100644 --- a/.github/workflows/build-and-test-plugin.yaml +++ b/.github/workflows/build-and-test-plugin.yaml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 # There are too many lint errors in current code bases # uncomment when we decide what lint should be addressed or ignored. # - run: make lint @@ -51,7 +51,7 @@ jobs: - name: "Setup Go" uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 - name: Setup Rust uses: actions-rs/toolchain@v1 diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index d63b7baff..c8d67dc13 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 # There are too many lint errors in current code bases # uncomment when we decide what lint should be addressed or ignored. # - run: make lint @@ -26,7 +26,7 @@ jobs: - name: "Setup Go" uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 - name: Setup Golang Caches uses: actions/cache@v4 @@ -64,7 +64,7 @@ jobs: - name: "Setup Go" uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 - name: Setup Golang Caches uses: actions/cache@v4 @@ -111,7 +111,7 @@ jobs: - name: "Setup Go" uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 - name: Setup Golang Caches uses: actions/cache@v4 diff --git a/.github/workflows/build-image-and-push.yaml b/.github/workflows/build-image-and-push.yaml index 4d789ddef..74aed96db 100644 --- a/.github/workflows/build-image-and-push.yaml +++ b/.github/workflows/build-image-and-push.yaml @@ -33,7 +33,7 @@ jobs: - name: "Setup Go" uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 - name: Setup Golang Caches uses: actions/cache@v4 @@ -103,7 +103,7 @@ jobs: - name: "Setup Go" uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 - name: Setup Golang Caches uses: actions/cache@v4 @@ -193,7 +193,7 @@ jobs: - name: "Setup Go" uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 - name: Setup Golang Caches uses: actions/cache@v4 @@ -255,4 +255,4 @@ jobs: if [ "$BUILT_IMAGE" != "$image" ]; then docker buildx imagetools create $BUILT_IMAGE --tag $image fi - done \ No newline at end of file + done diff --git a/.github/workflows/release-hgctl.yaml b/.github/workflows/release-hgctl.yaml index 9eadd49be..c40a801aa 100644 --- a/.github/workflows/release-hgctl.yaml +++ b/.github/workflows/release-hgctl.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 - name: Build hgctl latest multiarch binaries run: | @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 - name: Build hgctl latest macos binaries run: | @@ -65,7 +65,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.21.5 + go-version: 1.22 - name: Build hgctl latest macos binaries run: | diff --git a/Makefile.core.mk b/Makefile.core.mk index f28862086..568006d7a 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -144,7 +144,7 @@ docker-buildx-push: clean-env docker.higress-buildx export PARENT_GIT_TAG:=$(shell cat VERSION) export PARENT_GIT_REVISION:=$(TAG) -export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.1.1/envoy-symbol-ARCH.tar.gz +export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.1.2/envoy-symbol-ARCH.tar.gz build-envoy: prebuild ./tools/hack/build-envoy.sh diff --git a/VERSION b/VERSION index d8ba80f9b..818cc3aaa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.7 +v2.1.0-rc.1 diff --git a/envoy/envoy b/envoy/envoy index c2471f124..317f5e8fb 160000 --- a/envoy/envoy +++ b/envoy/envoy @@ -1 +1 @@ -Subproject commit c2471f1247916012561120b3d31ff99c38ea01ff +Subproject commit 317f5e8fb578ff44bc5a16fdde3ecf3c13900d0e diff --git a/go.mod b/go.mod index 901cf13a1..6dc766d41 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/alibaba/higress -go 1.21.0 - -toolchain go1.22.2 +go 1.22.2 replace github.com/spf13/viper => github.com/istio/viper v1.3.3-0.20190515210538-2789fed3109c @@ -23,6 +21,7 @@ require ( github.com/dubbogo/go-zookeeper v1.0.4-0.20211212162352-f9d2183d89d5 github.com/dubbogo/gost v1.13.1 github.com/envoyproxy/go-control-plane v0.11.2-0.20230725211550-11bfe846bcd4 + github.com/go-errors/errors v1.4.2 github.com/gogo/protobuf v1.3.2 github.com/golang/protobuf v1.5.3 github.com/google/go-cmp v0.6.0 @@ -99,7 +98,6 @@ require ( github.com/fatih/color v1.15.0 // indirect github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-errors/errors v1.4.2 // indirect github.com/go-jose/go-jose/v3 v3.0.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/helm/core/Chart.yaml b/helm/core/Chart.yaml index b4019541f..fafe7934c 100644 --- a/helm/core/Chart.yaml +++ b/helm/core/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.0.7 +appVersion: 2.1.0-rc.1 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: 2.0.7 +version: 2.1.0-rc.1 diff --git a/helm/higress/Chart.lock b/helm/higress/Chart.lock index 3605d6c81..dd6a71b0b 100644 --- a/helm/higress/Chart.lock +++ b/helm/higress/Chart.lock @@ -1,9 +1,9 @@ dependencies: - name: higress-core repository: file://../core - version: 2.0.7 + version: 2.1.0-rc.1 - name: higress-console repository: https://higress.io/helm-charts/ version: 2.0.4 -digest: sha256:ca9cc8bdac0488d79c20e7a4e3d7b3a436a59b697a37728daa462601b4d1ea65 -generated: "2025-02-19T16:23:39.424987+08:00" +digest: sha256:9341e3c410e41bcb681e63c8ff60361af46a22a34463bfb919d2e062b47ad072 +generated: "2025-03-26T21:02:19.645626545+08:00" diff --git a/helm/higress/Chart.yaml b/helm/higress/Chart.yaml index 4a02de0a3..15849256d 100644 --- a/helm/higress/Chart.yaml +++ b/helm/higress/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.0.7 +appVersion: 2.1.0-rc.1 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: 2.0.7 + version: 2.1.0-rc.1 - name: higress-console repository: "https://higress.io/helm-charts/" version: 2.0.4 type: application -version: 2.0.7 +version: 2.1.0-rc.1 diff --git a/istio/istio b/istio/istio index 5a5aa495c..38423c5ce 160000 --- a/istio/istio +++ b/istio/istio @@ -1 +1 @@ -Subproject commit 5a5aa495c7379f21fb5218a14787aa80af74514a +Subproject commit 38423c5cecd7bf5a73fd0273126e3c9760cad407 diff --git a/istio/proxy b/istio/proxy index 8a85c12b8..bc039d415 160000 --- a/istio/proxy +++ b/istio/proxy @@ -1 +1 @@ -Subproject commit 8a85c12b89192fbe7a8100bba9cf21fc4f86ac98 +Subproject commit bc039d41549e64444addff6a142e142f23582063 diff --git a/tools/hack/prebuild.sh b/tools/hack/prebuild.sh index 944091627..fbcbcdc4d 100755 --- a/tools/hack/prebuild.sh +++ b/tools/hack/prebuild.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -GO_VERSION=1.20 +GO_VERSION=1.22 WORK_DIR=`cd $(dirname "$0")/../..;pwd`