This is an automated email from the ASF dual-hosted git repository.

ashishtiwari pushed a commit to branch v1.8.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/v1.8.0 by this push:
     new 6ad8902e feat: add release notes for v1.8.0 release (#2111)
6ad8902e is described below

commit 6ad8902eb635fff9df63ca296d4fad66e28fc1de
Author: Ashish Tiwari <[email protected]>
AuthorDate: Mon Dec 25 23:54:52 2023 +0530

    feat: add release notes for v1.8.0 release (#2111)
    
    * feat: add release notes for v1.8.0 release
    
    * apply suggestions
---
 .asf.yaml                                     |  3 ++
 .github/workflows/codeql-analysis.yml         |  2 +-
 .github/workflows/dependency-review.yml       |  2 +-
 .github/workflows/e2e-test-ci-v2-cron-dev.yml |  2 +-
 .github/workflows/e2e-test-ci-v2-cron.yml     |  2 +-
 .github/workflows/e2e-test-ci.yml             |  2 +-
 .github/workflows/goimports-reviser.yml       |  2 +-
 .github/workflows/golangci-lint.yml           |  2 +-
 .github/workflows/license-checker.yml         |  2 +-
 .github/workflows/lint-checker.yml            |  2 +-
 .github/workflows/spell-checker.yml           |  2 +-
 .github/workflows/unit-test-ci.yml            |  2 +-
 .github/workflows/verify-codegen.yml          |  2 +-
 .github/workflows/yamllint-checker.yml        |  2 +-
 CHANGELOG.md                                  | 45 +++++++++++++++++++++++
 Makefile                                      |  2 +-
 releases/v1.8.0.toml                          | 53 +++++++++++++++++++++++++++
 17 files changed, 115 insertions(+), 14 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index c4da401b..7fea691f 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -49,3 +49,6 @@ github:
       1.7.0:
         required_pull_request_reviews:
           required_approving_review_count: 1
+      1.8.0:
+        required_pull_request_reviews:
+          required_approving_review_count: 1      
diff --git a/.github/workflows/codeql-analysis.yml 
b/.github/workflows/codeql-analysis.yml
index 58b510e0..245cb3de 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -24,7 +24,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
   schedule:
     - cron: '25 5 * * 5'
 
diff --git a/.github/workflows/dependency-review.yml 
b/.github/workflows/dependency-review.yml
index 6fe74517..1234af91 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -21,7 +21,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 
 permissions:
   contents: read
diff --git a/.github/workflows/e2e-test-ci-v2-cron-dev.yml 
b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
index 19e65731..9cc3a58e 100644
--- a/.github/workflows/e2e-test-ci-v2-cron-dev.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
@@ -25,7 +25,7 @@ on:
   push:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 
 concurrency:
   group: ${{ github.workflow }}-dev
diff --git a/.github/workflows/e2e-test-ci-v2-cron.yml 
b/.github/workflows/e2e-test-ci-v2-cron.yml
index c765f6d5..afd6ea7c 100644
--- a/.github/workflows/e2e-test-ci-v2-cron.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron.yml
@@ -24,7 +24,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || 
github.ref }}-v2
diff --git a/.github/workflows/e2e-test-ci.yml 
b/.github/workflows/e2e-test-ci.yml
index 56e430c6..4cf2cbfa 100644
--- a/.github/workflows/e2e-test-ci.yml
+++ b/.github/workflows/e2e-test-ci.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || 
github.ref }}
diff --git a/.github/workflows/goimports-reviser.yml 
b/.github/workflows/goimports-reviser.yml
index 59863982..b19e8ff6 100644
--- a/.github/workflows/goimports-reviser.yml
+++ b/.github/workflows/goimports-reviser.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 jobs:
   changes:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/golangci-lint.yml 
b/.github/workflows/golangci-lint.yml
index a0076e5c..df43ab90 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 
 jobs:
   changes:
diff --git a/.github/workflows/license-checker.yml 
b/.github/workflows/license-checker.yml
index d527222d..48463b5c 100644
--- a/.github/workflows/license-checker.yml
+++ b/.github/workflows/license-checker.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 
 jobs:
   check-license:
diff --git a/.github/workflows/lint-checker.yml 
b/.github/workflows/lint-checker.yml
index 9b592e7d..9fc762d5 100644
--- a/.github/workflows/lint-checker.yml
+++ b/.github/workflows/lint-checker.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 jobs:
   changes:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/spell-checker.yml 
b/.github/workflows/spell-checker.yml
index 7fd39d09..5e738d1f 100644
--- a/.github/workflows/spell-checker.yml
+++ b/.github/workflows/spell-checker.yml
@@ -24,7 +24,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 jobs:
   misspell:
     name: runner / misspell
diff --git a/.github/workflows/unit-test-ci.yml 
b/.github/workflows/unit-test-ci.yml
index 5691e748..238df382 100644
--- a/.github/workflows/unit-test-ci.yml
+++ b/.github/workflows/unit-test-ci.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 jobs:
   changes:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/verify-codegen.yml 
