diff --git a/CHANGELOG.md b/CHANGELOG.md index ac34f1294e..50daf9ba66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ # Table of Contents +- [1.2.0](#120) - [1.1.0](#110) - [1.0.0](#100) - [0.6.0](#060) @@ -28,6 +29,70 @@ - [0.2.0](#020) - [0.1.0](#010) +# 1.2.0 + +Welcome to the 1.2.0 release of apisix-ingress-controller! + +This is a **GA** release. + +## Highlights + +### New Features + +* **Support ingress v1beta1 HTTPS** [#596](https://github.com/apache/apisix-ingress-controller/pull/596) +* **Implement schema API** [#601](https://github.com/apache/apisix-ingress-controller/pull/601) + +Please try out the release binaries and report any issues at +https://github.com/apache/apisix-ingress-controller/issues. + +### Contributors + +* kv +* Jintao Zhang +* Baoyuan +* Hoshea Jiang +* chen zhuo +* okaybase +* yuanfeng0905 +* 天使莫忆 + +### Changes +
20 commits +

+ +* [`3ab162b`](https://github.com/apache/apisix-ingress-controller/commit/3ab162bfcaf82ecb50e67029990b97c98d0e18eb) chore: bump version v1.2.0 +* [`3ad1a1c`](https://github.com/apache/apisix-ingress-controller/commit/3ad1a1cca0bf23da803b703eeed36b7c4931d387) docs: fix install docs (#579) +* [`499962b`](https://github.com/apache/apisix-ingress-controller/commit/499962be2306e341c30a84738c8a530562e00b9f) docs: ApisixRoute v2alpha1 is deprecated (#623) +* [`c1de18f`](https://github.com/apache/apisix-ingress-controller/commit/c1de18fa2e59bdf02398290e15199422cf75ba81) docs: update mTLS support in ApisixTls reference (#624) +* [`3cd6892`](https://github.com/apache/apisix-ingress-controller/commit/3cd689294d236495ffc5ca0071edcd856603a878) fix: ApisixRoute printcolumns (#626) +* [`91d985e`](https://github.com/apache/apisix-ingress-controller/commit/91d985edca67493acc22536c66d4947fe597052f) fix field tag omiteempty (#622) +* [`f78248a`](https://github.com/apache/apisix-ingress-controller/commit/f78248a6aca0ac4754fd4d5d410c28f1cdd3d9c7) fix: sync apisix failed when use v2beta1 ApisixRoute (#620) +* [`00ff017`](https://github.com/apache/apisix-ingress-controller/commit/00ff01768429001e05b87c1a704c12c43c76f012) ci: add ingress log when e2e failed (#616) +* [`e5441a3`](https://github.com/apache/apisix-ingress-controller/commit/e5441a3d0877017f17e96ac44d2a804a509676e7) feat: implement schema API (#601) +* [`5635652`](https://github.com/apache/apisix-ingress-controller/commit/5635652865ef965db58794b08e2fe37ddc9c08e3) fix: timer leak memory (#591) +* [`812e4bd`](https://github.com/apache/apisix-ingress-controller/commit/812e4bd3ca197c7ea227ff7de8b5ee1b6ac9424d) docs: add declarations for the version of APISIX (#595) +* [`915a5d1`](https://github.com/apache/apisix-ingress-controller/commit/915a5d1d99d68f9c08b4d59e9b2e9cb8fa0dde31) test: add assert for test cases (#613) +* [`d12a900`](https://github.com/apache/apisix-ingress-controller/commit/d12a900976e9118fe1b5fd0df137426a294f7a97) fix: add v2beta1 logic (#615) +* [`ac25764`](https://github.com/apache/apisix-ingress-controller/commit/ac25764d46448b4df5772bde236be8334f47a7f7) feat: support ingress v1beta1 https (#596) +* [`866d0bf`](https://github.com/apache/apisix-ingress-controller/commit/866d0bfe38b1e7bfb3340c1f1a317f8d604673f5) docs: modify the format of FAQ.md (#605) +* [`2d12c3f`](https://github.com/apache/apisix-ingress-controller/commit/2d12c3fdd1369e9e263342d0def6473de5c0664f) docs: add v2beta1 description (#602) +* [`7291212`](https://github.com/apache/apisix-ingress-controller/commit/7291212964a7f3505fb1bb624fb79df0c9eb0678) fix: do not need to record status when ApisixUpstream removed (#589) +* [`c78c823`](https://github.com/apache/apisix-ingress-controller/commit/c78c8237b9c114e0e5564bd74a6729bdee04259c) chore: merge from v1.1 (#583) +* [`e649c50`](https://github.com/apache/apisix-ingress-controller/commit/e649c503ca6ba4103a27fef729f8835b90078a93) chore: add udp usage & upgrade the verion of ApisixRoute (#585) +* [`57ec6da`](https://github.com/apache/apisix-ingress-controller/commit/57ec6dafa7b96b8c2fe5c386eedfce74cb581441) fix: misspell in FAQ (#577) +

+
+ +### Dependency Changes + +* **github.com/google/uuid** v1.2.0 **_new_** +* **github.com/onsi/ginkgo** v1.16.4 **_new_** +* **golang.org/x/net** 3d97a244fca7 -> 4163338589ed +* **golang.org/x/sys** 0f9fa26af87c **_new_** +* **golang.org/x/tools** v0.1.5 **_new_** + +Previous release can be found at [1.1.0](https://github.com/apache/apisix-ingress-controller/releases/tag/1.1.0) + # 1.1.0 Welcome to the 1.1.0 release of apisix-ingress-controller! diff --git a/Makefile b/Makefile index c31886c87a..8b4b4a173b 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # default: help -VERSION ?= 1.1.0 +VERSION ?= 1.2.0 RELEASE_SRC = apache-apisix-ingress-controller-${VERSION}-src LOCAL_REGISTRY="localhost:5000" IMAGE_TAG ?= dev diff --git a/docs/en/latest/getting-started.md b/docs/en/latest/getting-started.md index 85aacb79c8..911bef808d 100644 --- a/docs/en/latest/getting-started.md +++ b/docs/en/latest/getting-started.md @@ -76,7 +76,9 @@ The following table describes the compatibility between apisix-ingress-controlle | apisix-ingress-controller | Apache APISIX | | ----:| ---:| -| `master` | `>= 2.7`, `2.7` is recommended. | +| `master` | `>= 2.7`, `2.8` is recommended. | +| `1.2.0` | `>= 2.7`, `2.8` is recommended. | +| `1.1.0` | `>= 2.7`, `2.7` is recommended. | | `1.1.0` | `>= 2.7`, `2.7` is recommended. | | `1.0.0` | `>= 2.7`, `2.7` is recommended. | | `0.6` | `>= 2.6`, `2.6` is recommended. | diff --git a/releases/v1.2.0.toml b/releases/v1.2.0.toml new file mode 100644 index 0000000000..013f201e82 --- /dev/null +++ b/releases/v1.2.0.toml @@ -0,0 +1,49 @@ +# +# 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. +# +# commit to be tagged for new release +commit = "HEAD" + +# project_name is used to refer to the project in the notes +project_name = "apisix-ingress-controller" + +# github_repo is the github project, only github is currently supported +github_repo = "apache/apisix-ingress-controller" + +# match_deps is a pattern to determine which dependencies should be included +# as part of this release. The changelog will also include changes for these +# dependencies based on the change in the dependency's version. +match_deps = "^github.com/(apache/[a-zA-Z0-9-]+)$" + +# previous release of this project for determining changes +previous = "1.1.0" + +# pre_release is whether to include a disclaimer about being a pre-release +pre_release = false + +# preface is the description of the release which precedes the author list +# and changelog. This description could include highlights as well as any +# description of changes. Use markdown formatting. +preface = """\ +This is a **GA** release. + +## Highlights + +### New Features + +* **Support ingress v1beta1 HTTPS** [#596](https://github.com/apache/apisix-ingress-controller/pull/596) +* **Implement schema API** [#601](https://github.com/apache/apisix-ingress-controller/pull/601) +"""