diff --git a/.github/workflows/build-and-test-plugin.yaml b/.github/workflows/build-and-test-plugin.yaml index a73ead8fb4..8357dcfb62 100644 --- a/.github/workflows/build-and-test-plugin.yaml +++ b/.github/workflows/build-and-test-plugin.yaml @@ -64,14 +64,6 @@ jobs: restore-keys: | ${{ runner.os }}-go - - name: Setup Submodule Caches - uses: actions/cache@v4 - with: - path: |- - .git/modules - key: ${{ runner.os }}-submodules-cache-${{ github.run_id }} - restore-keys: ${{ runner.os }}-submodules-cache - - run: git stash # restore patch - name: "Run Ingress WasmPlugins Tests" diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 06988612d0..d63b7baffb 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -37,14 +37,6 @@ jobs: key: ${{ runner.os }}-go-${{ github.run_id }} restore-keys: ${{ runner.os }}-go - - name: Setup Submodule Caches - uses: actions/cache@v4 - with: - path: |- - .git/modules - key: ${{ runner.os }}-submodules-cache-${{ github.run_id }} - restore-keys: ${{ runner.os }}-submodules-cache - - run: git stash # restore patch # test @@ -83,14 +75,6 @@ jobs: key: ${{ runner.os }}-go-${{ github.run_id }} restore-keys: ${{ runner.os }}-go - - name: Setup Submodule Caches - uses: actions/cache@v4 - with: - path: |- - .git/modules - key: ${{ runner.os }}-submodules-cache-${{ github.run_id }} - restore-keys: ${{ runner.os }}-submodules-cache - - run: git stash # restore patch - name: "Build Higress Binary" @@ -137,14 +121,6 @@ jobs: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ github.run_id }} restore-keys: ${{ runner.os }}-go - - - name: Setup Submodule Caches - uses: actions/cache@v4 - with: - path: |- - .git/modules - key: ${{ runner.os }}-submodules-cache-${{ github.run_id }} - restore-keys: ${{ runner.os }}-submodules-cache - run: git stash # restore patch diff --git a/.github/workflows/build-image-and-push.yaml b/.github/workflows/build-image-and-push.yaml index ef99100a8e..938b041f30 100644 --- a/.github/workflows/build-image-and-push.yaml +++ b/.github/workflows/build-image-and-push.yaml @@ -44,16 +44,6 @@ jobs: key: ${{ runner.os }}-go-${{ github.run_id }} restore-keys: ${{ runner.os }}-go - - name: Setup Submodule Caches - uses: actions/cache@v4 - with: - path: |- - envoy - istio - .git/modules - key: ${{ runner.os }}-submodules-new-${{ github.run_id }} - restore-keys: ${{ runner.os }}-submodules-new - - name: Calculate Docker metadata id: docker-meta uses: docker/metadata-action@v5 @@ -120,16 +110,6 @@ jobs: key: ${{ runner.os }}-go-${{ github.run_id }} restore-keys: ${{ runner.os }}-go - - name: Setup Submodule Caches - uses: actions/cache@v4 - with: - path: |- - envoy - istio - .git/modules - key: ${{ runner.os }}-submodules-${{ github.run_id }} - restore-keys: ${{ runner.os }}-submodules-new - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -208,16 +188,6 @@ jobs: key: ${{ runner.os }}-go-${{ github.run_id }} restore-keys: ${{ runner.os }}-go - - name: Setup Submodule Caches - uses: actions/cache@v4 - with: - path: |- - envoy - istio - .git/modules - key: ${{ runner.os }}-submodules-${{ github.run_id }} - restore-keys: ${{ runner.os }}-submodules-new - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 diff --git a/Makefile.core.mk b/Makefile.core.mk index 7d5799c086..9829fadec1 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.0.0-rc.1/envoy-symbol-ARCH.tar.gz +export ENVOY_PACKAGE_URL_PATTERN?=https://github.com/higress-group/proxy/releases/download/v2.0.0/envoy-symbol-ARCH.tar.gz build-envoy: prebuild ./tools/hack/build-envoy.sh @@ -187,8 +187,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 ?= a6c313d41b3b54f0e3ed81fc676c520160cfed05 -ISTIO_LATEST_IMAGE_TAG ?= a9a55b3895bbf64a1ad8f724b2de3de017831e38 +ENVOY_LATEST_IMAGE_TAG ?= 7722dc383cd5d566d1b10a738f79a4cba1a18304 +ISTIO_LATEST_IMAGE_TAG ?= 7722dc383cd5d566d1b10a738f79a4cba1a18304 install-dev: pre-install 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' diff --git a/VERSION b/VERSION index 3448eb6ebc..46b105a30d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-rc.1 +v2.0.0 diff --git a/envoy/envoy b/envoy/envoy index 47886388b6..9c9c3b717c 160000 --- a/envoy/envoy +++ b/envoy/envoy @@ -1 +1 @@ -Subproject commit 47886388b6dd8be247300c178d5a003213c53e36 +Subproject commit 9c9c3b717c9a3dd8cb8772ef5de86938aa1c93a8 diff --git a/go.mod b/go.mod index 5a7957318f..901cf13a17 100644 --- a/go.mod +++ b/go.mod @@ -119,7 +119,6 @@ require ( github.com/google/uuid v1.3.1 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.5 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect - github.com/gorilla/mux v1.8.0 // indirect github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect @@ -176,13 +175,13 @@ require ( github.com/prometheus/common v0.45.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/prometheus v0.45.0 // indirect - github.com/ryanuber/go-glob v1.0.0 // indirect github.com/sergi/go-diff v1.2.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/cast v1.5.1 // indirect github.com/stoewer/go-strcase v1.3.0 // indirect + github.com/tetratelabs/wazero v1.7.3 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/toolkits/concurrent v0.0.0-20150624120057-a4371d70e3e3 // indirect diff --git a/go.sum b/go.sum index a13b9ce059..6803e17eac 100644 --- a/go.sum +++ b/go.sum @@ -1623,7 +1623,6 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= 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 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tebeka/strftime v0.1.3 h1:5HQXOqWKYRFfNyBMNVc9z5+QzuBtIXy03psIhtdJYto= github.com/tebeka/strftime v0.1.3/go.mod h1:7wJm3dZlpr4l/oVK0t1HYIc4rMzQ2XJlOMIUJUJH6XQ= +github.com/tetratelabs/wazero v1.7.3 h1:PBH5KVahrt3S2AHgEjKu4u+LlDbbk+nsGE3KLucy6Rw= +github.com/tetratelabs/wazero v1.7.3/go.mod h1:ytl6Zuh20R/eROuyDaGPkp82O9C/DJfXAwJfQ3X6/7Y= github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= diff --git a/helm/core/Chart.yaml b/helm/core/Chart.yaml index 32d08729b6..1a969e7d22 100644 --- a/helm/core/Chart.yaml +++ b/helm/core/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.0.0-rc.1 +appVersion: 2.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: 2.0.0-rc.1 +version: 2.0.0 diff --git a/helm/core/templates/controller-deployment.yaml b/helm/core/templates/controller-deployment.yaml index 494d099f89..98bfe8f6d8 100644 --- a/helm/core/templates/controller-deployment.yaml +++ b/helm/core/templates/controller-deployment.yaml @@ -133,6 +133,8 @@ spec: env: - name: PILOT_ENABLE_QUIC_LISTENERS value: "true" + - name: VALIDATION_WEBHOOK_CONFIG_NAME + value: "" - name: ISTIO_DUAL_STACK value: "{{ .Values.global.enableIPv6 }}" - name: PILOT_ENABLE_HEADLESS_SERVICE_POD_LISTENERS diff --git a/helm/higress/Chart.lock b/helm/higress/Chart.lock index 96d752fc4e..9f3c9245f1 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.0-rc.1 + version: 2.0.0 - name: higress-console repository: https://higress.io/helm-charts/ version: 1.4.2 -digest: sha256:10375e19aff1cc31e4d450ee5c3124ed684c8bcd2f4c019ea88abf7e3d381d76 -generated: "2024-08-15T19:39:04.526398+08:00" +digest: sha256:be29317070535e11fd94b74e50c5d69106eb8625273d2649325011871ed97558 +generated: "2024-09-10T22:34:46.04304732+08:00" diff --git a/helm/higress/Chart.yaml b/helm/higress/Chart.yaml index d8fadf72a9..3fdecd1876 100644 --- a/helm/higress/Chart.yaml +++ b/helm/higress/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.0.0-rc.1 +appVersion: 2.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: 2.0.0-rc.1 + version: 2.0.0 - name: higress-console repository: "https://higress.io/helm-charts/" version: 1.4.2 type: application -version: 2.0.0-rc.1 +version: 2.0.0 diff --git a/istio/istio b/istio/istio index 2217fb5a38..8918eb802a 160000 --- a/istio/istio +++ b/istio/istio @@ -1 +1 @@ -Subproject commit 2217fb5a380bfc6f7700731a68c198d05507ed58 +Subproject commit 8918eb802a2ab7aafe91ea5010c0642258d94669 diff --git a/istio/proxy b/istio/proxy index 9189360b8e..2a5416fcfa 160000 --- a/istio/proxy +++ b/istio/proxy @@ -1 +1 @@ -Subproject commit 9189360b8e980a3125cb9bfbeebabadee61ecda0 +Subproject commit 2a5416fcfafb302beb0ed4bc1435aab99c35a8a9