b/.github/workflows/verify-codegen.yml
index 91be424f..835ab657 100644
--- a/.github/workflows/verify-codegen.yml
+++ b/.github/workflows/verify-codegen.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 jobs:
   changes:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/yamllint-checker.yml 
b/.github/workflows/yamllint-checker.yml
index b2cac359..767075af 100644
--- a/.github/workflows/yamllint-checker.yml
+++ b/.github/workflows/yamllint-checker.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
     branches:
       - master
-      - 1.7.0
+      - 1.8.0
 jobs:
   changes:
     runs-on: ubuntu-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8f4910b..dbd25fb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
 
 # Table of Contents
 
+- [1.8.0](#180)
 - [1.7.0](#170)
 - [1.6.0](#160)
 - [1.6.0-rc1](#160-rc1)
@@ -38,6 +39,50 @@
 - [0.2.0](#020)
 - [0.1.0](#010)
 
+# 1.8.0
+
+## What's New
+
+- docs: update keys based helm chart version @Revolyssup (#2085)
+- feat: add `skip_mtls_uri_regex` support for ApisixTls @aynp (#1915)
+- feat: add support for multiple labels with same key @Revolyssup (#2099)
+- feat: Allow merging nested values in plugin config secretRef @Revolyssup 
(#2096)
+- feat: allow configuring timeout and retries for upstream with ingress 
@Revolyssup (#1876)
+- ci: add workflow to push docker image @Revolyssup (#2081)
+- fix: upgrade etcd-adapter @Revolyssup (#2078)
+- docs: Add doc for ApisixConsumer @Revolyssup (#2074)
+- fix: create unique TLS object for each item in Ingress tls @Revolyssup 
(#1989)
+- feat: add release-drafter @Revolyssup (#2068)
+- fix: replace string comparison with 64 bit int @Revolyssup (#2062)
+- chore: add Revolyssup in reviewers @Revolyssup (#2059)
+- chore(deps): bump google.golang.org/grpc from 1.42.0 to 1.56.3 in 
/test/e2e/testbackend @dependabot (#2026)
+- docs: add best practice docs to avoid race condition bw kubelet and apisix 
@Revolyssup (#2045)
+- chore: correct Makefile comments @jiangfucheng (#2038)
+- Renamed field in examples according to CRD @nayavu (#2032)
+
+## 🐛 Bug Fixes
+
+- fix: Some CRDs missing status sub-resource @Chever-John (#1809)
+
+## 🧰 Maintenance
+
+- chore(deps): bump github.com/onsi/ginkgo/v2 from 2.13.1 to 2.13.2 in 
/test/e2e @dependabot (#2079)
+- chore(deps): bump golang.org/x/crypto from 0.14.0 to 0.17.0 in /test/e2e 
@dependabot (#2107)
+- chore(deps): bump k8s.io/client-go from 0.28.4 to 0.29.0 in /test/e2e 
@dependabot (#2105)
+- chore(deps): bump k8s.io/api from 0.28.2 to 0.28.4 @dependabot (#2056)
+- chore(deps): bump k8s.io/client-go from 0.28.3 to 0.28.4 in /test/e2e 
@dependabot (#2052)
+- chore(deps): bump github.com/onsi/ginkgo/v2 from 2.13.0 to 2.13.1 in 
/test/e2e @dependabot (#2041)
+- chore(deps): bump google.golang.org/grpc from 1.57.0 to 1.57.1 in /test/e2e 
@dependabot (#2024)
+- chore(deps): bump k8s.io/apimachinery from 0.28.3 to 0.28.4 in /test/e2e 
@dependabot (#2054)
+- chore(deps): bump github.com/gorilla/websocket from 1.5.0 to 1.5.1 in 
/test/e2e @dependabot (#2035)
+- chore(deps): bump k8s.io/client-go from 0.28.2 to 0.28.3 in /test/e2e 
@dependabot (#2016)
+- chore(deps): bump k8s.io/api from 0.28.2 to 0.28.3 in /test/e2e @dependabot 
(#2018)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@Chever-John, @Revolyssup, @aynp, @dependabot, @dependabot[bot], @jiangfucheng 
and @nayavu
+
 # 1.7.0
 
 Welcome to the 1.7.0 release of apisix-ingress-controller!
diff --git a/Makefile b/Makefile
index 9778c4ff..6229e4c2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 #
 default: help
 
-VERSION ?= 1.7.0
+VERSION ?= 1.8.0
 
 
 TARGET_APISIX_VERSION ?= "3.4.1-centos"
diff --git a/releases/v1.8.0.toml b/releases/v1.8.0.toml
new file mode 100644
index 00000000..466e494f
--- /dev/null
+++ b/releases/v1.8.0.toml
@@ -0,0 +1,53 @@
+#
+# 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.7.1"
+
+# 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 feature release.
+
+## Highlights
+
+This release contains following new features:
+- feat: add skip_mtls_uri_regex support for ApisixTls 
+- feat: add support for multiple labels with same key 
+- feat: Allow merging nested values in plugin config secretRef 
+- feat: allow configuring timeout and retries for upstream with ingress 
+
+And also contains few bug fixes along with an upgrade of etcd-adapter package.
+
+"""

Reply via email to