docs: update compatibility with APISIX

Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
apache · Jan 12, 2023 · 4bce392 · 4bce392
1 parent 2024a09
commit 4bce392
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -19,10 +19,10 @@ default: help
 VERSION ?= 1.6.0
 
 # 2.15 image: "2.15.0-alpine"
-TARGET_APISIX_VERSION ?= "3.0.0-centos"
+TARGET_APISIX_VERSION ?= "3.1.0-centos"
 APISIX_ADMIN_API_VERSION ?= "v3"
 ifneq ($(APISIX_ADMIN_API_VERSION), "v3")
-ifeq ($(TARGET_APISIX_VERSION), "3.0.0-centos")
+ifeq ($(TARGET_APISIX_VERSION), "3.1.0-centos")
 	TARGET_APISIX_VERSION = "2.15.0-alpine"
 endif
 endif
@@ -194,7 +194,7 @@ release-src:
 	--exclude $(RELEASE_SRC).tgz \
 	.
 
-	gpg --batch --yes --armor --detach-sig $(RELEASE_SRC).tgz
+	gpg -u zhangjintao@apache.org --batch --yes --armor --detach-sig $(RELEASE_SRC).tgz
 	shasum -a 512 $(RELEASE_SRC).tgz > $(RELEASE_SRC).tgz.sha512
 
 	mkdir -p release

diff --git a/docs/en/latest/getting-started.md b/docs/en/latest/getting-started.md
@@ -122,7 +122,8 @@ The table below shows the compatibility between APISIX ingress controller and th
 
 | APISIX ingress controller | Supported APISIX versions | Recommended APISIX version |
 | ------------------------- | ------------------------- | -------------------------- |
-| `master`                  | `>= 2.15`                 | `2.15`                     |
+| `master`                  | `>= 2.15`, `>=3.0`        | `3.1`                      |
+| `1.6.0`                   | `>= 2.15`, `>=3.0`        | `2.15`, `3.0`              |
 | `1.5.0`                   | `>= 2.7`                  | `2.15`                     |
 | `1.4.0`                   | `>= 2.7`                  | `2.11`                     |
 | `1.3.0`                   | `>= 2.7`                  | `2.10`                     |

diff --git a/test/e2e/README.md b/test/e2e/README.md
@@ -83,5 +83,5 @@ The v2 version tests will be run periodically.
 
 You can set the environment variable `APISIX_ADMIN_API_VERSION` to `v3` to run v3 version tests, any other value will be v2 version.
 
-The APISIX image tag will be automatically selected from `3.0.0-centos` and `2.15.0-alpine` based on the admin API version.
+The APISIX image tag will be automatically selected from `3.1.0-centos` and `2.15.0-alpine` based on the admin API version.
 If you want to use a specific APISIX version, please set the environment variable `TARGET_APISIX_VERSION`.