diff --git a/.github/workflows/backend-e2e-test.yml b/.github/workflows/backend-e2e-test.yml index 3033d5b304..f5d4b9273a 100644 --- a/.github/workflows/backend-e2e-test.yml +++ b/.github/workflows/backend-e2e-test.yml @@ -74,7 +74,10 @@ jobs: working-directory: ./api/test/docker run: | docker-compose up -d - sleep 5 + + # wait for services ready + ../shell/wait_for_services.sh + docker logs docker_managerapi_1 docker logs docker_apisix_1 @@ -106,7 +109,10 @@ jobs: working-directory: ./api/test/docker run: | docker-compose up -d --build - sleep 5 + + # wait for services ready + ../shell/wait_for_services.sh + docker logs docker_managerapi_1 - name: run test for plugin skywalking diff --git a/CHANGELOG.md b/CHANGELOG.md index d50663a3e1..cc72b6cfae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ # Table of Contents +- [2.9.0](#290) - [2.8.0](#280) - [2.7.1](#271) - [2.7.0](#270) @@ -34,6 +35,33 @@ - [1.5.0](#150) - [1.0.0](#100) +# 2.9.0 + +This release contains some features and bugfixes, and all the existing functionalities are compatible with Apache APISIX 2.10.0. + +### Core + +- feat(plugin): allowing basic-auth to dynamically adapt to the BE rules [#2086](https://github.com/apache/apisix-dashboard/pull/2149) +- feat(plugin): allowing referer-restriction to dynamically adapt to the BE rules [#2001](https://github.com/apache/apisix-dashboard/pull/2001) +- refactor: migrate to viper configure manage [#1946](https://github.com/apache/apisix-dashboard/pull/1946) +- feat: basic support Apache APISIX 2.10 [#2149](https://github.com/apache/apisix-dashboard/pull/2149) +- feat: support Manager API run on windows [#2125](https://github.com/apache/apisix-dashboard/pull/2125) + +### Bugfix + +- fix: supports search by name for service options when add router [#2066](https://github.com/apache/apisix-dashboard/pull/2066) +- fix: gzip plugin schema typo [#2142](https://github.com/apache/apisix-dashboard/pull/2142) +- fix: adjust buildx to fix Docker build failed [#2120](https://github.com/apache/apisix-dashboard/pull/2120) + +### Docs + +- docs: Update FAQ about Grafana can't login when APISIX dashboard configured domain name [#2126](https://github.com/apache/apisix-dashboard/pull/2126) + +### CI + +- ci: Only upload artifact at the release/** branch [#2137](https://github.com/apache/apisix-dashboard/pull/2137) +- ci: optimize build rpm workflow with apisix-build-tools v2.2.0 [#2133](https://github.com/apache/apisix-dashboard/pull/2133) + # 2.8.0 This release contains some features and bugfixes, and all the existing functionalities are compatible with Apache APISIX 2.9. diff --git a/README.md b/README.md index ca8546f757..fdb7d348d0 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ - The master version should be used with Apache APISIX master version. -- The latest released version is [2.8.0](https://apisix.apache.org/downloads/) and is compatible with [Apache APISIX 2.9](https://apisix.apache.org/downloads/). +- The latest released version is [2.9.0](https://apisix.apache.org/downloads/) and is compatible with [Apache APISIX 2.10.0](https://apisix.apache.org/downloads/). ## What's Apache APISIX Dashboard diff --git a/api/VERSION b/api/VERSION index 834f262953..c8e38b6140 100644 --- a/api/VERSION +++ b/api/VERSION @@ -1 +1 @@ -2.8.0 +2.9.0 diff --git a/api/test/shell/wait_for_services.sh b/api/test/shell/wait_for_services.sh new file mode 100755 index 0000000000..b5270d3110 --- /dev/null +++ b/api/test/shell/wait_for_services.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +i=1 +timeout=60 +while ! curl -s 127.0.0.1:12800 >/dev/null; do + if [[ "$i" -gt "$timeout" ]]; then + echo "timeout occurred after waiting $timeout seconds" + exit 1 + fi + sleep 1 + echo "waited skywalking for $i seconds.." + ((i++)); +done diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json index 26f2f31758..73bbd8227b 100644 --- a/docs/en/latest/config.json +++ b/docs/en/latest/config.json @@ -1,5 +1,5 @@ { - "version": 2.8, + "version": "2.9.0", "sidebar": [ { "type": "category", diff --git a/docs/en/latest/deploy-with-rpm.md b/docs/en/latest/deploy-with-rpm.md index ef861f3dcc..49d13088ff 100644 --- a/docs/en/latest/deploy-with-rpm.md +++ b/docs/en/latest/deploy-with-rpm.md @@ -26,7 +26,7 @@ title: Deploy with RPM ## Install from RPM ```sh -$ sudo yum install -y https://github.com/apache/apisix-dashboard/releases/download/v2.8/apisix-dashboard-2.8.0-0.el7.x86_64.rpm +$ sudo yum install -y https://github.com/apache/apisix-dashboard/releases/download/v2.9.0/apisix-dashboard-2.9.0-0.el7.x86_64.rpm ``` ## Run diff --git a/docs/en/latest/deploy.md b/docs/en/latest/deploy.md index 78a357563d..47b7f51b3b 100644 --- a/docs/en/latest/deploy.md +++ b/docs/en/latest/deploy.md @@ -45,7 +45,7 @@ $ go env -w GOPROXY=https://goproxy.cn,direct ## Clone the project ```sh -$ git clone -b release/2.7 https://github.com/apache/apisix-dashboard.git +$ git clone -b release/2.9.0 https://github.com/apache/apisix-dashboard.git ``` ## Build diff --git a/docs/en/latest/develop.md b/docs/en/latest/develop.md index 47bc507280..b0102fe2f8 100644 --- a/docs/en/latest/develop.md +++ b/docs/en/latest/develop.md @@ -30,7 +30,7 @@ Before development, refer to this [guide](./deploy.md) to install dependencies. ## Clone the project ```sh -$ git clone -b release/2.8 https://github.com/apache/apisix-dashboard.git +$ git clone -b release/2.9.0 https://github.com/apache/apisix-dashboard.git ``` ## Start developing diff --git a/web/package.json b/web/package.json index c70ef9f4a3..7522c6fae6 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "apisix-dashboard", - "version": "2.8.0", + "version": "2.9.0", "private": true, "description": "Dashboard for Apache APISIX", "scripts": {