(apisix-ingress-controller) branch master updated: chore(ci): remove tao12345666333 and lingsamuel in reviewers (#2150)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 6705ea53 chore(ci): remove tao12345666333 and lingsamuel in reviewers 
(#2150)
6705ea53 is described below

commit 6705ea5387403f6580675de263928de449b63e2b
Author: AlinsRan 
AuthorDate: Sat Feb 17 16:34:28 2024 +0800

chore(ci): remove tao12345666333 and lingsamuel in reviewers (#2150)
---
 .github/dependabot.yml | 6 --
 1 file changed, 6 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c34d0cba..3ae11605 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -26,8 +26,6 @@ updates:
 labels:
   - "area/dependencies"
 reviewers:
-  - "tao12345666333"
-  - "lingsamuel"
   - "AlinsRan"
   - "Gallardot"
   - "Revolyssup"
@@ -38,8 +36,6 @@ updates:
 labels:
   - "area/dependencies"
 reviewers:
-  - "tao12345666333"
-  - "lingsamuel"
   - "AlinsRan"
   - "Gallardot"
   - "Revolyssup"
@@ -50,8 +46,6 @@ updates:
 labels:
   - "area/dependencies"
 reviewers:
-  - "tao12345666333"
-  - "lingsamuel"
   - "AlinsRan"
   - "Gallardot"
   - "Revolyssup"

[apisix-helm-chart] branch master updated: feat: auto populate ingress_publish_service when using etcdserver (#643)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 2ba669d  feat: auto populate ingress_publish_service when using 
etcdserver (#643)
2ba669d is described below

commit 2ba669d90df8d007eb631e9892c6d99a26c10b45
Author: zhuoyang 
AuthorDate: Mon Oct 16 15:54:08 2023 +0800

feat: auto populate ingress_publish_service when using etcdserver (#643)
---
 charts/apisix-ingress-controller/templates/configmap.yaml | 4 
 1 file changed, 4 insertions(+)

diff --git a/charts/apisix-ingress-controller/templates/configmap.yaml 
b/charts/apisix-ingress-controller/templates/configmap.yaml
index 72bc687..d723094 100644
--- a/charts/apisix-ingress-controller/templates/configmap.yaml
+++ b/charts/apisix-ingress-controller/templates/configmap.yaml
@@ -24,7 +24,11 @@ data:
 key_file: {{ .Values.config.keyFile | quote }}
 http_listen: {{ .Values.config.httpListen | quote }}
 https_listen: {{ .Values.config.httpsListen | quote }}
+{{- if and (eq .Values.config.ingressPublishService "") 
(.Values.config.etcdserver.enabled)  }}
+ingress_publish_service: {{ .Release.Namespace }}/{{ include 
"apisix-ingress-controller.fullname" . }}-apisix-gateway
+{{- else }}
 ingress_publish_service: {{ .Values.config.ingressPublishService | quote }}
+{{- end }}
 {{- if gt (len .Values.config.ingressStatusAddress) 0 }}
 ingress_status_address:
 {{- range .Values.config.ingressStatusAddress }}

[apisix-helm-chart] branch master updated: chore: update ApisixRoute crd paths pattern rule (#638)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new c2d4f35  chore: update ApisixRoute crd paths pattern rule (#638)
c2d4f35 is described below

commit c2d4f3591285cd0fa2be44a238e7214348d85a5e
Author: Guilherme Sponda <13527982+g-spo...@users.noreply.github.com>
AuthorDate: Fri Oct 13 13:52:14 2023 +0200

chore: update ApisixRoute crd paths pattern rule (#638)
---
 charts/apisix-ingress-controller/crds/ApisixRoute.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/apisix-ingress-controller/crds/ApisixRoute.yaml 
b/charts/apisix-ingress-controller/crds/ApisixRoute.yaml
index 16ff7e2..479b67d 100644
--- a/charts/apisix-ingress-controller/crds/ApisixRoute.yaml
+++ b/charts/apisix-ingress-controller/crds/ApisixRoute.yaml
@@ -183,7 +183,7 @@ spec:
 type: array
   paths:
 items:
-  pattern: ^/[a-zA-Z0-9\-._~%!$&'()+,;=:@/]*\*?$
+  pattern: ^/[a-zA-Z0-9\-._~%!$&'()+,;=:@/\*]*\*?$
   type: string
 minItems: 1
 type: array
@@ -505,7 +505,7 @@ spec:
 type: array
   paths:
 items:
-  pattern: ^/[a-zA-Z0-9\-._~%!$&'()+,;=:@/]*\*?$
+  pattern: ^/[a-zA-Z0-9\-._~%!$&'()+,;=:@/\*]*\*?$
   type: string
 minItems: 1
 type: array

[apisix-helm-chart] branch dev updated: feat: allow adding extra containers to apisix deployment (#635)

[zhangjintao]

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

zhangjintao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/dev by this push:
 new d30ab3e  feat: allow adding extra containers to apisix deployment 
(#635)
d30ab3e is described below

commit d30ab3e541caca25f0cb7ad123987779e82a68f2
Author: Indrek Juhkam 
AuthorDate: Thu Oct 12 16:29:01 2023 +0300

feat: allow adding extra containers to apisix deployment (#635)
---
 charts/apisix/README.md | 1 +
 charts/apisix/templates/deployment.yaml | 3 +++
 charts/apisix/values.yaml   | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 73e628f..1ce2d7b 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -169,6 +169,7 @@ The command removes all the Kubernetes components 
associated with the chart and
 | externalEtcd.password | string | `""` | if etcd.enabled is false and 
externalEtcd.existingSecret is empty, externalEtcd.password is the passsword 
for external etcd. |
 | externalEtcd.secretPasswordKey | string | `"etcd-root-password"` | 
externalEtcd.secretPasswordKey Key inside the secret containing the external 
etcd password |
 | externalEtcd.user | string | `"root"` | if etcd.enabled is false, user for 
external etcd. Set empty to disable authentication |
+| extraContainers | list | `[]` | Additional `containers`, See [Kubernetes 
containers](https://kubernetes.io/docs/concepts/containers/) for the detail. |
 | extraEnvVars | list | `[]` | extraEnvVars An array to add extra env vars 
e.g: extraEnvVars:   - name: FOO value: "bar"   - name: FOO2 valueFrom: 
  secretKeyRef: name: SECRET_NAME key: KEY |
 | extraInitContainers | list | `[]` | Additional `initContainers`, See 
[Kubernetes 
initContainers](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)
 for the detail. |
 | extraVolumeMounts | list | `[]` | Additional `volume`, See [Kubernetes 
Volumes](https://kubernetes.io/docs/concepts/storage/volumes/) for the detail. |
diff --git a/charts/apisix/templates/deployment.yaml 
b/charts/apisix/templates/deployment.yaml
index 1b6b843..b86811c 100644
--- a/charts/apisix/templates/deployment.yaml
+++ b/charts/apisix/templates/deployment.yaml
@@ -222,6 +222,9 @@ spec:
   {{- end }}
   resources:
   {{- toYaml .Values.resources | nindent 12 }}
+{{- if .Values.extraContainers }}
+{{- toYaml .Values.extraContainers | nindent 8 }}
+{{- end }}
   {{- if .Values.hostNetwork }}
   hostNetwork: true
   dnsPolicy: ClusterFirstWithHostNet
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 6ce16fc..49d55a7 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -125,6 +125,9 @@ extraInitContainers: []
 #   image: busybox:1.28
 #   command: ['sh', '-c', "until nslookup myservice.$(cat 
/var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do 
echo waiting for myservice; sleep 2; done"]
 
+# -- Additional `containers`, See [Kubernetes 
containers](https://kubernetes.io/docs/concepts/containers/) for the detail.
+extraContainers: []
+
 initContainer:
   # -- Init container image
   image: busybox

[apisix-ingress-controller] branch master updated: fix: sync resource after namespace changed (#1982)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 5177b5fe fix: sync resource after namespace changed (#1982)
5177b5fe is described below

commit 5177b5fe6a3976a71484d06575bd31a910c48176
Author: BigFish <736759...@qq.com>
AuthorDate: Tue Oct 10 14:55:54 2023 +0800

fix: sync resource after namespace changed (#1982)

Co-authored-by: lvjin 
---
 pkg/providers/apisix/apisix_consumer.go| 15 -
 pkg/providers/apisix/apisix_global_rule.go | 15 -
 pkg/providers/apisix/apisix_plugin_config.go   | 15 -
 pkg/providers/apisix/apisix_route.go   | 24 ---
 pkg/providers/apisix/apisix_tls.go | 15 -
 pkg/providers/apisix/apisix_upstream.go| 15 -
 pkg/providers/apisix/provider.go   | 16 ++---
 pkg/providers/controller.go| 18 +++--
 pkg/providers/ingress/ingress.go   | 15 -
 pkg/providers/ingress/provider.go  |  9 ++-
 pkg/providers/k8s/namespace/namespace.go   | 12 +++-
 pkg/providers/k8s/namespace/namespace_provider.go  | 34 +-
 .../suite-ingress-features/namespace.go| 76 ++
 13 files changed, 227 insertions(+), 52 deletions(-)

diff --git a/pkg/providers/apisix/apisix_consumer.go 
b/pkg/providers/apisix/apisix_consumer.go
index ff308986..e896f1a7 100644
--- a/pkg/providers/apisix/apisix_consumer.go
+++ b/pkg/providers/apisix/apisix_consumer.go
@@ -324,7 +324,9 @@ func (c *apisixConsumerController) onDelete(obj 
interface{}) {
c.MetricsCollector.IncrEvents("consumer", "delete")
 }
 
-func (c *apisixConsumerController) ResourceSync(interval time.Duration) {
+// ResourceSync syncs ApisixConsumer resources within namespace to workqueue.
+// If namespace is "", it syncs all namespaces ApisixConsumer resources.
+func (c *apisixConsumerController) ResourceSync(interval time.Duration, 
namespace string) {
objs := c.ApisixConsumerInformer.GetIndexer().List()
delay := GetSyncDelay(interval, len(objs))
 
@@ -337,6 +339,17 @@ func (c *apisixConsumerController) ResourceSync(interval 
time.Duration) {
if !c.namespaceProvider.IsWatchingNamespace(key) {
continue
}
+   ns, _, err := cache.SplitMetaNamespaceKey(key)
+   if err != nil {
+   log.Errorw("split ApisixRoute meta key failed",
+   zap.Error(err),
+   zap.String("key", key),
+   )
+   continue
+   }
+   if namespace != "" && ns != namespace {
+   continue
+   }
ac, err := kube.NewApisixConsumer(obj)
if err != nil {
log.Errorw("found ApisixConsumer resource with bad 
type", zap.String("error", err.Error()))
diff --git a/pkg/providers/apisix/apisix_global_rule.go 
b/pkg/providers/apisix/apisix_global_rule.go
index a9a70f74..df86a8da 100644
--- a/pkg/providers/apisix/apisix_global_rule.go
+++ b/pkg/providers/apisix/apisix_global_rule.go
@@ -340,7 +340,9 @@ func (c *apisixGlobalRuleController) onDelete(obj 
interface{}) {
c.MetricsCollector.IncrEvents("GlobalRule", "delete")
 }
 
-func (c *apisixGlobalRuleController) ResourceSync(interval time.Duration) {
+// ResourceSync syncs ApisixGlobalRule resources within namespace to workqueue.
+// If namespace is "", it syncs all namespaces ApisixGlobalRule resources.
+func (c *apisixGlobalRuleController) ResourceSync(interval time.Duration, 
namespace string) {
objs := c.ApisixGlobalRuleInformer.GetIndexer().List()
delay := GetSyncDelay(interval, len(objs))
 
@@ -357,6 +359,17 @@ func (c *apisixGlobalRuleController) ResourceSync(interval 
time.Duration) {
if !c.namespaceProvider.IsWatchingNamespace(key) {
continue
}
+   ns, _, err := cache.SplitMetaNamespaceKey(key)
+   if err != nil {
+   log.Errorw("split ApisixRoute meta key failed",
+   zap.Error(err),
+   zap.String("key", key),
+   )
+   continue
+   }
+   if namespace != "" && ns != namespace {
+   continue
+   }
log.Debugw("ResourceSync",
zap.String("resource", "ApisixGlobalRule"),

[apisix-helm-chart] branch master updated: bugfix: metricRelabelings default value (#593)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new c64fa70  bugfix: metricRelabelings default value (#593)
c64fa70 is described below

commit c64fa708c6ac6de0ba692b6192071a66166dbcc8
Author: Nick Venenga 
AuthorDate: Sun Oct 8 22:08:39 2023 -0400

bugfix: metricRelabelings default value (#593)
---
 charts/apisix/README.md   | 4 ++--
 charts/apisix/values.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 9f90d54..3b9b239 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -202,14 +202,14 @@ The command removes all the Kubernetes components 
associated with the chart and
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `false` |  |
 | serviceAccount.name | string | `""` |  |
-| serviceMonitor | object | 
`{"annotations":{},"containerPort":9091,"enabled":false,"interval":"15s","labels":{},"metricPrefix":"apisix_","metricRelabelings":{},"name":"","namespace":"","path":"/apisix/prometheus/metrics"}`
 | Observability configuration. ref: 
https://apisix.apache.org/docs/apisix/plugins/prometheus/ |
+| serviceMonitor | object | 
`{"annotations":{},"containerPort":9091,"enabled":false,"interval":"15s","labels":{},"metricPrefix":"apisix_","metricRelabelings":[],"name":"","namespace":"","path":"/apisix/prometheus/metrics"}`
 | Observability configuration. ref: 
https://apisix.apache.org/docs/apisix/plugins/prometheus/ |
 | serviceMonitor.annotations | object | `{}` | @param 
serviceMonitor.annotations ServiceMonitor annotations |
 | serviceMonitor.containerPort | int | `9091` | container port where the 
metrics are exposed |
 | serviceMonitor.enabled | bool | `false` | Enable or disable Apache APISIX 
serviceMonitor |
 | serviceMonitor.interval | string | `"15s"` | interval at which metrics 
should be scraped |
 | serviceMonitor.labels | object | `{}` | @param serviceMonitor.labels 
ServiceMonitor extra labels |
 | serviceMonitor.metricPrefix | string | `"apisix_"` | prefix of the metrics |
-| serviceMonitor.metricRelabelings | object | `{}` | @param 
serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples 
before ingestion. ref: 
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
 |
+| serviceMonitor.metricRelabelings | list | `[]` | @param 
serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples 
before ingestion. ref: 
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
 |
 | serviceMonitor.name | string | `""` | name of the serviceMonitor, by 
default, it is the same as the apisix fullname |
 | serviceMonitor.namespace | string | `""` | namespace where the 
serviceMonitor is deployed, by default, it is the same as the namespace of the 
apisix |
 | serviceMonitor.path | string | `"/apisix/prometheus/metrics"` | path of the 
metrics endpoint |
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index ee22bb7..4d3f560 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -579,7 +579,7 @@ serviceMonitor:
   annotations: {}
   # -- @param serviceMonitor.metricRelabelings MetricRelabelConfigs to apply 
to samples before ingestion.
   # ref: 
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
-  metricRelabelings: {}
+  metricRelabelings: []
 
 # -- etcd configuration
 # use the FQDN address or the IP of the etcd

[apisix-ingress-controller] branch master updated (fb021c63 -> 5a60ac58)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from fb021c63 chore(deps): bump golang.org/x/net from 0.14.0 to 0.16.0 
(#1998)
 add 5a60ac58 chore(deps): bump github.com/gavv/httpexpect/v2 in /test/e2e 
(#2000)

No new revisions were added by this update.

Summary of changes:
 test/e2e/go.mod | 3 ++-
 test/e2e/go.sum | 7 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

[apisix-ingress-controller] branch master updated (b841857a -> fb021c63)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from b841857a chore: support customize docker repository name (#1958)
 add fb021c63 chore(deps): bump golang.org/x/net from 0.14.0 to 0.16.0 
(#1998)

No new revisions were added by this update.

Summary of changes:
 go.mod  | 10 +-
 go.sum  | 20 ++--
 test/e2e/go.mod | 10 +-
 test/e2e/go.sum | 20 ++--
 4 files changed, 30 insertions(+), 30 deletions(-)

[apisix-ingress-controller] branch dependabot/go_modules/golang.org/x/net-0.16.0 updated (7821b520 -> 11be3c7c)

[zhangjintao]

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

zhangjintao pushed a change to branch 
dependabot/go_modules/golang.org/x/net-0.16.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 7821b520 chore(deps): bump golang.org/x/net from 0.14.0 to 0.16.0
 add 11be3c7c dep(test): bump golang.org/x/net from 0.14.0 to 0.16.0

No new revisions were added by this update.

Summary of changes:
 test/e2e/go.mod | 10 +-
 test/e2e/go.sum | 20 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

[apisix-ingress-controller] branch master updated: chore: support customize docker repository name (#1958)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new b841857a chore: support customize docker repository name (#1958)
b841857a is described below

commit b841857aae8d7d749ffa6d416dd3ebf71866b8ec
Author: Fucheng Jiang 
AuthorDate: Sat Oct 7 14:12:37 2023 +0800

chore: support customize docker repository name (#1958)
---
 .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/k8s-timer-ci.yml| 2 +-
 Makefile  | 6 --
 test/e2e/suite-annotations/websocket.go   | 4 ++--
 test/e2e/suite-features/websocket.go  | 2 +-
 test/e2e/suite-gateway/gateway_httproute.go   | 2 +-
 utils/kind-with-registry.sh   | 5 +++--
 9 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/e2e-test-ci-v2-cron-dev.yml 
b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
index 787d632a..2875dbac 100644
--- a/.github/workflows/e2e-test-ci-v2-cron-dev.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
@@ -99,7 +99,7 @@ jobs:
   APISIX_ADMIN_API_VERSION: "v3"
   TAG: dev
   ARCH: amd64
-  REGISTRY: localhost:5000
+  REGISTRY: 127.0.0.1:5000
   ENABLE_PROXY: "false"
 run: |
   echo "building images..."
diff --git a/.github/workflows/e2e-test-ci-v2-cron.yml 
b/.github/workflows/e2e-test-ci-v2-cron.yml
index 36707fb3..8e576d7d 100644
--- a/.github/workflows/e2e-test-ci-v2-cron.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron.yml
@@ -99,7 +99,7 @@ jobs:
   APISIX_ADMIN_API_VERSION: "v2"
   TAG: dev
   ARCH: amd64
-  REGISTRY: localhost:5000
+  REGISTRY: 127.0.0.1:5000
   ENABLE_PROXY: "false"
 run: |
   echo "building images..."
diff --git a/.github/workflows/e2e-test-ci.yml 
b/.github/workflows/e2e-test-ci.yml
index 96e10eb8..a827edbb 100644
--- a/.github/workflows/e2e-test-ci.yml
+++ b/.github/workflows/e2e-test-ci.yml
@@ -100,7 +100,7 @@ jobs:
 env:
   TAG: dev
   ARCH: amd64
-  REGISTRY: localhost:5000
+  REGISTRY: 127.0.0.1:5000
   ENABLE_PROXY: "false"
 run: |
   echo "building images..."
diff --git a/.github/workflows/k8s-timer-ci.yml 
b/.github/workflows/k8s-timer-ci.yml
index c4f8925f..28cd9e2b 100644
--- a/.github/workflows/k8s-timer-ci.yml
+++ b/.github/workflows/k8s-timer-ci.yml
@@ -89,7 +89,7 @@ jobs:
 env:
   TAG: dev
   ARCH: amd64
-  REGISTRY: localhost:5000
+  REGISTRY: 127.0.0.1:5000
   ENABLE_PROXY: "false"
 run: |
   echo "building images..."
diff --git a/Makefile b/Makefile
index cc756667..55975ca0 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,9 @@ ifeq ($(APISIX_ADMIN_API_VERSION),"v2")
 endif
 
 RELEASE_SRC = apache-apisix-ingress-controller-${VERSION}-src
+REPOSITORY="127.0.0.1"
 REGISTRY_PORT ?= "5000"
-REGISTRY ?="localhost:$(REGISTRY_PORT)"
+REGISTRY ?="${REPOSITORY}:$(REGISTRY_PORT)"
 IMAGE_TAG ?= dev
 ENABLE_PROXY ?= true
 
@@ -171,7 +172,8 @@ uninstall:
 ### kind-up:  Launch a Kubernetes cluster with a image registry by 
Kind.
 .PHONY: kind-up
 kind-up:
-   ./utils/kind-with-registry.sh $(REGISTRY_PORT)
+   REPOSITORY=${REPOSITORY} ./utils/kind-with-registry.sh $(REGISTRY_PORT)
+
 ### kind-reset:   Delete the Kubernetes cluster created by "make 
kind-up"
 .PHONY: kind-reset
 kind-reset:
diff --git a/test/e2e/suite-annotations/websocket.go 
b/test/e2e/suite-annotations/websocket.go
index 71d1ab25..462de332 100644
--- a/test/e2e/suite-annotations/websocket.go
+++ b/test/e2e/suite-annotations/websocket.go
@@ -57,7 +57,7 @@ spec:
 protocol: TCP
 targetPort: 8080
 `
-   err := s.CreateResourceFromString(resources)
+   err := s.CreateResourceFromString(s.FormatRegistry(resources))
assert.Nil(ginkgo.GinkgoT(), err)
time.Sleep(5 * time.Second)
 
@@ -143,7 +143,7 @@ spec:
 protocol: TCP
 targetPort: 8080
 `
-   err := s.CreateResourceFromString(resources)
+   err := s.CreateResourceFromString(s.FormatRegistry(resources))
assert.Nil(ginkgo.GinkgoT(), err)
time.Sleep(5 * time.Second)
 
diff --git a/test/e2e/suite-features/websocket.go 
b/test/e2e/suite-features/websocket.go
index 723a86ad..7ba93a20 100644
--- a/test/e2e/suite-features/websocket.go
+++ b/test/e2e/suite-features/websocket.go
@@ -

[apisix-helm-chart] branch master updated: chore: upgrade APISIX to 3.6.0 (#633)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 5eb6798  chore: upgrade APISIX to 3.6.0 (#633)
5eb6798 is described below

commit 5eb67987d59962a2b794fb6dd80531ed54a654a4
Author: Xin Rong 
AuthorDate: Sat Oct 7 08:38:19 2023 +0800

chore: upgrade APISIX to 3.6.0 (#633)
---
 charts/apisix/Chart.yaml   |  4 +--
 charts/apisix/README.md| 17 +-
 charts/apisix/templates/_pod.tpl   | 32 --
 charts/apisix/templates/configmap.yaml | 27 +--
 charts/apisix/templates/service-control-plane.yaml | 38 --
 charts/apisix/values.yaml  | 37 +
 6 files changed, 5 insertions(+), 150 deletions(-)

diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 08546b1..2ccaa4b 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,12 +31,12 @@ type: application
 # This is the chart version. This version number should be incremented each 
time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.6.2
+version: 1.7.0
 
 # This is the version number of the application being deployed. This version 
number should be
 # incremented each time you make changes to the application. Versions are not 
expected to
 # follow Semantic Versioning. They should reflect the version the application 
is using.
-appVersion: 3.5.0
+appVersion: 3.6.0
 sources:
   - https://github.com/apache/apisix-helm-chart
 
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index a7bd2ac..9f90d54 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -70,7 +70,7 @@ The command removes all the Kubernetes components associated 
with the chart and
 | apisix.httpRouter | string | `"radixtree_host_uri"` | Defines how apisix 
handles routing: - radixtree_uri: match route by uri(base on radixtree) - 
radixtree_host_uri: match route by host + uri(base on radixtree) - 
radixtree_uri_with_parameter: match route by uri with parameters |
 | apisix.image.pullPolicy | string | `"IfNotPresent"` | Apache APISIX image 
pull policy |
 | apisix.image.repository | string | `"apache/apisix"` | Apache APISIX image 
repository |
-| apisix.image.tag | string | `"3.5.0-debian"` | Apache APISIX image tag 
Overrides the image tag whose default is the chart appVersion. |
+| apisix.image.tag | string | `"3.6.0-debian"` | Apache APISIX image tag 
Overrides the image tag whose default is the chart appVersion. |
 | apisix.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` |
 | apisix.luaModuleHook | object | 
`{"configMapRef":{"mounts":[{"key":"","path":""}],"name":""},"enabled":false,"hookPoint":"","luaPath":""}`
 | Whether to add a custom lua module |
 | apisix.luaModuleHook.configMapRef | object | 
`{"mounts":[{"key":"","path":""}],"name":""}` | configmap that stores the codes 
|
@@ -120,21 +120,6 @@ The command removes all the Kubernetes components 
associated with the chart and
 | dashboard.config.conf.etcd.prefix | string | `"/apisix"` | apisix 
configurations prefix |
 | dashboard.config.conf.etcd.username | string | `nil` | Specifies etcd basic 
auth username if enable etcd auth |
 | dashboard.enabled | bool | `false` |  |
-| deployment.certs | object | 
`{"cert":"","cert_key":"","certsSecret":"","mTLSCACert":"","mTLSCACertSecret":""}`
 | certs used for certificates in decoupled mode |
-| deployment.certs.cert | string | `""` | cert name in certsSecret |
-| deployment.certs.cert_key | string | `""` | cert key in certsSecret |
-| deployment.certs.certsSecret | string | `""` | secret name used for 
decoupled mode |
-| deployment.certs.mTLSCACert | string | `""` | mTLS CA cert filename in 
mTLSCACertSecret |
-| deployment.certs.mTLSCACertSecret | string | `""` | trusted_ca_cert name in 
certsSecret |
-| deployment.controlPlane | object | 
`{"cert":"","certKey":"","certsSecret":"","confServerPort":"9280"}` | used for 
control_plane deployment mode |
-| deployment.controlPlane.cert | string | `""` | conf Server CA cert name in 
certsSecret |
-| deployment.controlPlane.certKey | string | `""` | conf Serve

[apisix-helm-chart] branch master updated: chore: bump apisix-ingress-controller to 0.12.2 (#629)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 367debd  chore: bump apisix-ingress-controller to 0.12.2 (#629)
367debd is described below

commit 367debdb15537bb22928a7aaa236858bfca676e0
Author: Sarasa Kisaragi 
AuthorDate: Thu Sep 28 16:31:42 2023 +0800

chore: bump apisix-ingress-controller to 0.12.2 (#629)
---
 charts/apisix-ingress-controller/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/apisix-ingress-controller/Chart.yaml 
b/charts/apisix-ingress-controller/Chart.yaml
index 8bdf8bf..8a27f67 100644
--- a/charts/apisix-ingress-controller/Chart.yaml
+++ b/charts/apisix-ingress-controller/Chart.yaml
@@ -24,7 +24,7 @@ keywords:
   - nginx
   - crd
 type: application
-version: 0.12.1
+version: 0.12.2
 appVersion: 1.7.0
 sources:
   - https://github.com/apache/apisix-helm-chart

[apisix-ingress-controller] branch master updated (cc3bac85 -> bca0d1da)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from cc3bac85 chore(deps): bump github.com/onsi/ginkgo/v2 in /test/e2e 
(#1977)
 add bca0d1da chore(deps): bump k8s.io/code-generator from 0.28.1 to 0.28.2 
(#1979)

No new revisions were added by this update.

Summary of changes:
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

[apisix-ingress-controller] branch master updated (23f2af09 -> cc3bac85)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 23f2af09 chore(deps): bump go.uber.org/zap from 1.25.0 to 1.26.0 
(#1978)
 add cc3bac85 chore(deps): bump github.com/onsi/ginkgo/v2 in /test/e2e 
(#1977)

No new revisions were added by this update.

Summary of changes:
 test/e2e/go.mod | 4 ++--
 test/e2e/go.sum | 8 
 2 files changed, 6 insertions(+), 6 deletions(-)

[apisix-ingress-controller] branch master updated (68d33c96 -> 23f2af09)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 68d33c96 chore(deps): bump sigs.k8s.io/controller-runtime from 0.16.1 
to 0.16.2 (#1961)
 add 23f2af09 chore(deps): bump go.uber.org/zap from 1.25.0 to 1.26.0 
(#1978)

No new revisions were added by this update.

Summary of changes:
 go.mod | 2 +-
 go.sum | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

[apisix-ingress-controller] branch master updated: chore: remove v2beta3 crds (#1976)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 96a0cfed chore: remove v2beta3 crds (#1976)
96a0cfed is described below

commit 96a0cfed2be6b0dd5573fc8084b93be28c7bf340
Author: Jintao Zhang 
AuthorDate: Thu Sep 21 14:35:20 2023 +0800

chore: remove v2beta3 crds (#1976)

Signed-off-by: Jintao Zhang 
---
 samples/deploy/crd/v1/ApisixClusterConfig.yaml |  39 ---
 samples/deploy/crd/v1/ApisixConsumer.yaml  | 174 ---
 samples/deploy/crd/v1/ApisixPluginConfig.yaml  |  53 
 samples/deploy/crd/v1/ApisixRoute.yaml | 275 -
 samples/deploy/crd/v1/ApisixTls.yaml   | 158 --
 samples/deploy/crd/v1/ApisixUpstream.yaml  | 391 -
 6 files changed, 1090 deletions(-)

diff --git a/samples/deploy/crd/v1/ApisixClusterConfig.yaml 
b/samples/deploy/crd/v1/ApisixClusterConfig.yaml
index efddfff6..355883e7 100644
--- a/samples/deploy/crd/v1/ApisixClusterConfig.yaml
+++ b/samples/deploy/crd/v1/ApisixClusterConfig.yaml
@@ -30,45 +30,6 @@ spec:
   - acc
   preserveUnknownFields: false
   versions:
-- name: v2beta3
-  served: true
-  storage: false
-  subresources:
-status: {}
-  schema:
-openAPIV3Schema:
-  type: object
-  properties:
-spec:
-  type: object
-  properties:
-admin:
-  type: object
-  required:
-- baseURL
-  properties:
-baseURL:
-  type: string
-  pattern: "https?://[^:]+:(\\d+)"
-adminKey:
-  type: string
-monitoring:
-  type: object
-  properties:
-prometheus:
-  type: object
-  properties:
-enable:
-  type: boolean
-skywalking:
-  type: object
-  properties:
-enable:
-  type: boolean
-sampleRatio:
-  type: number
-  minimum: 0.1
-  maximum: 1
 - name: v2
   served: true
   storage: true
diff --git a/samples/deploy/crd/v1/ApisixConsumer.yaml 
b/samples/deploy/crd/v1/ApisixConsumer.yaml
index dce048d6..1bcdd0a3 100644
--- a/samples/deploy/crd/v1/ApisixConsumer.yaml
+++ b/samples/deploy/crd/v1/ApisixConsumer.yaml
@@ -30,180 +30,6 @@ spec:
   - ac
   preserveUnknownFields: false
   versions:
-- name: v2beta3
-  served: true
-  storage: false
-  subresources:
-status: {}
-  schema:
-openAPIV3Schema:
-  type: object
-  properties:
-spec:
-  type: object
-  required:
-- authParameter
-  properties:
-authParameter:
-  type: object
-  oneOf:
-- required: ["basicAuth"]
-- required: ["keyAuth"]
-- required: ["wolfRBAC"]
-- required: ["jwtAuth"]
-- required: ["hmacAuth"]
-  properties:
-basicAuth:
-  type: object
-  oneOf:
-- required: ["value"]
-- required: ["secretRef"]
-  properties:
-value:
-  type: object
-  properties:
-username:
-  type: string
-  minLength: 1
-password:
-  type: string
-  minLength: 1
-  required:
-- username
-- password
-secretRef:
-  type: object
-  properties:
-name:
-  type: string
-  minLength: 1
-  required:
-- name
-keyAuth:
-  type: object
-  oneOf:
-- required: ["value"]
-- required: ["secretRef"]
-  properties:
-value:
-  type: object
-   

[apisix-ingress-controller] branch master updated (15ace1d3 -> 245e9e9a)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 15ace1d3 chore: split run-e2e-test to separate action (#1959)
 add 245e9e9a chore(deps): bump go.uber.org/zap from 1.25.0 to 1.26.0 in 
/test/e2e (#1967)

No new revisions were added by this update.

Summary of changes:
 test/e2e/go.mod | 2 +-
 test/e2e/go.sum | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

[apisix-ingress-controller] branch 1.7.0 updated: fix: ingress-apisix version of deploy image tag and document (#1968) (#1972)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/1.7.0 by this push:
 new a07a30be fix: ingress-apisix version of deploy image tag and document 
(#1968) (#1972)
a07a30be is described below

commit a07a30bef39635fa823fa684b1fe881d62bfdf2f
Author: Xin Rong 
AuthorDate: Thu Sep 21 14:24:10 2023 +0800

fix: ingress-apisix version of deploy image tag and document (#1968) (#1972)
---
 README.md |  2 +-
 docs/en/latest/composite.md   | 50 ++-
 docs/en/latest/config.json|  4 ++
 samples/deploy/composite.yaml | 94 +++
 4 files changed, 97 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index bd786bcb..53585a21 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ for us to fix.
 
 ## Community
 
-* Mailing List: Mail to dev-subscr...@apisix.apache.org, follow the reply to 
subscribe the mailing list.
+* Mailing List: Mail to , follow the reply to 
subscribe the mailing list.
 * QQ Group - 578997126
 * ![Twitter 
Follow](https://img.shields.io/twitter/follow/ApacheAPISIX?style=social) - 
follow and interact with us using hashtag `#ApacheAPISIX`
 * [Bilibili video](https://space.bilibili.com/551921247)
diff --git a/docs/en/latest/composite.md b/docs/en/latest/composite.md
index 3135344c..91e37129 100644
--- a/docs/en/latest/composite.md
+++ b/docs/en/latest/composite.md
@@ -21,7 +21,11 @@ title: Composite Architecture
 #
 -->
 
-**Please note that this is a preview feature**
+:::note
+
+**This feature is experimental**
+
+:::
 
 ## Background
 
@@ -49,10 +53,30 @@ Since apisix strongly relies on the etcd API, the 
control-plane will simulate th
 
 ## Installation
 
+Save the APISIX Ingress version to an environment variable to be used next:
+
+```bash
+APISIX_INGRESS_VERSION="1.7.0"
+```
+
+Clone the APISIX Ingress source code of this version into a new directory 
apisix-APISIX_VERSION:
+
+```bash
+git clone --depth 1 --branch ${APISIX_INGRESS_VERSION} 
https://github.com/apache/apisix-ingress-controller.git 
ingress-apisix-${APISIX_INGRESS_VERSION}
+```
+
 Install the CRDs and ingress-apisix:
 
+```bash
+cd ingress-apisix-${APISIX_INGRESS_VERSION}
+# install CRDs
+kubectl apply -k samples/deploy/crd/v1
+# install ingress-apisix
+kubectl apply -f samples/deploy/composite.yaml
+```
+
 ```shell
-$ kubectl apply -f samples/deploy/composite.yaml
+# install ingress-apisix output
 namespace/ingress-apisix created
 clusterrole.rbac.authorization.k8s.io/apisix-view-clusterrole created
 serviceaccount/apisix-view-serviceaccount created
@@ -65,11 +89,15 @@ service/ingress-apisix-gateway created
 Check the pod status to confirm successful installation:
 
 ```shell
-$ kubectl get service  -n ingress-apisix # check service
+kubectl get service -n ingress-apisix # check service
+kubectl get pods -n ingress-apisix # check pod
+```
+
+```shell
+# service
 NAMETYPECLUSTER-IP   EXTERNAL-IP   PORT(S) 
 AGE
 ingress-apisix-gateway  NodePort10.99.236.58 
80:31143/TCP,443:30166/TCP   90s
-
-$ kubectl get pods -n ingress-apisix # check pod
+# pod
 NAME READY   STATUS
RESTARTS   AGE
 ingress-apisix-composite-deployment-5df9bc99c7-xxpvq   2/2 Running   0 
 100s
 ```
@@ -82,12 +110,16 @@ Install the ApisixRoute and httpbin app:
 kubectl apply -f samples/httpbin/httpbin-route.yaml
 ```
 
-After forwarding the local port 9080 to the service port 80, send a request:
+After forwarding the local port 9080 to the `ingress-apisix-gateway` service 
port 80, send a request:
 
-```shell
-$ kubectl port-forward service/ingress-apisix-gateway 9080:80 -n 
ingress-apisix &
+```bash
+# forward local port 9080 to ingress-apisix-gateway service port 80
+kubectl port-forward service/ingress-apisix-gateway 9080:80 -n ingress-apisix &
+# send a request
+curl http://127.0.0.1:9080/headers -H 'Host: httpbin.org'
+```
 
-$ curl http://127.0.0.1:9080/headers -H 'Host: httpbin.org'
+```shell
 {
   "headers": {
 "Accept": "*/*", 
diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
index 39fe9e97..62c5ea2e 100644
--- a/docs/en/latest/config.json
+++ b/docs/en/latest/config.json
@@ -79,6 +79,10 @@
   "type": "doc",
   "id": "design"
 },
+{
+  "type": "doc",
+  "id": "composite"
+},
 {
   "type": "doc",
   "id": "contribute"
diff --git a/samples/deploy/composite.yaml b/samples/deploy/composite.yaml
index 72edb390..404023fd 100644
--- a/samples/deploy/composite.yaml
+++ b

[apisix-ingress-controller] branch master updated: ci: remove the conditions for triggers (#1970)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new b524e477 ci: remove the conditions for triggers (#1970)
b524e477 is described below

commit b524e477c32a14acf2cfcf4879eea1aee3d782fc
Author: Jintao Zhang 
AuthorDate: Wed Sep 20 14:40:47 2023 +0800

ci: remove the conditions for triggers (#1970)

Signed-off-by: Jintao Zhang 
---
 .github/workflows/codeql-analysis.yml | 2 --
 .github/workflows/dependency-review.yml   | 1 -
 .github/workflows/e2e-test-ci-v2-cron.yml | 1 -
 .github/workflows/e2e-test-ci.yml | 1 -
 .github/workflows/goimports-reviser.yml   | 1 -
 .github/workflows/golangci-lint.yml   | 1 -
 .github/workflows/license-checker.yml | 1 -
 .github/workflows/lint-checker.yml| 1 -
 .github/workflows/spell-checker.yml   | 1 -
 .github/workflows/unit-test-ci.yml| 1 -
 .github/workflows/verify-codegen.yml  | 1 -
 .github/workflows/yamllint-checker.yml| 1 -
 12 files changed, 13 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml 
b/.github/workflows/codeql-analysis.yml
index 50afb900..58b510e0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -22,8 +22,6 @@ on:
   push:
 branches: [ master ]
   pull_request:
-types: [review_requested, ready_for_review]
-# The branches below must be a subset of the branches above
 branches:
   - master
   - 1.7.0
diff --git a/.github/workflows/dependency-review.yml 
b/.github/workflows/dependency-review.yml
index 09be2960..6fe74517 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -22,7 +22,6 @@ on:
 branches:
   - master
   - 1.7.0
-types: [review_requested, ready_for_review]
 
 permissions:
   contents: read
diff --git a/.github/workflows/e2e-test-ci-v2-cron.yml 
b/.github/workflows/e2e-test-ci-v2-cron.yml
index 5ba28587..5b2f7ba6 100644
--- a/.github/workflows/e2e-test-ci-v2-cron.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron.yml
@@ -25,7 +25,6 @@ on:
 branches:
   - master
   - 1.7.0
-types: [ labeled, opened, synchronize, reopened, review_requested, 
ready_for_review ]
 
 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 b5347dd1..d30a3587 100644
--- a/.github/workflows/e2e-test-ci.yml
+++ b/.github/workflows/e2e-test-ci.yml
@@ -26,7 +26,6 @@ on:
 branches:
   - master
   - 1.7.0
-types: [review_requested, ready_for_review]
 
 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 8a724500..59863982 100644
--- a/.github/workflows/goimports-reviser.yml
+++ b/.github/workflows/goimports-reviser.yml
@@ -26,7 +26,6 @@ on:
 branches:
   - master
   - 1.7.0
-types: [review_requested, ready_for_review]
 jobs:
   changes:
 runs-on: ubuntu-latest
diff --git a/.github/workflows/golangci-lint.yml 
b/.github/workflows/golangci-lint.yml
index b9ccc380..a0076e5c 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -26,7 +26,6 @@ on:
 branches:
   - master
   - 1.7.0
-types: [review_requested, ready_for_review]
 
 jobs:
   changes:
diff --git a/.github/workflows/license-checker.yml 
b/.github/workflows/license-checker.yml
index e74610b3..d527222d 100644
--- a/.github/workflows/license-checker.yml
+++ b/.github/workflows/license-checker.yml
@@ -26,7 +26,6 @@ on:
 branches:
   - master
   - 1.7.0
-types: [review_requested, ready_for_review]
 
 jobs:
   check-license:
diff --git a/.github/workflows/lint-checker.yml 
b/.github/workflows/lint-checker.yml
index aaf0909a..38a0fa5d 100644
--- a/.github/workflows/lint-checker.yml
+++ b/.github/workflows/lint-checker.yml
@@ -26,7 +26,6 @@ on:
 branches:
   - master
   - 1.7.0
-types: [review_requested, ready_for_review]
 jobs:
   changes:
 runs-on: ubuntu-latest
diff --git a/.github/workflows/spell-checker.yml 
b/.github/workflows/spell-checker.yml
index a47bd5cf..7fd39d09 100644
--- a/.github/workflows/spell-checker.yml
+++ b/.github/workflows/spell-checker.yml
@@ -25,7 +25,6 @@ on:
 branches:
   - master
   - 1.7.0
-types: [review_requested, ready_for_review]
 jobs:
   misspell:
 name: runner / misspell
diff --git a/.github/workflows/unit-test-ci.yml 
b/.github/workflows/unit-test-ci.yml
index a097ed2e..5691e748 100644
--- a/.github/workflows/unit-test-ci.yml
+++ b/.github/workflows/unit-test-ci.yml
@@ -26,7 +26,6 @@ on:
 branches:
   - master

[apisix-ingress-controller] branch master updated: chore(ci): upgrade node version (#1971)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 9419867d chore(ci): upgrade node version (#1971)
9419867d is described below

commit 9419867dcf443cfd4077a9c7cee27fc305e556b7
Author: Xin Rong 
AuthorDate: Wed Sep 20 15:58:50 2023 +0800

chore(ci): upgrade node version (#1971)
---
 .github/workflows/lint-checker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint-checker.yml 
b/.github/workflows/lint-checker.yml
index 38a0fa5d..9b592e7d 100644
--- a/.github/workflows/lint-checker.yml
+++ b/.github/workflows/lint-checker.yml
@@ -89,7 +89,7 @@ jobs:
   - name: 🚀 Use Node.js
 uses: actions/setup-node@v3
 with:
-  node-version: '12.x'
+  node-version: '20.7.x'
   - run: npm install -g markdownlint-cli@0.36.0
   - run: markdownlint '**/*.md' --ignore node_modules --ignore 
CHANGELOG.md --ignore docs/en/latest/references/v2.md
   markdown-link-check:

[apisix-ingress-controller] branch master updated: fix: ingress-apisix version of deploy image tag and document (#1968)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e2b0524b fix: ingress-apisix version of deploy image tag and document 
(#1968)
e2b0524b is described below

commit e2b0524b1682c477ffb35074232e6473ec1d9dca
Author: Xin Rong 
AuthorDate: Wed Sep 20 12:40:02 2023 +0800

fix: ingress-apisix version of deploy image tag and document (#1968)
---
 docs/en/latest/composite.md   | 50 ++-
 samples/deploy/composite.yaml | 94 +++
 2 files changed, 92 insertions(+), 52 deletions(-)

diff --git a/docs/en/latest/composite.md b/docs/en/latest/composite.md
index 3135344c..abcaf363 100644
--- a/docs/en/latest/composite.md
+++ b/docs/en/latest/composite.md
@@ -21,7 +21,11 @@ title: Composite Architecture
 #
 -->
 
-**Please note that this is a preview feature**
+:::note
+
+**This feature is experimental**
+
+:::
 
 ## Background
 
@@ -49,10 +53,30 @@ Since apisix strongly relies on the etcd API, the 
control-plane will simulate th
 
 ## Installation
 
+Save the APISIX Ingress version to an environment variable to be used next:
+
+```bash
+APISIX_INGRESS_VERSION="1.7.0"
+```
+
+Clone the APISIX Ingress source code of this version into a new directory 
apisix-APISIX_VERSION:
+
+```bash
+git clone --depth 1 --branch v${APISIX_INGRESS_VERSION} 
https://github.com/apache/apisix-ingress-controller.git 
ingress-apisix-${APISIX_INGRESS_VERSION}
+```
+
 Install the CRDs and ingress-apisix:
 
+```bash
+cd ingress-apisix-${APISIX_INGRESS_VERSION}
+# install CRDs
+kubectl apply -k samples/deploy/crd/v1
+# install ingress-apisix
+kubectl apply -f samples/deploy/composite.yaml
+```
+
 ```shell
-$ kubectl apply -f samples/deploy/composite.yaml
+# install ingress-apisix output
 namespace/ingress-apisix created
 clusterrole.rbac.authorization.k8s.io/apisix-view-clusterrole created
 serviceaccount/apisix-view-serviceaccount created
@@ -65,11 +89,15 @@ service/ingress-apisix-gateway created
 Check the pod status to confirm successful installation:
 
 ```shell
-$ kubectl get service  -n ingress-apisix # check service
+kubectl get service -n ingress-apisix # check service
+kubectl get pods -n ingress-apisix # check pod
+```
+
+```shell
+# service
 NAMETYPECLUSTER-IP   EXTERNAL-IP   PORT(S) 
 AGE
 ingress-apisix-gateway  NodePort10.99.236.58 
80:31143/TCP,443:30166/TCP   90s
-
-$ kubectl get pods -n ingress-apisix # check pod
+# pod
 NAME READY   STATUS
RESTARTS   AGE
 ingress-apisix-composite-deployment-5df9bc99c7-xxpvq   2/2 Running   0 
 100s
 ```
@@ -82,12 +110,16 @@ Install the ApisixRoute and httpbin app:
 kubectl apply -f samples/httpbin/httpbin-route.yaml
 ```
 
-After forwarding the local port 9080 to the service port 80, send a request:
+After forwarding the local port 9080 to the `ingress-apisix-gateway` service 
port 80, send a request:
 
-```shell
-$ kubectl port-forward service/ingress-apisix-gateway 9080:80 -n 
ingress-apisix &
+```bash
+# forward local port 9080 to ingress-apisix-gateway service port 80
+kubectl port-forward service/ingress-apisix-gateway 9080:80 -n ingress-apisix &
+# send a request
+curl http://127.0.0.1:9080/headers -H 'Host: httpbin.org'
+```
 
-$ curl http://127.0.0.1:9080/headers -H 'Host: httpbin.org'
+```shell
 {
   "headers": {
 "Accept": "*/*", 
diff --git a/samples/deploy/composite.yaml b/samples/deploy/composite.yaml
index 72edb390..404023fd 100644
--- a/samples/deploy/composite.yaml
+++ b/samples/deploy/composite.yaml
@@ -23,7 +23,6 @@ metadata:
 name: ingress-apisix
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -136,7 +135,7 @@ rules:
   - ingresses/status
   - networkpolicies
 verbs:
-  - '*'
+  - "*"
   - apiGroups:
   - metrics.k8s.io
 resources:
@@ -163,13 +162,13 @@ rules:
   - apisixglobalrules
   - apisixglobalrules/status
 verbs:
-  - '*'
+  - "*"
   - apiGroups:
   - coordination.k8s.io
 resources:
   - leases
 verbs:
-  - '*'
+  - "*"
   - apiGroups:
   - discovery.k8s.io
 resources:
@@ -202,7 +201,6 @@ rules:
   - list
 
 ---
-
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -210,7 +208,6 @@ metadata:
   namespace: ingress-apisix
 
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -224,9 +221,7 @@ subjects:
 name: apisix-view-serviceaccount
 namespace: ingress-apisix
 
-
 ---
-
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -352,7 +347,6 @@ data:
 e

[apisix-ingress-controller] branch master updated: ci: Fix workflows (#1956)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 2fd78db4 ci: Fix workflows (#1956)
2fd78db4 is described below

commit 2fd78db41556188d9f012ac18149552c5b1b5e5a
Author: Dawid Rogaczewski <20227477+daroga0...@users.noreply.github.com>
AuthorDate: Mon Sep 18 09:39:05 2023 +0200

ci: Fix workflows (#1956)

* fix workflows

* update actions
---
 .github/workflows/codeql-analysis.yml | 12 ++--
 .github/workflows/dependency-review.yml   |  6 +++---
 .github/workflows/e2e-test-ci-v2-cron-dev.yml | 24 
 .github/workflows/e2e-test-ci-v2-cron.yml | 20 ++--
 .github/workflows/e2e-test-ci.yml | 22 +++---
 .github/workflows/goimports-reviser.yml   |  8 
 .github/workflows/golangci-lint.yml   |  8 
 .github/workflows/k8s-timer-ci.yml| 20 ++--
 .github/workflows/license-checker.yml |  6 +++---
 .github/workflows/lint-checker.yml| 16 
 .github/workflows/spell-checker.yml   |  4 ++--
 .github/workflows/unit-test-ci.yml|  8 
 .github/workflows/verify-codegen.yml  |  8 
 .github/workflows/yamllint-checker.yml|  6 +++---
 14 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml 
b/.github/workflows/codeql-analysis.yml
index 7eeb1762..50afb900 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -22,7 +22,7 @@ on:
   push:
 branches: [ master ]
   pull_request:
-type: [review_requested, ready_for_review]
+types: [review_requested, ready_for_review]
 # The branches below must be a subset of the branches above
 branches:
   - master
@@ -37,7 +37,7 @@ jobs:
   go: ${{ steps.filter.outputs.go }}
 steps:
   - name: Checkout
-uses: actions/checkout@v3
+uses: actions/checkout@v4
 with:
   submodules: recursive
 
@@ -66,11 +66,11 @@ jobs:
 
 steps:
 - name: Checkout repository
-  uses: actions/checkout@v3
+  uses: actions/checkout@v4
 
 # Initializes the CodeQL tools for scanning.
 - name: Initialize CodeQL
-  uses: github/codeql-action/init@v1
+  uses: github/codeql-action/init@v2
   with:
 languages: ${{ matrix.language }}
 # If you wish to specify custom queries, you can do so here or in a 
config file.
@@ -81,7 +81,7 @@ jobs:
 # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
 # If this step fails, then you should remove it and run the build manually 
(see below)
 - name: Autobuild
-  uses: github/codeql-action/autobuild@v1
+  uses: github/codeql-action/autobuild@v2
 
 # ℹ️ Command-line programs to run using the OS shell.
 # 📚 https://git.io/JvXDl
@@ -95,4 +95,4 @@ jobs:
 #   make release
 
 - name: Perform CodeQL Analysis
-  uses: github/codeql-action/analyze@v1
+  uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/dependency-review.yml 
b/.github/workflows/dependency-review.yml
index 5e3967cf..09be2960 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -22,7 +22,7 @@ on:
 branches:
   - master
   - 1.7.0
-type: [review_requested, ready_for_review]
+types: [review_requested, ready_for_review]
 
 permissions:
   contents: read
@@ -32,6 +32,6 @@ jobs:
 runs-on: ubuntu-latest
 steps:
   - name: Checkout
-uses: actions/checkout@v3
+uses: actions/checkout@v4
   - name: 'Dependency Review'
-uses: actions/dependency-review-action@v1
+uses: actions/dependency-review-action@v3
diff --git a/.github/workflows/e2e-test-ci-v2-cron-dev.yml 
b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
index 2d57c2e8..dd00a7b4 100644
--- a/.github/workflows/e2e-test-ci-v2-cron-dev.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
@@ -39,7 +39,7 @@ jobs:
   go: ${{ steps.filter.outputs.go }}
 steps:
   - name: Checkout
-uses: actions/checkout@v3
+uses: actions/checkout@v4
 with:
   submodules: recursive
 
@@ -71,20 +71,20 @@ jobs:
 steps:
 
   - name: Checkout
-uses: actions/checkout@v3 # v3.0.2
+uses: actions/checkout@v4
 
   - name: Setup Go Env
 id: go
-uses: actions/setup-go@v3 # v3.2.0
+uses: actions/setup-go@v4
 with:
-  go-version: '1.19'
+  go-version: '1.20'
 
   - name: Set up QEMU
-uses: docker/setup-qemu-action@v2 #v2.0.0
+uses: docker/setup-qemu-action@v3
 
   - name: Set 

[apisix-helm-chart] branch master updated: chore: release ingress v0.12.1 (#619)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new d279eea  chore: release ingress v0.12.1 (#619)
d279eea is described below

commit d279eea26bd7d257fcdd9a259b6f4f3122347416
Author: ikatlinsky 
AuthorDate: Fri Sep 15 17:25:33 2023 +0200

chore: release ingress v0.12.1 (#619)
---
 charts/apisix-ingress-controller/Chart.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/apisix-ingress-controller/Chart.yaml 
b/charts/apisix-ingress-controller/Chart.yaml
index 249ac9b..8bdf8bf 100644
--- a/charts/apisix-ingress-controller/Chart.yaml
+++ b/charts/apisix-ingress-controller/Chart.yaml
@@ -24,7 +24,7 @@ keywords:
   - nginx
   - crd
 type: application
-version: 0.12.0
+version: 0.12.1
 appVersion: 1.7.0
 sources:
   - https://github.com/apache/apisix-helm-chart

[apisix-ingress-controller] branch master updated: chore: release v1.7.0 (#1952) (#1955)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new fc6404e0 chore: release v1.7.0 (#1952) (#1955)
fc6404e0 is described below

commit fc6404e0878bb45e337ca0d21de5c281402bf025
Author: Jintao Zhang 
AuthorDate: Wed Sep 13 12:30:57 2023 +0800

chore: release v1.7.0 (#1952) (#1955)
---
 .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  | 313 ++
 Makefile  |   2 +-
 16 files changed, 330 insertions(+), 14 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 7170b801..c4da401b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -46,3 +46,6 @@ github:
   v1.6.0:
 required_pull_request_reviews:
   required_approving_review_count: 1
+  1.7.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 76a523c3..7eeb1762 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ on:
 # The branches below must be a subset of the branches above
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
   schedule:
 - cron: '25 5 * * 5'
 
diff --git a/.github/workflows/dependency-review.yml 
b/.github/workflows/dependency-review.yml
index 7ed68430..5e3967cf 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -21,7 +21,7 @@ on:
   pull_request:
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
 type: [review_requested, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/e2e-test-ci-v2-cron-dev.yml 
b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
index 0992fb6f..a0a08da2 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
-  - v1.6.0
+  - 1.7.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 2fdeda68..73eff8c1 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
-  - v1.6.0
+  - 1.7.0
 types: [ labeled, opened, synchronize, reopened, review_requested, 
ready_for_review ]
 
 concurrency:
diff --git a/.github/workflows/e2e-test-ci.yml 
b/.github/workflows/e2e-test-ci.yml
index 8890eab1..b041a822 100644
--- a/.github/workflows/e2e-test-ci.yml
+++ b/.github/workflows/e2e-test-ci.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
 type: [review_requested, ready_for_review]
 
 concurrency:
diff --git a/.github/workflows/goimports-reviser.yml 
b/.github/workflows/goimports-reviser.yml
index 1d775b19..de43558e 100644
--- a/.github/workflows/goimports-reviser.yml
+++ b/.github/workflows/goimports-reviser.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
 type: [review_requested, ready_for_review]
 jobs:
   changes:
diff --git a/.github/workflows/golangci-lint.yml 
b/.github/workflows/golangci-lint.yml
index c0e68aec..8531bada 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
 type: [review_requested, ready_for_review]
 
 jobs:
diff --git a/.github/workflows/license-checker.yml 
b/.github/workflows/license-checker.yml
index 15d0adbb..6ddcab9e 100644
--- a/.github/workflows/license-checker.yml
+++ b/.github/workflows/license-checker.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
 type: [review_requested, ready_for_review]
 
 jobs:
diff --git a/.github/workflows/lint-checker.yml 
b/.github/workflows/lint-checker

[apisix-helm-chart] branch master updated: chore: release apisix v1.6.1 with ingress v0.12.0 (#613)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new da5b313  chore: release apisix v1.6.1 with ingress v0.12.0 (#613)
da5b313 is described below

commit da5b313a22aeb678836cd542f2d7dc07c21488aa
Author: ikatlinsky 
AuthorDate: Tue Sep 12 16:17:42 2023 +0200

chore: release apisix v1.6.1 with ingress v0.12.0 (#613)
---
 charts/apisix/Chart.lock|   6 +++---
 charts/apisix/Chart.yaml|   4 ++--
 .../apisix/charts/apisix-ingress-controller-0.11.7.tgz  | Bin 16791 -> 0 bytes
 .../apisix/charts/apisix-ingress-controller-0.12.0.tgz  | Bin 0 -> 17094 bytes
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/apisix/Chart.lock b/charts/apisix/Chart.lock
index b0713bb..98734f6 100644
--- a/charts/apisix/Chart.lock
+++ b/charts/apisix/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 0.8.0
 - name: apisix-ingress-controller
   repository: https://charts.apiseven.com
-  version: 0.11.7
-digest: sha256:459d973b6f8f20e6f80831056a0bc924cebfac139f44fe7e45abd7cc91d0142b
-generated: "2023-07-05T07:50:48.489645+02:00"
+  version: 0.12.0
+digest: sha256:1015e37a9acaf267f68a7dcb4cff33dd5959c97adcd5d46a53b6f642691ae1aa
+generated: "2023-09-11T13:58:34.232409+02:00"
diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 2ab9ff3..7f5cbf3 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,7 +31,7 @@ type: application
 # This is the chart version. This version number should be incremented each 
time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.6.0
+version: 1.6.1
 
 # This is the version number of the application being deployed. This version 
number should be
 # incremented each time you make changes to the application. Versions are not 
expected to
@@ -51,7 +51,7 @@ dependencies:
 condition: dashboard.enabled
 alias: dashboard
   - name: apisix-ingress-controller
-version: 0.11.7
+version: 0.12.0
 repository: https://charts.apiseven.com
 condition: ingress-controller.enabled
 alias: ingress-controller
diff --git a/charts/apisix/charts/apisix-ingress-controller-0.11.7.tgz 
b/charts/apisix/charts/apisix-ingress-controller-0.11.7.tgz
deleted file mode 100644
index 8df6372..000
Binary files a/charts/apisix/charts/apisix-ingress-controller-0.11.7.tgz and 
/dev/null differ
diff --git a/charts/apisix/charts/apisix-ingress-controller-0.12.0.tgz 
b/charts/apisix/charts/apisix-ingress-controller-0.12.0.tgz
new file mode 100644
index 000..18394a6
Binary files /dev/null and 
b/charts/apisix/charts/apisix-ingress-controller-0.12.0.tgz differ

[apisix-helm-chart] branch master updated: feat: allow to use tpl for apisix pod annotations (#587)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 0881f85  feat: allow to use tpl for apisix pod annotations (#587)
0881f85 is described below

commit 0881f85c5f6aa8f7f5387a0359d9c0844db755e7
Author: ikatlinsky 
AuthorDate: Sun Sep 10 14:29:09 2023 +0200

feat: allow to use tpl for apisix pod annotations (#587)
---
 charts/apisix/templates/_pod.tpl | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/charts/apisix/templates/_pod.tpl b/charts/apisix/templates/_pod.tpl
index 77d4b8e..a32f8f1 100644
--- a/charts/apisix/templates/_pod.tpl
+++ b/charts/apisix/templates/_pod.tpl
@@ -2,10 +2,8 @@
 metadata:
   annotations:
 checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") 
. | sha256sum }}
-{{- if .Values.apisix.podAnnotations }}
-{{- range $key, $value := $.Values.apisix.podAnnotations }}
-{{ $key }}: {{ $value | quote }}
-{{- end }}
+{{- with .Values.apisix.podAnnotations }}
+  {{ tpl (toYaml .) $ | nindent 4}}
 {{- end }}
   labels:
 {{- include "apisix.selectorLabels" . | nindent 4 }}

[apisix-ingress-controller] branch 1.7.0 updated: chore: release v1.7.0 (#1952)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/1.7.0 by this push:
 new d91757a1 chore: release v1.7.0 (#1952)
d91757a1 is described below

commit d91757a1601e984f6bd0c22753b020a092adfc4e
Author: Jintao Zhang 
AuthorDate: Thu Sep 7 09:28:28 2023 +0800

chore: release v1.7.0 (#1952)
---
 .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  | 313 ++
 Makefile  |   2 +-
 16 files changed, 330 insertions(+), 14 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 7170b801..c4da401b 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -46,3 +46,6 @@ github:
   v1.6.0:
 required_pull_request_reviews:
   required_approving_review_count: 1
+  1.7.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 76a523c3..7eeb1762 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ on:
 # The branches below must be a subset of the branches above
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
   schedule:
 - cron: '25 5 * * 5'
 
diff --git a/.github/workflows/dependency-review.yml 
b/.github/workflows/dependency-review.yml
index 7ed68430..5e3967cf 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -21,7 +21,7 @@ on:
   pull_request:
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
 type: [review_requested, ready_for_review]
 
 permissions:
diff --git a/.github/workflows/e2e-test-ci-v2-cron-dev.yml 
b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
index 0992fb6f..a0a08da2 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
-  - v1.6.0
+  - 1.7.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 2fdeda68..73eff8c1 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
-  - v1.6.0
+  - 1.7.0
 types: [ labeled, opened, synchronize, reopened, review_requested, 
ready_for_review ]
 
 concurrency:
diff --git a/.github/workflows/e2e-test-ci.yml 
b/.github/workflows/e2e-test-ci.yml
index 8890eab1..b041a822 100644
--- a/.github/workflows/e2e-test-ci.yml
+++ b/.github/workflows/e2e-test-ci.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
 type: [review_requested, ready_for_review]
 
 concurrency:
diff --git a/.github/workflows/goimports-reviser.yml 
b/.github/workflows/goimports-reviser.yml
index 1d775b19..de43558e 100644
--- a/.github/workflows/goimports-reviser.yml
+++ b/.github/workflows/goimports-reviser.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
 type: [review_requested, ready_for_review]
 jobs:
   changes:
diff --git a/.github/workflows/golangci-lint.yml 
b/.github/workflows/golangci-lint.yml
index c0e68aec..8531bada 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
 type: [review_requested, ready_for_review]
 
 jobs:
diff --git a/.github/workflows/license-checker.yml 
b/.github/workflows/license-checker.yml
index 15d0adbb..6ddcab9e 100644
--- a/.github/workflows/license-checker.yml
+++ b/.github/workflows/license-checker.yml
@@ -25,7 +25,7 @@ on:
   pull_request:
 branches:
   - master
-  - v1.6.0
+  - 1.7.0
 type: [review_requested, ready_for_review]
 
 jobs:
diff --git a/.github/workflows/lint-checker.yml 
b/.github/workflows/lint-checker.yml
index b6d28076

[apisix-ingress-controller] tag v1.7.0 created (now 63d43d82)

[zhangjintao]

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

zhangjintao pushed a change to tag v1.7.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


  at 63d43d82 (commit)
No new revisions were added by this update.

[apisix-ingress-controller] branch 1.7.0 created (now 7ecd0888)

[zhangjintao]

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

zhangjintao pushed a change to branch 1.7.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


  at 7ecd0888 chore(deps): bump sigs.k8s.io/gateway-api from 0.6.2 to 0.8.0 
(#1945)

No new revisions were added by this update.

[apisix-helm-chart] branch dev updated: chore(dev): upgrade APISIX to 3.5.0 (#606)

[zhangjintao]

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

zhangjintao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/dev by this push:
 new 1c938e7  chore(dev): upgrade APISIX to 3.5.0 (#606)
1c938e7 is described below

commit 1c938e7f4a86f2e15bd4c0aba2f9f34405660391
Author: Xin Rong 
AuthorDate: Wed Sep 6 17:30:47 2023 +0800

chore(dev): upgrade APISIX to 3.5.0 (#606)
---
 charts/apisix/Chart.yaml   |  4 ++--
 charts/apisix/README.md|  4 ++--
 charts/apisix/templates/configmap.yaml | 12 +++-
 charts/apisix/values.yaml  |  3 +--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 3109821..8d132f3 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,12 +31,12 @@ type: application
 # This is the chart version. This version number should be incremented each 
time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.0
+version: 2.2.0
 
 # This is the version number of the application being deployed. This version 
number should be
 # incremented each time you make changes to the application. Versions are not 
expected to
 # follow Semantic Versioning. They should reflect the version the application 
is using.
-appVersion: 3.4.0
+appVersion: 3.5.0
 sources:
   - https://github.com/apache/apisix-helm-chart
 
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index aa3ce75..73e628f 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -178,7 +178,7 @@ The command removes all the Kubernetes components 
associated with the chart and
 | hostNetwork | bool | `false` |  |
 | image.pullPolicy | string | `"IfNotPresent"` | Apache APISIX image pull 
policy |
 | image.repository | string | `"apache/apisix"` | Apache APISIX image 
repository |
-| image.tag | string | `"3.4.0-debian"` | Apache APISIX image tag Overrides 
the image tag whose default is the chart appVersion. |
+| image.tag | string | `"3.5.0-debian"` | Apache APISIX image tag Overrides 
the image tag whose default is the chart appVersion. |
 | ingress | object | 
`{"annotations":{},"enabled":false,"hosts":[{"host":"apisix.local","paths":[]}],"tls":[]}`
 | Using ingress access Apache APISIX service |
 | ingress-controller | object | 
`{"config":{"apisix":{"adminAPIVersion":"v3"}},"enabled":false}` | Ingress 
controller configuration |
 | ingress.annotations | object | `{}` | Ingress annotations |
@@ -209,7 +209,7 @@ The command removes all the Kubernetes components 
associated with the chart and
 | service.http | object | 
`{"additionalContainerPorts":[],"containerPort":9080,"enabled":true,"servicePort":80}`
 | Apache APISIX service settings for http |
 | service.http.additionalContainerPorts | list | `[]` | Support multiple http 
ports, See 
[Configuration](https://github.com/apache/apisix/blob/0bc65ea9acd726f79f80ae0abd8f50b7eb172e3d/conf/config-default.yaml#L24)
 |
 | service.labelsOverride | object | `{}` | Override default labels assigned to 
Apache APISIX gateway resources |
-| service.stream | object | `{"enabled":false,"only":false,"tcp":[],"udp":[]}` 
| Apache APISIX service settings for stream. L4 proxy (TCP/UDP) |
+| service.stream | object | `{"enabled":false,"tcp":[],"udp":[]}` | Apache 
APISIX service settings for stream. L4 proxy (TCP/UDP) |
 | service.tls | object | `{"servicePort":443}` | Apache APISIX service 
settings for tls |
 | service.type | string | `"NodePort"` | Apache APISIX service type for user 
access itself |
 | serviceAccount.annotations | object | `{}` |  |
diff --git a/charts/apisix/templates/configmap.yaml 
b/charts/apisix/templates/configmap.yaml
index 7d803cd..03711dd 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -97,10 +97,20 @@ data:
 # radixtree_host_uri: match route by host 
+ uri(base on radixtree)
 # radixtree_uri_with_parameter: match 
route by uri with parameters
 ssl: 'radixtree_sni'# radixtree_sni: match route by SNI(base 
on radixtree)
+  
+  {{- $proxy_mode := "" }}
+  {{- if and .Values.service.stream.enabled .Values.service.http.enabled }}
+{{- $proxy_mode = "http&stream" }}
+  {{- else if .Values.service.http.enabled }}
+{{- $proxy_mode = "http" }}
+  {{- else if .Values.service.stream.enabled }}
+

[apisix-ingress-controller] branch cherry-pick-1626 updated (c54b5ae4 -> 172aa666)

[zhangjintao]

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

zhangjintao pushed a change to branch cherry-pick-1626
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


 discard c54b5ae4 fix: endpoint/svc not found error logs
 add 172aa666 fix: endpoint/svc not found error logs

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c54b5ae4)
\
 N -- N -- N   refs/heads/cherry-pick-1626 (172aa666)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:

[apisix-ingress-controller] branch cherry-pick-1626 created (now c54b5ae4)

[zhangjintao]

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

zhangjintao pushed a change to branch cherry-pick-1626
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


  at c54b5ae4 fix: endpoint/svc not found error logs

No new revisions were added by this update.

[apisix-ingress-controller] branch master updated: chore(deps): bump sigs.k8s.io/gateway-api from 0.6.2 to 0.8.0 (#1945)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 7ecd0888 chore(deps): bump sigs.k8s.io/gateway-api from 0.6.2 to 0.8.0 
(#1945)
7ecd0888 is described below

commit 7ecd08884591a1f376c2eaec1c75c8ae4ac753f2
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Sep 5 13:00:12 2023 +0800

chore(deps): bump sigs.k8s.io/gateway-api from 0.6.2 to 0.8.0 (#1945)
---
 go.mod |  4 ++--
 go.sum | 10 +-
 pkg/providers/gateway/translation/gateway_httproute.go |  2 +-
 pkg/providers/utils/ingress_status.go  |  8 
 test/e2e/go.mod|  4 ++--
 test/e2e/go.sum| 12 
 6 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/go.mod b/go.mod
index ac45f944..f82793c0 100644
--- a/go.mod
+++ b/go.mod
@@ -28,7 +28,7 @@ require (
k8s.io/client-go v0.28.1
k8s.io/code-generator v0.28.1
sigs.k8s.io/controller-runtime v0.16.1
-   sigs.k8s.io/gateway-api v0.6.2
+   sigs.k8s.io/gateway-api v0.8.0
sigs.k8s.io/yaml v1.3.0
 )
 
@@ -97,7 +97,7 @@ require (
golang.org/x/term v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/time v0.3.0 // indirect
-   golang.org/x/tools v0.11.1 // indirect
+   golang.org/x/tools v0.12.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230815205213-6bfd019c3878 // 
indirect
google.golang.org/genproto/googleapis/api 
v0.0.0-20230815205213-6bfd019c3878 // indirect
diff --git a/go.sum b/go.sum
index 9fa70a5d..75840bf3 100644
--- a/go.sum
+++ b/go.sum
@@ -327,8 +327,8 @@ golang.org/x/tools 
v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod 
h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod 
h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod 
h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.11.1 h1:ojD5zOW8+7dOGzdnNgersm8aPfcDjhMp12UfG93NIMc=
-golang.org/x/tools v0.11.1/go.mod 
h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
+golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
+golang.org/x/tools v0.12.0/go.mod 
h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod 
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod 
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod 
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -387,7 +387,7 @@ honnef.co/go/tools 
v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod 
h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108=
 k8s.io/api v0.28.1/go.mod h1:uBYwID+66wiL28Kn2tBjBYQdEU0Xk0z5qF8bIBqk/Dg=
-k8s.io/apiextensions-apiserver v0.28.0 
h1:CszgmBL8CizEnj4sj7/PtLGey6Na3YgWyGCPONv7E9E=
+k8s.io/apiextensions-apiserver v0.28.1 
h1:l2ThkBRjrWpw4f24uq0Da2HaEgqJZ7pcgiEUTKSmQZw=
 k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY=
 k8s.io/apimachinery v0.28.1/go.mod 
h1:X0xh/chESs2hP9koe+SdIAcXWcQ+RM5hy0ZynB+yEvw=
 k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8=
@@ -406,8 +406,8 @@ k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod 
h1:OLgZIPagt7ERELqWJFomSt
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 sigs.k8s.io/controller-runtime v0.16.1 
h1:+15lzrmHsE0s2kNl0Dl8cTchI5Cs8qofo5PGcPrV9z0=
 sigs.k8s.io/controller-runtime v0.16.1/go.mod 
h1:vpMu3LpI5sYWtujJOa2uPK61nB5rbwlN7BAB8aSLvGU=
-sigs.k8s.io/gateway-api v0.6.2 h1:583XHiX2M2bKEA0SAdkoxL1nY73W1+/M+IAm8LJvbEA=
-sigs.k8s.io/gateway-api v0.6.2/go.mod 
h1:EYJT+jlPWTeNskjV0JTki/03WX1cyAnBhwBJfYHpV/0=
+sigs.k8s.io/gateway-api v0.8.0 h1:isQQ3Jx2qFP7vaA3ls0846F0Amp9Eq14P08xbSwVbQg=
+sigs.k8s.io/gateway-api v0.8.0/go.mod 
h1:okOnjPNBFbIS/Rw9kAhuIUaIkLhTKEu+ARIuXk2dgaM=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd 
h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod 
h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.3.0 
h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk=
diff --git a/pkg/providers/gateway/translation/gateway_httproute.go 
b/pkg/providers/gateway/trans

[apisix-ingress-controller] branch dependabot/go_modules/sigs.k8s.io/gateway-api-0.8.0 updated (32e24998 -> 56bc844e)

[zhangjintao]

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

zhangjintao pushed a change to branch 
dependabot/go_modules/sigs.k8s.io/gateway-api-0.8.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 32e24998 dep(e2e): sigs.k8s.io/gateway-api v0.8.0
 add 56bc844e fix: GatewayStatusAddress

No new revisions were added by this update.

Summary of changes:
 pkg/providers/gateway/translation/gateway_httproute.go | 2 +-
 pkg/providers/utils/ingress_status.go  | 8 
 2 files changed, 5 insertions(+), 5 deletions(-)

[apisix-ingress-controller] branch dependabot/go_modules/sigs.k8s.io/gateway-api-0.8.0 updated: dep(e2e): sigs.k8s.io/gateway-api v0.8.0

[zhangjintao]

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

zhangjintao pushed a commit to branch 
dependabot/go_modules/sigs.k8s.io/gateway-api-0.8.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to 
refs/heads/dependabot/go_modules/sigs.k8s.io/gateway-api-0.8.0 by this push:
 new 32e24998 dep(e2e): sigs.k8s.io/gateway-api v0.8.0
32e24998 is described below

commit 32e24998085166bbb05f0d258be9ed16a711705c
Author: Jintao Zhang 
AuthorDate: Mon Sep 4 23:04:04 2023 +0800

dep(e2e): sigs.k8s.io/gateway-api v0.8.0

Signed-off-by: Jintao Zhang 
---
 test/e2e/go.mod |  4 ++--
 test/e2e/go.sum | 12 
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/e2e/go.mod b/test/e2e/go.mod
index 086b2731..0095ee53 100644
--- a/test/e2e/go.mod
+++ b/test/e2e/go.mod
@@ -31,7 +31,7 @@ require (
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
-   github.com/fatih/color v1.13.0 // indirect
+   github.com/fatih/color v1.15.0 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/gin-contrib/sse v0.1.0 // indirect
@@ -138,7 +138,7 @@ require (
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
moul.io/http2curl/v2 v2.3.0 // indirect
-   sigs.k8s.io/gateway-api v0.6.2 // indirect
+   sigs.k8s.io/gateway-api v0.8.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
diff --git a/test/e2e/go.sum b/test/e2e/go.sum
index ddd6bf89..d95178a7 100644
--- a/test/e2e/go.sum
+++ b/test/e2e/go.sum
@@ -57,8 +57,8 @@ github.com/envoyproxy/go-control-plane 
v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod 
h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v5.6.0+incompatible 
h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
 github.com/fatih/color v1.9.0/go.mod 
h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
-github.com/fatih/color v1.13.0/go.mod 
h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs=
+github.com/fatih/color v1.15.0/go.mod 
h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod 
h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/fsnotify/fsnotify v1.4.7/go.mod 
h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -215,12 +215,10 @@ github.com/leodido/go-urn v1.2.4/go.mod 
h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNa
 github.com/mailru/easyjson v0.7.7 
h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod 
h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.1.4/go.mod 
h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.9/go.mod 
h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.13 
h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod 
h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.8/go.mod 
h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.11/go.mod 
h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.12/go.mod 
h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod 
h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod 
h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19 
h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
@@ -423,8 +421,6 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod 
h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod 
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod 
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod 
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod 
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod 
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod 
h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod 
h1

[apisix-ingress-controller] branch dependabot/go_modules/sigs.k8s.io/controller-runtime-0.16.1 deleted (was 48c6c4cb)

[zhangjintao]

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

zhangjintao pushed a change to branch 
dependabot/go_modules/sigs.k8s.io/controller-runtime-0.16.1
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


 was 48c6c4cb chore: update code-gen

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[apisix-ingress-controller] branch master updated: chore(deps): bump sigs.k8s.io/controller-runtime from 0.14.6 to 0.16.1 (#1947)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 9f54d9ce chore(deps): bump sigs.k8s.io/controller-runtime from 0.14.6 
to 0.16.1 (#1947)
9f54d9ce is described below

commit 9f54d9ceee714ebf050023b8d50b24d69ec5a01f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Sep 1 16:09:13 2023 +0800

chore(deps): bump sigs.k8s.io/controller-runtime from 0.14.6 to 0.16.1 
(#1947)

* chore(deps): bump sigs.k8s.io/controller-runtime from 0.14.6 to 0.16.1

Bumps 
[sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime)
 from 0.14.6 to 0.16.1.
- [Release 
notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- 
[Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- 
[Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.14.6...v0.16.1)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

* chore: update code-gen

Signed-off-by: Jintao Zhang 

-

Signed-off-by: dependabot[bot] 
Signed-off-by: Jintao Zhang 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jintao Zhang 
---
 go.mod |  5 ++---
 go.sum | 26 +++---
 .../client/informers/externalversions/factory.go   |  4 ++--
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/go.mod b/go.mod
index b5a944e7..b7179fc4 100644
--- a/go.mod
+++ b/go.mod
@@ -26,8 +26,8 @@ require (
k8s.io/api v0.28.1
k8s.io/apimachinery v0.28.1
k8s.io/client-go v0.28.1
-   k8s.io/code-generator v0.27.4
-   sigs.k8s.io/controller-runtime v0.14.6
+   k8s.io/code-generator v0.28.0
+   sigs.k8s.io/controller-runtime v0.16.1
sigs.k8s.io/gateway-api v0.6.2
sigs.k8s.io/yaml v1.3.0
 )
@@ -107,7 +107,6 @@ require (
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
-   k8s.io/apiextensions-apiserver v0.26.3 // indirect
k8s.io/gengo v0.0.0-20230306165830-ab3349d207d4 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
diff --git a/go.sum b/go.sum
index 2a5d9939..ce230a0b 100644
--- a/go.sum
+++ b/go.sum
@@ -20,8 +20,8 @@ github.com/chenzhuoyu/base64x 
v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhD
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod 
h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/client9/misspell v0.3.4/go.mod 
h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod 
h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/coreos/go-semver v0.3.0 
h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
-github.com/coreos/go-systemd/v22 v22.3.2 
h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI=
+github.com/coreos/go-semver v0.3.1 
h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
+github.com/coreos/go-systemd/v22 v22.5.0 
h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod 
h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod 
h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod 
h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -50,7 +50,7 @@ github.com/go-logr/logr v0.2.0/go.mod 
h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg
 github.com/go-logr/logr v1.2.0/go.mod 
h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
 github.com/go-logr/logr v1.2.4/go.mod 
h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
+github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo=
 github.com/go-openapi/jsonpointer v0.19.6/go.mod 
h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonpointer v0.20.0 
h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ=
 github.com/go-openapi/jsonpointer v0.20.0/go.mod 
h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA=
@@ -167,8 +167,8 @@ github.com/modern-go/reflect2 v1.0.2 
h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod 
h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/munnerz/goautoneg v0.0.0-20

[apisix-ingress-controller] branch dependabot/go_modules/sigs.k8s.io/controller-runtime-0.16.1 updated: chore: update code-gen

[zhangjintao]

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

zhangjintao pushed a commit to branch 
dependabot/go_modules/sigs.k8s.io/controller-runtime-0.16.1
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to 
refs/heads/dependabot/go_modules/sigs.k8s.io/controller-runtime-0.16.1 by this 
push:
 new 48c6c4cb chore: update code-gen
48c6c4cb is described below

commit 48c6c4cb25ef9ed549bcadf68e2ed9e8849c41ea
Author: Jintao Zhang 
AuthorDate: Fri Sep 1 15:13:09 2023 +0800

chore: update code-gen

Signed-off-by: Jintao Zhang 
---
 pkg/kube/apisix/client/informers/externalversions/factory.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/kube/apisix/client/informers/externalversions/factory.go 
b/pkg/kube/apisix/client/informers/externalversions/factory.go
index bb0c2ae1..38a6816d 100644
--- a/pkg/kube/apisix/client/informers/externalversions/factory.go
+++ b/pkg/kube/apisix/client/informers/externalversions/factory.go
@@ -165,7 +165,7 @@ func (f *sharedInformerFactory) WaitForCacheSync(stopCh 
<-chan struct{}) map[ref
return res
 }
 
-// InternalInformerFor returns the SharedIndexInformer for obj using an 
internal
+// InformerFor returns the SharedIndexInformer for obj using an internal
 // client.
 func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc 
internalinterfaces.NewInformerFunc) cache.SharedIndexInformer {
f.lock.Lock()
@@ -238,7 +238,7 @@ type SharedInformerFactory interface {
// ForResource gives generic access to a shared informer of the 
matching type.
ForResource(resource schema.GroupVersionResource) (GenericInformer, 
error)
 
-   // InternalInformerFor returns the SharedIndexInformer for obj using an 
internal
+   // InformerFor returns the SharedIndexInformer for obj using an internal
// client.
InformerFor(obj runtime.Object, newFunc 
internalinterfaces.NewInformerFunc) cache.SharedIndexInformer
 

[apisix-ingress-controller] branch master updated: feat: use HOSTNAME as controller name and add default value. (#1946)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 1466e892 feat: use HOSTNAME as controller name and add default value. 
(#1946)
1466e892 is described below

commit 1466e892e58af42ddfbb35ee2ab42e5570444dca
Author: Jintao Zhang 
AuthorDate: Thu Aug 31 15:52:41 2023 +0800

feat: use HOSTNAME as controller name and add default value. (#1946)

Signed-off-by: Jintao Zhang 
---
 pkg/providers/controller.go | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/pkg/providers/controller.go b/pkg/providers/controller.go
index aafca469..e753c01c 100644
--- a/pkg/providers/controller.go
+++ b/pkg/providers/controller.go
@@ -93,6 +93,12 @@ type Controller struct {
 // NewController creates an ingress apisix controller object.
 func NewController(cfg *config.Config) (*Controller, error) {
podName := os.Getenv("POD_NAME")
+   if podName == "" {
+   podName = os.Getenv("HOSTNAME")
+   }
+   if podName == "" {
+   podName = "apisix-ingress-controller"
+   }
podNamespace := os.Getenv("POD_NAMESPACE")
if podNamespace == "" {
podNamespace = "default"

[apisix-ingress-controller] branch dependabot/go_modules/sigs.k8s.io/controller-runtime-0.16.0 updated (efe0ad20 -> 5bd397ee)

[zhangjintao]

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

zhangjintao pushed a change to branch 
dependabot/go_modules/sigs.k8s.io/controller-runtime-0.16.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from efe0ad20 chore(deps): bump sigs.k8s.io/controller-runtime from 0.14.6 
to 0.16.0
 add 5bd397ee update code-gen

No new revisions were added by this update.

Summary of changes:
 pkg/kube/apisix/client/informers/externalversions/factory.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[apisix-ingress-controller] branch master updated: chore: add Gallardot for deps reviewer (#1942)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new cf88af9a chore: add Gallardot for deps reviewer (#1942)
cf88af9a is described below

commit cf88af9ae2ad845bbda79b6f71d36c07e8e686de
Author: Jintao Zhang 
AuthorDate: Tue Aug 29 18:06:03 2023 +0800

chore: add Gallardot for deps reviewer (#1942)

Signed-off-by: Jintao Zhang 
---
 .github/dependabot.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index df5accea..9758b60d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -29,6 +29,7 @@ updates:
   - "tao12345666333"
   - "lingsamuel"
   - "AlinsRan"
+  - "Gallardot"
   - package-ecosystem: "github-actions"
 directory: "/.github"
 schedule:
@@ -39,6 +40,7 @@ updates:
   - "tao12345666333"
   - "lingsamuel"
   - "AlinsRan"
+  - "Gallardot"
   - package-ecosystem: "gomod"
 directory: "/test/e2e"
 schedule:
@@ -49,3 +51,4 @@ updates:
   - "tao12345666333"
   - "lingsamuel"
   - "AlinsRan"
+  - "Gallardot"

[apisix-ingress-controller] branch master updated (e0a2b17b -> 1bea14f9)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from e0a2b17b chore(deps): bump golang.org/x/net from 0.12.0 to 0.14.0 
(#1920)
 add 1bea14f9 chore(deps): bump google.golang.org/grpc in /test/e2e (#1886)

No new revisions were added by this update.

Summary of changes:
 test/e2e/go.mod |  4 ++--
 test/e2e/go.sum | 38 --
 2 files changed, 6 insertions(+), 36 deletions(-)

[apisix-ingress-controller] branch master updated (c1f241b3 -> e0a2b17b)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from c1f241b3 chore(deps): bump k8s.io/client-go from 0.27.4 to 0.28.1 in 
/test/e2e (#1938)
 add e0a2b17b chore(deps): bump golang.org/x/net from 0.12.0 to 0.14.0 
(#1920)

No new revisions were added by this update.

Summary of changes:
 go.mod | 10 +-
 go.sum | 20 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

[apisix-ingress-controller] branch master updated (28d7c902 -> c3174d46)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 28d7c902 chore(deps): bump github.com/onsi/ginkgo/v2 in /test/e2e 
(#1933)
 add c3174d46 chore(deps): bump go.uber.org/zap from 1.24.0 to 1.25.0 
(#1922)

No new revisions were added by this update.

Summary of changes:
 go.mod | 3 +--
 go.sum | 8 +++-
 2 files changed, 4 insertions(+), 7 deletions(-)

[apisix-ingress-controller] branch dependabot/go_modules/test/e2e/github.com/onsi/ginkgo/v2-2.12.0 deleted (was 00b6b42e)

[zhangjintao]

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

zhangjintao pushed a change to branch 
dependabot/go_modules/test/e2e/github.com/onsi/ginkgo/v2-2.12.0
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


 was 00b6b42e chore(deps): bump github.com/onsi/ginkgo/v2 in /test/e2e

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[apisix-ingress-controller] branch master updated (7b3deb5e -> 28d7c902)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 7b3deb5e feat: add support for host pass in upstream crd (#1889)
 add 28d7c902 chore(deps): bump github.com/onsi/ginkgo/v2 in /test/e2e 
(#1933)

No new revisions were added by this update.

Summary of changes:
 test/e2e/go.mod | 14 +++---
 test/e2e/go.sum | 30 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)

[apisix-ingress-controller] branch master updated: feat: add support for host pass in upstream crd (#1889)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 7b3deb5e feat: add support for host pass in upstream crd (#1889)
7b3deb5e is described below

commit 7b3deb5e84d257f46ce5c513d72b22a24af1be67
Author: ikatlinsky 
AuthorDate: Sat Aug 26 16:23:33 2023 +0200

feat: add support for host pass in upstream crd (#1889)

Co-authored-by: Katlinsky, Ilya 
---
 docs/en/latest/references/apisix_upstream.md  |   2 +
 pkg/kube/apisix/apis/config/v2/types.go   |  10 ++
 pkg/providers/translation/apisix_upstream.go  |  21 +++
 pkg/providers/translation/apisix_upstream_test.go |  47 +++
 pkg/types/apisix/v1/types.go  |  87 -
 samples/deploy/crd/v1/ApisixUpstream.yaml |   9 ++
 test/e2e/suite-features/upstream_pass_host.go | 151 ++
 7 files changed, 292 insertions(+), 35 deletions(-)

diff --git a/docs/en/latest/references/apisix_upstream.md 
b/docs/en/latest/references/apisix_upstream.md
index e9544298..3eefea27 100644
--- a/docs/en/latest/references/apisix_upstream.md
+++ b/docs/en/latest/references/apisix_upstream.md
@@ -83,3 +83,5 @@ See the 
[definition](https://github.com/apache/apisix-ingress-controller/blob/ma
 | discovery.serviceName  | string| Name of the 
upstream service.   

 |
 | discovery.type | string| Types of 
Service Discovery, which indicates what registry in APISIX the discovery uses. 
Should match the entry in APISIX's config. Can refer to the 
[doc](https://apisix.apache.org/docs/apisix/discovery/) 
  |
 | discovery.args | object| Args map 
for discovery-spcefic parameters. Also can refer to the 
[doc](https://apisix.apache.org/docs/apisix/discovery/) 

|
+| passHost   | string| Configures 
the host when the request is forwarded to the upstream. Can be one of pass, 
node or rewrite. Defaults to pass if not specified: pass - transparently passes 
the client's host to the Upstream, node - uses the host configured in the node 
of the Upstream, rewrite - uses the value configured in upstreamHost.
+| upstreamHost   | string| Specifies 
the host of the Upstream request. This is only valid if the passHost is set to 
rewrite.
diff --git a/pkg/kube/apisix/apis/config/v2/types.go 
b/pkg/kube/apisix/apis/config/v2/types.go
index 59569cae..3e2daf88 100644
--- a/pkg/kube/apisix/apis/config/v2/types.go
+++ b/pkg/kube/apisix/apis/config/v2/types.go
@@ -543,6 +543,16 @@ type ApisixUpstreamConfig struct {
// +optional
Subsets []ApisixUpstreamSubset `json:"subsets,omitempty" 
yaml:"subsets,omitempty"`
 
+   // Configures the host when the request is forwarded to the upstream.
+   // Can be one of pass, node or rewrite.
+   // +optional
+   PassHost string `json:"passHost,omitempty" yaml:"passHost,omitempty"`
+
+   // Specifies the host of the Upstream request. This is only valid if
+   // the pass_host is set to rewrite
+   // +optional
+   UpstreamHost string `json:"upstreamHost,omitempty" 
yaml:"upstreamHost,omitempty"`
+
// Discovery is used to configure service discovery for upstream.
// +optional
Discovery *Discovery `json:"discovery,omitempty" 
yaml:"discovery,omitempty"`
diff --git a/pkg/providers/translation/apisix_upstream.go 
b/pkg/providers/translation/apisix_upstream.go
index 162dd984..44aca7ba 100644
--- a/pkg/providers/translation/apisix_upstream.go
+++ b/pkg/providers/translation/apisix_upstream.go
@@ -21,6 +21,11 @@ import (
apisixv1 
"github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
 )
 
+type passHostConfig struct {
+   passHost string
+   upstreamHost string
+}
+
 func (t *translator) TranslateUpstreamConfigV2(au 
*configv2.ApisixUpstreamConfig) (*apisixv1.Upstream, error) {
ups := apisixv1.NewDefaultUpstream()
if err := t.translateUpstreamScheme(au.Scheme, ups); err != nil {
@@ -38,6 +43,9 @@ func (t *translator) TranslateUpstreamConfigV2(au 
*configv2.ApisixUpstreamConfig
if err := t.translateClientTLSV2(au.TLSSecret, ups); err != nil {
return nil, err
}
+ 

[apisix-ingress-controller] branch master updated: chore(deps): bump go.uber.org/zap from 1.24.0 to 1.25.0 in /test/e2e (#1921)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 14e3c61f chore(deps): bump go.uber.org/zap from 1.24.0 to 1.25.0 in 
/test/e2e (#1921)
14e3c61f is described below

commit 14e3c61f44c4c2fbe621026303b60ad07da9e57a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Aug 25 20:50:00 2023 +0800

chore(deps): bump go.uber.org/zap from 1.24.0 to 1.25.0 in /test/e2e (#1921)
---
 test/e2e/go.mod |  3 +--
 test/e2e/go.sum | 10 --
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/test/e2e/go.mod b/test/e2e/go.mod
index a12ea726..61956a12 100644
--- a/test/e2e/go.mod
+++ b/test/e2e/go.mod
@@ -11,7 +11,7 @@ require (
github.com/gruntwork-io/terratest v0.40.22
github.com/onsi/ginkgo/v2 v2.9.5
github.com/stretchr/testify v1.8.4
-   go.uber.org/zap v1.24.0
+   go.uber.org/zap v1.25.0
k8s.io/api v0.27.4
k8s.io/apimachinery v0.27.4
k8s.io/client-go v0.27.4
@@ -105,7 +105,6 @@ require (
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
github.com/yudai/gojsondiff v1.0.0 // indirect
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
-   go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/arch v0.3.0 // indirect
golang.org/x/crypto v0.11.0 // indirect
diff --git a/test/e2e/go.sum b/test/e2e/go.sum
index 74a54e7a..ce3f8eb8 100644
--- a/test/e2e/go.sum
+++ b/test/e2e/go.sum
@@ -12,7 +12,7 @@ github.com/api7/terratest v1.0.0/go.mod 
h1:JGeIGgLbxbG9/Oqm06z6YXVr76CfomdmLkV56
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 
h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/aws/aws-sdk-go v1.40.56 
h1:FM2yjR0UUYFzDTMx+mH9Vyw1k1EUUxsAFzk+BjkzANA=
 github.com/aws/aws-sdk-go v1.40.56/go.mod 
h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
-github.com/benbjohnson/clock v1.1.0 
h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/benbjohnson/clock v1.3.0 
h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod 
h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod 
h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
@@ -331,13 +331,11 @@ github.com/yudai/pp v2.0.1+incompatible 
h1:Q4//iY4pNF6yPLZIigmvcl7k/bPgrcTPIFIcm
 github.com/yuin/goldmark v1.1.27/go.mod 
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod 
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod 
h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod 
h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod 
h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
+go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
+go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod 
h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
 golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=

[apisix-ingress-controller] branch master updated: fix(ci): udp forward failed and missing pigz (#1929)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new fa07c662 fix(ci): udp forward failed and missing pigz (#1929)
fa07c662 is described below

commit fa07c662e6cb18bffea89423efb0e716fd72ccdd
Author: Xin Rong 
AuthorDate: Fri Aug 25 09:07:52 2023 +0800

fix(ci): udp forward failed and missing pigz (#1929)
---
 .github/workflows/e2e-test-ci.yml  |  3 +
 Dockerfile |  2 -
 test/e2e/scaffold/k8s.go   | 23 +++-
 test/e2e/scaffold/test_backend.go  | 12 ++--
 test/e2e/suite-gateway/gateway_udproute.go | 13 ++--
 .../suite-ingress/suite-ingress-resource/stream.go | 69 --
 test/e2e/testdata/apisix-gw-config-v3.yaml |  5 ++
 7 files changed, 57 insertions(+), 70 deletions(-)

diff --git a/.github/workflows/e2e-test-ci.yml 
b/.github/workflows/e2e-test-ci.yml
index 901ed824..a10a4431 100644
--- a/.github/workflows/e2e-test-ci.yml
+++ b/.github/workflows/e2e-test-ci.yml
@@ -95,6 +95,8 @@ jobs:
   chmod +x ./kind
   sudo mv kind /usr/local/bin
 
+  sudo apt install -y pigz
+
   - name: Build images
 env:
   TAG: dev
@@ -183,6 +185,7 @@ jobs:
   - name: Load images from cache
 run: |
   echo "loading docker images..."
+  sudo apt install -y pigz
   pigz -dc docker.tar.gz | docker load
   make push-images
 
diff --git a/Dockerfile b/Dockerfile
index 4d6354fb..ad034d71 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,3 @@
-#syntax=docker/dockerfile:1.2
-
 # 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.
diff --git a/test/e2e/scaffold/k8s.go b/test/e2e/scaffold/k8s.go
index 7467f62f..46ee6bc7 100644
--- a/test/e2e/scaffold/k8s.go
+++ b/test/e2e/scaffold/k8s.go
@@ -756,7 +756,7 @@ func (s *Scaffold) EnsureNumEndpointsReady(t 
testing.TestingT, endpointsName str
t,
statusMsg,
20,
-   5*time.Second,
+   2*time.Second,
func() (string, error) {
endpoints, err := 
e.CoreV1().Endpoints(s.Namespace()).Get(context.Background(), endpointsName, 
metav1.GetOptions{})
if err != nil {
@@ -769,7 +769,7 @@ func (s *Scaffold) EnsureNumEndpointsReady(t 
testing.TestingT, endpointsName str
if readyNum == desired {
return "Service is now available", nil
}
-   return fmt.Sprintf("Endpoints not ready yet, expect %v, 
actual %v", desired, readyNum), nil
+   return "failed", fmt.Errorf("endpoints not ready yet, 
expect %v, actual %v", desired, readyNum)
},
)
ginkgo.GinkgoT().Log(message)
@@ -781,3 +781,22 @@ func (s *Scaffold) GetKubernetesClient() 
*kubernetes.Clientset {
assert.Nil(ginkgo.GinkgoT(), err, "get kubernetes client")
return client
 }
+
+func (s *Scaffold) RunKubectlAndGetOutput(args ...string) (string, error) {
+   return k8s.RunKubectlAndGetOutputE(ginkgo.GinkgoT(), s.kubectlOptions, 
args...)
+}
+
+func (s *Scaffold) RunDigDNSClientFromK8s(args ...string) (string, error) {
+   kubectlArgs := []string{
+   "run",
+   "dig",
+   "-i",
+   "--rm",
+   "--restart=Never",
+   "--image-pull-policy=IfNotPresent",
+   "--image=toolbelt/dig",
+   "--",
+   }
+   kubectlArgs = append(kubectlArgs, args...)
+   return s.RunKubectlAndGetOutput(kubectlArgs...)
+}
diff --git a/test/e2e/scaffold/test_backend.go 
b/test/e2e/scaffold/test_backend.go
index 4888070d..f4eb8979 100644
--- a/test/e2e/scaffold/test_backend.go
+++ b/test/e2e/scaffold/test_backend.go
@@ -23,6 +23,10 @@ import (
corev1 "k8s.io/api/core/v1"
 )
 
+const (
+   CoreDNSDeployment = "coredns"
+)
+
 var (
_testBackendDeploymentTemplate = `
 apiVersion: apps/v1
@@ -120,11 +124,11 @@ spec:
   targetPort: 50053
   type: ClusterIP
 `
-   _udpDeployment = `
+   _udpDeployment = fmt.Sprintf(`
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: coredns
+  name: %s
 spec:
   replicas: 1
   selector:
@@ -146,13 +150,13 @@ spec:
 readinessProbe:
   tcpSocket:
 port: 53
-  initialDelaySeconds: 5
+  initialDelaySeconds: 2
 

[apisix-ingress-controller] branch master updated (b7329b04 -> c3dff871)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from b7329b04 chore: clean up apisix v1 (#1916)
 add c3dff871 dep: downgraded k8s.io/kube-openapi (#1919)

No new revisions were added by this update.

Summary of changes:
 go.mod  | 3 +--
 go.sum  | 6 ++
 test/e2e/go.mod | 3 +--
 test/e2e/go.sum | 6 ++
 4 files changed, 6 insertions(+), 12 deletions(-)

[apisix-ingress-controller] branch master updated (3fa789df -> 37e9201c)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 3fa789df chore: remove support for Ingress in the extensions/v1beta1 
API version (#1840)
 add 37e9201c chore: Upgrade Go tool chain version 1.19 to version 1.20  
(#1788)

No new revisions were added by this update.

Summary of changes:
 .github/workflows/e2e-test-ci-v2-cron.yml |  4 ++--
 .github/workflows/e2e-test-ci.yml |  4 ++--
 .github/workflows/goimports-reviser.yml   |  2 +-
 .github/workflows/golangci-lint.yml   |  4 ++--
 .github/workflows/k8s-timer-ci.yml|  4 ++--
 .github/workflows/lint-checker.yml|  2 +-
 .github/workflows/unit-test-ci.yml|  2 +-
 .github/workflows/verify-codegen.yml  |  2 +-
 Dockerfile|  2 +-
 Makefile  |  2 +-
 docs/en/latest/contribute.md  |  2 +-
 go.mod|  2 +-
 pkg/utils/{s2b_new.go => s2b.go}  |  0
 pkg/utils/s2b_old.go  | 39 ---
 test/e2e/go.mod   |  2 +-
 test/e2e/suite-annotations/redirect.go| 20 
 16 files changed, 27 insertions(+), 66 deletions(-)
 rename pkg/utils/{s2b_new.go => s2b.go} (100%)
 delete mode 100644 pkg/utils/s2b_old.go

[apisix-ingress-controller] branch master updated: chore: remove support for Ingress in the extensions/v1beta1 API version (#1840)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 3fa789df chore: remove support for Ingress in the extensions/v1beta1 
API version (#1840)
3fa789df is described below

commit 3fa789df1fdf996b7dcac806633b076432581ce4
Author: Jintao Zhang 
AuthorDate: Thu Aug 3 09:27:40 2023 +0800

chore: remove support for Ingress in the extensions/v1beta1 API version 
(#1840)

Signed-off-by: Jintao Zhang 
---
 cmd/ingress/ingress.go |   7 -
 pkg/config/config.go   |   2 +-
 pkg/kube/ingress.go|  65 ++---
 pkg/providers/controller.go|  15 +-
 pkg/providers/ingress/ingress.go   |  45 +-
 pkg/providers/ingress/ingress_test.go  |  40 --
 pkg/providers/ingress/translation/translator.go| 151 
 pkg/providers/utils/ingress_status.go  |  43 --
 pkg/providers/utils/ingress_status_test.go |  72 --
 test/e2e/suite-annotations/authorization.go|  92 -
 test/e2e/suite-annotations/cors.go |  85 
 test/e2e/suite-annotations/csrf.go |  54 
 test/e2e/suite-annotations/forward_auth.go |  43 +-
 test/e2e/suite-annotations/http_method.go  |  70 --
 test/e2e/suite-annotations/iprestriction.go|  58 
 test/e2e/suite-annotations/plugin_conifg.go|  29 
 test/e2e/suite-annotations/redirect.go |  95 -
 test/e2e/suite-annotations/response_rewrite.go |  99 --
 test/e2e/suite-annotations/rewrite.go  |  59 
 test/e2e/suite-annotations/svc_namespace.go|  78 ---
 test/e2e/suite-annotations/upstreamprotocol.go |  33 -
 test/e2e/suite-annotations/websocket.go|  84 
 test/e2e/suite-chore/consistency.go|  54 
 .../suite-ingress-resource/ingress.go  | 152 +
 24 files changed, 22 insertions(+), 1503 deletions(-)

diff --git a/cmd/ingress/ingress.go b/cmd/ingress/ingress.go
index 638a4ddd..03666b9d 100644
--- a/cmd/ingress/ingress.go
+++ b/cmd/ingress/ingress.go
@@ -80,13 +80,6 @@ For Kubernetes cluster version older than v1.19.0, you 
should always set the --i
   --kubeconfig /path/to/kubeconfig \
   --ingress-version networking/v1beta1
 
-If your Kubernetes cluster version is prior to v1.14+, only 
ingress.extensions/v1beta1 can be used.
-
-apisix-ingress-controller ingress \
-  --default-apisix-cluster-base-url 
http://apisix-service:9180/apisix/admin \
-  --kubeconfig /path/to/kubeconfig \
-  --ingress-version extensions/v1beta1
-
 If you run apisix-ingress-controller outside the Kubernetes cluster, 
--kubeconfig option (or kubeconfig item in configuration file) should be 
specified explicitly,
 or if you run it inside cluster, leave it alone and in-cluster configuration 
will be discovered and used.
 
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 0b31f87f..c164affa 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -207,7 +207,7 @@ func (cfg *Config) Validate() error {
return errors.New("apisix base url is required")
}
switch cfg.Kubernetes.IngressVersion {
-   case IngressNetworkingV1, IngressNetworkingV1beta1, 
IngressExtensionsV1beta1:
+   case IngressNetworkingV1, IngressNetworkingV1beta1:
break
default:
return errors.New("unsupported ingress version")
diff --git a/pkg/kube/ingress.go b/pkg/kube/ingress.go
index 84b7ba31..91e2e11d 100644
--- a/pkg/kube/ingress.go
+++ b/pkg/kube/ingress.go
@@ -17,11 +17,9 @@ package kube
 import (
"errors"
 
-   extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
networkingv1 "k8s.io/api/networking/v1"
networkingv1beta1 "k8s.io/api/networking/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-   listersextensionsv1beta1 "k8s.io/client-go/listers/extensions/v1beta1"
listersnetworkingv1 "k8s.io/client-go/listers/networking/v1"
listersnetworkingv1beta1 "k8s.io/client-go/listers/networking/v1beta1"
 )
@@ -31,8 +29,6 @@ const (
IngressV1 = "networking/v1"
// IngressV1beta1 represents the Ingress in networking/v1beta1 group 
version.
IngressV1beta1 = "networking/v1beta1"
-   // IngressExtensionsV1beta1 represents the Ingress in 
extensions/v1beta1 group version.
-   IngressExtensionsV1beta1 = "extensions/v1beta1"
 )
 
 // IngressLister is an enca

[apisix-ingress-controller] branch master updated: ci: auto certs and upgrade APISIX to 3.4.1 version (#1911)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 3f45ca99 ci: auto certs and upgrade APISIX to 3.4.1 version (#1911)
3f45ca99 is described below

commit 3f45ca99db6d354e381679c39f776064ebd69c55
Author: Jintao Zhang 
AuthorDate: Wed Aug 2 12:22:18 2023 +0800

ci: auto certs and upgrade APISIX to 3.4.1 version (#1911)

* ci: auto certs
* chore: upgrade APISIX to 3.4.1 version
* ci: fix case should be able to use backends and upstreams together

-

Signed-off-by: Jintao Zhang 
---
 Makefile   |   2 +-
 test/e2e/scaffold/ssl.go   |  96 -
 test/e2e/suite-features/external-service.go|   3 +-
 .../suite-ingress/suite-ingress-resource/ssl.go| 221 +
 4 files changed, 105 insertions(+), 217 deletions(-)

diff --git a/Makefile b/Makefile
index 118531f5..fe9f05da 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ default: help
 VERSION ?= 1.6.0
 
 
-TARGET_APISIX_VERSION ?= "3.1.0-centos"
+TARGET_APISIX_VERSION ?= "3.4.1-centos"
 APISIX_ADMIN_API_VERSION ?= "v3"
 
 ifeq ($(APISIX_ADMIN_API_VERSION),"v2")
diff --git a/test/e2e/scaffold/ssl.go b/test/e2e/scaffold/ssl.go
index 6dd12f43..00b484d0 100644
--- a/test/e2e/scaffold/ssl.go
+++ b/test/e2e/scaffold/ssl.go
@@ -168,7 +168,7 @@ func (s *Scaffold) GenerateCert(t ginkgo.GinkgoTInterface, 
dnsNames []string) (c
Organization: []string{"Acme Co"},
},
NotBefore: time.Now(),
-   NotAfter:  time.Now().Add(time.Hour),
+   NotAfter:  time.Now().Add(24 * time.Hour),
 
KeyUsage:  x509.KeyUsageDigitalSignature | 
x509.KeyUsageKeyEncipherment,
ExtKeyUsage:   
[]x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
@@ -189,3 +189,97 @@ func (s *Scaffold) GenerateCert(t ginkgo.GinkgoTInterface, 
dnsNames []string) (c
 
return
 }
+
+// GenerateMACert used for generate MutualAuthCerts
+func (s *Scaffold) GenerateMACert(t ginkgo.GinkgoTInterface, dnsNames 
[]string) (caCertBytes, serverCertBytes, serverKeyBytes, clientCertBytes, 
clientKeyBytes bytes.Buffer) {
+   // CA cert
+   caKey, err := rsa.GenerateKey(rand.Reader, 2048)
+   assert.NoError(t, err)
+   caPub := caKey.Public()
+
+   serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
+   serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
+   assert.NoError(t, err)
+
+   caTemplate := x509.Certificate{
+   SerialNumber: serialNumber,
+   Subject: pkix.Name{
+   CommonName:   dnsNames[0] + "-ca",
+   Organization: []string{"Acme Co"},
+   },
+   NotBefore: time.Now(),
+   NotAfter:  time.Now().Add(24 * time.Hour),
+
+   KeyUsage:  x509.KeyUsageDigitalSignature | 
x509.KeyUsageKeyEncipherment,
+   ExtKeyUsage:   
[]x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
+   BasicConstraintsValid: true,
+   }
+
+   caTemplate.IsCA = true
+   caTemplate.KeyUsage |= x509.KeyUsageCertSign
+
+   caBytes, err := x509.CreateCertificate(rand.Reader, &caTemplate, 
&caTemplate, caPub, caKey)
+   assert.NoError(t, err)
+   err = pem.Encode(&caCertBytes, &pem.Block{Type: "CERTIFICATE", Bytes: 
caBytes})
+   assert.NoError(t, err)
+
+   // Server cert
+   serverKey, err := rsa.GenerateKey(rand.Reader, 2048)
+   assert.NoError(t, err)
+
+   serialNumber, err = rand.Int(rand.Reader, serialNumberLimit)
+   assert.NoError(t, err)
+
+   serverTemplate := x509.Certificate{
+   SerialNumber: serialNumber,
+   Subject: pkix.Name{
+   CommonName:   dnsNames[0],
+   Organization: []string{"Acme Co"},
+   },
+   NotBefore: time.Now(),
+   NotAfter:  time.Now().Add(24 * time.Hour),
+
+   KeyUsage:  x509.KeyUsageDigitalSignature | 
x509.KeyUsageKeyEncipherment | x509.KeyUsageCertSign,
+   ExtKeyUsage:   
[]x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
+   BasicConstraintsValid: true,
+   }
+
+   serverBytes, err := x509.CreateCertificate(rand.Reader, 
&serverTemplate, &caTemplate, &serverKey.PublicKey, caKey)
+   assert.NoError(t, err)
+   err = pem.Encode(&serverCertBytes, &pem.Block{Type: "CERTIFICATE", 
Bytes: serverByt

[apisix-ingress-controller] branch master updated: docs: Add QA about exposing gateway as loadbalancer (#1907)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8e3104b3 docs: Add QA about exposing gateway as loadbalancer (#1907)
8e3104b3 is described below

commit 8e3104b3fde9a863a96044e02c34ad63c217f1ae
Author: Ashish Tiwari 
AuthorDate: Tue Aug 1 09:07:14 2023 +0530

docs: Add QA about exposing gateway as loadbalancer (#1907)
---
 docs/en/latest/FAQ.md | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/docs/en/latest/FAQ.md b/docs/en/latest/FAQ.md
index 8c01f7b8..39193062 100644
--- a/docs/en/latest/FAQ.md
+++ b/docs/en/latest/FAQ.md
@@ -88,3 +88,18 @@ You can change the Admin API key in two ways:
 
 1. Modify the key in both 
[apisix/values.yaml](https://github.com/apache/apisix-helm-chart/blob/57cdbe461765cd49af2195cc6a1976cc55262e9b/charts/apisix/values.yaml#L181)
 and 
[apisix/apisix-ingress-controller/values.yaml](https://github.com/apache/apisix-helm-chart/blob/57cdbe461765cd49af2195cc6a1976cc55262e9b/charts/apisix-ingress-controller/values.yaml#L128)
 files.
 2. You can also set this imperatively by passing the flag `--set 
ingress-controller.config.apisix.adminKey= --set 
admin.credentials.admin=` to the `helm install` command.
+
+## Why does my Ingress resource not have an address?
+
+1. **Using the External address of LoadBalancer service.**
+
+You will need to get the apisix-gateway service an external IP assigned for it 
to reflect on the Ingress's status.
+
+* While installing APISIX helm chart make sure to override gateway type with 
`--set gateway.type=LoadBalancer`.
+
+* Also make sure to pass ingressPublishService while installing Ingress 
controller with `--set 
ingress-controller.config.ingressPublishService=`. If 
namespace is not specified then `default` namespace will be chosen.
+
+Note: External IP is allocated either by cloud provider or some other 
controller like metallb(if you're using kind or minikube) so if you're 
deploying Ingress controller on minikube or kind then make sure to install and 
configure something like metallb with an address pool which can allocate 
external IP for service of type LoadBalancer.
+
+2. **Using the address given explicitly by `ingress_status_address`**
+In case the gateway `service` is not of type LoadBalancer, this field should 
be configured in the config-default.yaml used by the Ingress controller. This 
field takes precedence over ExternalIP of the service so if 
`ingress_status_address` array has non zero elements(addresses) present then it 
will used over the ExternalIP of the gateway service.

[apisix-ingress-controller] branch master updated: ci: cron ci must use the logical AND condition (#1850)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new c40b664d ci: cron ci must use the logical AND condition (#1850)
c40b664d is described below

commit c40b664dd22e46bf8ce498aa797d7e8e41b23073
Author: Chever John 
AuthorDate: Mon Jul 31 09:30:09 2023 +0800

ci: cron ci must use the logical AND condition (#1850)
---
 .github/workflows/e2e-test-ci-v2-cron-dev.yml | 8 +---
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/e2e-test-ci-v2-cron-dev.yml 
b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
index e34aa220..0992fb6f 100644
--- a/.github/workflows/e2e-test-ci-v2-cron-dev.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
@@ -26,19 +26,13 @@ on:
 branches:
   - master
   - v1.6.0
-  pull_request:
-branches:
-  - master
-  - v1.6.0
-types: [opened, synchronize, reopened, review_requested]
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || 
github.ref }}-dev
+  group: ${{ github.workflow }}-dev
   cancel-in-progress: true
 
 jobs:
   changes:
-if: ${{ (!github.event.pull_request.draft || github.event.schedule == '0 0 
* * *') }}
 runs-on: ubuntu-20.04
 outputs:
   docs: ${{ steps.filter.outputs.docs }}

[apisix-helm-chart] branch master updated: chore: upgrade APISIX to 3.4.1 (#590)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 86f223d  chore: upgrade APISIX to 3.4.1 (#590)
86f223d is described below

commit 86f223d7f589ef2f95a382c201da472831dffca5
Author: Sn0rt 
AuthorDate: Thu Jul 27 13:40:55 2023 +0800

chore: upgrade APISIX to 3.4.1 (#590)

Signed-off-by: Sn0rt 
---
 charts/apisix/Chart.yaml  | 4 ++--
 charts/apisix/README.md   | 2 +-
 charts/apisix/values.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 9da5b5b..a7774fd 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,12 +31,12 @@ type: application
 # This is the chart version. This version number should be incremented each 
time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.5.0
+version: 1.5.1
 
 # This is the version number of the application being deployed. This version 
number should be
 # incremented each time you make changes to the application. Versions are not 
expected to
 # follow Semantic Versioning. They should reflect the version the application 
is using.
-appVersion: 3.4.0
+appVersion: 3.4.1
 sources:
   - https://github.com/apache/apisix-helm-chart
 
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 864d790..1d00ddc 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -68,7 +68,7 @@ The command removes all the Kubernetes components associated 
with the chart and
 | apisix.httpRouter | string | `"radixtree_host_uri"` | Defines how apisix 
handles routing: - radixtree_uri: match route by uri(base on radixtree) - 
radixtree_host_uri: match route by host + uri(base on radixtree) - 
radixtree_uri_with_parameter: match route by uri with parameters |
 | apisix.image.pullPolicy | string | `"IfNotPresent"` | Apache APISIX image 
pull policy |
 | apisix.image.repository | string | `"apache/apisix"` | Apache APISIX image 
repository |
-| apisix.image.tag | string | `"3.4.0-debian"` | Apache APISIX image tag 
Overrides the image tag whose default is the chart appVersion. |
+| apisix.image.tag | string | `"3.4.1-debian"` | Apache APISIX image tag 
Overrides the image tag whose default is the chart appVersion. |
 | apisix.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` |
 | apisix.luaModuleHook | object | 
`{"configMapRef":{"mounts":[{"key":"","path":""}],"name":""},"enabled":false,"hookPoint":"","luaPath":""}`
 | Whether to add a custom lua module |
 | apisix.luaModuleHook.configMapRef | object | 
`{"mounts":[{"key":"","path":""}],"name":""}` | configmap that stores the codes 
|
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 0827740..48f2ac6 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -99,7 +99,7 @@ apisix:
 pullPolicy: IfNotPresent
 # -- Apache APISIX image tag
 # Overrides the image tag whose default is the chart appVersion.
-tag: 3.4.0-debian
+tag: 3.4.1-debian
 
   # -- Use a `DaemonSet` or `Deployment`
   kind: Deployment

[apisix-helm-chart] branch master updated: feat: add pod topology spread constraints (#581)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 6cab066  feat: add pod topology spread constraints (#581)
6cab066 is described below

commit 6cab0660d30b78210d153dec38f64285c4102db7
Author: ikatlinsky 
AuthorDate: Tue Jul 25 15:20:12 2023 +0200

feat: add pod topology spread constraints (#581)
---
 charts/apisix-dashboard/README.md  | 1 +
 charts/apisix-dashboard/templates/deployment.yaml  | 4 
 charts/apisix-dashboard/values.yaml| 4 
 charts/apisix-ingress-controller/README.md | 2 ++
 charts/apisix-ingress-controller/templates/deployment.yaml | 8 
 charts/apisix-ingress-controller/values.yaml   | 4 
 charts/apisix/README.md| 1 +
 charts/apisix/ci/topology-constrains-values.yaml   | 9 +
 charts/apisix/templates/_pod.tpl   | 4 
 charts/apisix/values.yaml  | 3 +++
 10 files changed, 40 insertions(+)

diff --git a/charts/apisix-dashboard/README.md 
b/charts/apisix-dashboard/README.md
index 8a4c43d..25e5e03 100644
--- a/charts/apisix-dashboard/README.md
+++ b/charts/apisix-dashboard/README.md
@@ -98,4 +98,5 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) 
for command documen
 | serviceAccount.create | bool | `true` | Specifies whether a service account 
should be created |
 | serviceAccount.name | string | `""` | The name of the service account to 
use. If not set and create is true, a name is generated using the fullname 
template |
 | tolerations | list | `[]` | Tolerations for pod assignment |
+| topologySpreadConstraints | list | `[]` | Topology Spread Constraints for 
pod assignment spread across your cluster among failure-domains ref: 
https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#spread-constraints-for-pods
 |
 | updateStrategy | object | `{}` | Update strategy for apisix dashboard 
deployment |
diff --git a/charts/apisix-dashboard/templates/deployment.yaml 
b/charts/apisix-dashboard/templates/deployment.yaml
index 2866549..98ccb11 100644
--- a/charts/apisix-dashboard/templates/deployment.yaml
+++ b/charts/apisix-dashboard/templates/deployment.yaml
@@ -102,3 +102,7 @@ spec:
   tolerations:
 {{- toYaml . | nindent 8 }}
   {{- end }}
+  {{- with .Values.topologySpreadConstraints }}
+  topologySpreadConstraints:
+{{- tpl (. | toYaml) $ | nindent 8 }}
+  {{- end }}
diff --git a/charts/apisix-dashboard/values.yaml 
b/charts/apisix-dashboard/values.yaml
index 89bc9eb..7d8234f 100644
--- a/charts/apisix-dashboard/values.yaml
+++ b/charts/apisix-dashboard/values.yaml
@@ -186,3 +186,7 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+# -- Topology Spread Constraints for pod assignment spread across your cluster 
among failure-domains
+# ref: 
https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#spread-constraints-for-pods
+topologySpreadConstraints: []
diff --git a/charts/apisix-ingress-controller/README.md 
b/charts/apisix-ingress-controller/README.md
index ffd6190..4ec592f 100644
--- a/charts/apisix-ingress-controller/README.md
+++ b/charts/apisix-ingress-controller/README.md
@@ -105,6 +105,7 @@ The same for container level, you need to set:
 
 | Key | Type | Default | Description |
 |-|--|-|-|
+| affinity | object | `{}` |  |
 | autoscaling.enabled | bool | `false` |  |
 | autoscaling.maxReplicas | int | `100` |  |
 | autoscaling.minReplicas | int | `1` |  |
@@ -164,4 +165,5 @@ The same for container level, you need to set:
 | serviceMonitor.labels | object | `{}` | @param serviceMonitor.labels 
ServiceMonitor extra labels |
 | serviceMonitor.metricRelabelings | object | `{}` | @param 
serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples 
before ingestion. ref: 
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
 |
 | tolerations | list | `[]` |  |
+| topologySpreadConstraints | list | `[]` | Topology Spread Constraints for 
pod assignment spread across your cluster among failure-domains ref: 
https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/#spread-constraints-for-pods
 |
 | updateStrategy | object | `{}` | Update strategy for apisix ingress 
controller deployment |
diff --git a/charts/apisix-ingress-controller/templates/deployment.yaml 
b/charts/apisix-ingress-controller/templates/deployment.yaml
index 34a0b49..b5cd0f1 100644
--- a/charts/apisix-ingress-controller/templates/deployment.yaml
+++ b/charts/apisix-ingress-controller/templates/deployment.yaml
@@ -123,3 +123,11 @@ spec:
   tolerations:
 

[apisix-helm-chart] branch master updated: feat: add updateStrategy settings for ingress and dashboard (#583)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new b7dd8dc  feat: add updateStrategy settings for ingress and dashboard 
(#583)
b7dd8dc is described below

commit b7dd8dc92d0fff7dfd5834a6abdfb8a412f17641
Author: ikatlinsky 
AuthorDate: Sun Jul 16 19:23:03 2023 +0200

feat: add updateStrategy settings for ingress and dashboard (#583)

Co-authored-by: Katlinsky, Ilya 
---
 charts/apisix-dashboard/README.md  | 1 +
 charts/apisix-dashboard/templates/deployment.yaml  | 3 +++
 charts/apisix-dashboard/values.yaml| 4 
 charts/apisix-ingress-controller/README.md | 1 +
 charts/apisix-ingress-controller/templates/deployment.yaml | 3 +++
 charts/apisix-ingress-controller/values.yaml   | 4 
 charts/apisix/README.md| 2 +-
 charts/apisix/values.yaml  | 1 +
 8 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/charts/apisix-dashboard/README.md 
b/charts/apisix-dashboard/README.md
index b45176a..a894231 100644
--- a/charts/apisix-dashboard/README.md
+++ b/charts/apisix-dashboard/README.md
@@ -96,3 +96,4 @@ _See [helm upgrade](https://helm.sh/docs/helm/helm_upgrade/) 
for command documen
 | serviceAccount.create | bool | `true` | Specifies whether a service account 
should be created |
 | serviceAccount.name | string | `""` | The name of the service account to 
use. If not set and create is true, a name is generated using the fullname 
template |
 | tolerations | list | `[]` | Tolerations for pod assignment |
+| updateStrategy | object | `{}` | Update strategy for apisix dashboard 
deployment |
diff --git a/charts/apisix-dashboard/templates/deployment.yaml 
b/charts/apisix-dashboard/templates/deployment.yaml
index 6514594..e83a065 100644
--- a/charts/apisix-dashboard/templates/deployment.yaml
+++ b/charts/apisix-dashboard/templates/deployment.yaml
@@ -28,6 +28,9 @@ spec:
   selector:
 matchLabels:
   {{- include "apisix-dashboard.selectorLabels" . | nindent 6 }}
+  {{- with .Values.updateStrategy }}
+  strategy: {{ toYaml . | nindent 4 }}
+  {{- end }}
   template:
 metadata:
   annotations:
diff --git a/charts/apisix-dashboard/values.yaml 
b/charts/apisix-dashboard/values.yaml
index ffc543d..58a58c0 100644
--- a/charts/apisix-dashboard/values.yaml
+++ b/charts/apisix-dashboard/values.yaml
@@ -165,6 +165,10 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+# -- Update strategy for apisix dashboard deployment
+updateStrategy: {}
+  # type: RollingUpdate
+
 # -- Node labels for pod assignment
 nodeSelector: {}
 
diff --git a/charts/apisix-ingress-controller/README.md 
b/charts/apisix-ingress-controller/README.md
index e9736e5..ffd6190 100644
--- a/charts/apisix-ingress-controller/README.md
+++ b/charts/apisix-ingress-controller/README.md
@@ -164,3 +164,4 @@ The same for container level, you need to set:
 | serviceMonitor.labels | object | `{}` | @param serviceMonitor.labels 
ServiceMonitor extra labels |
 | serviceMonitor.metricRelabelings | object | `{}` | @param 
serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples 
before ingestion. ref: 
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
 |
 | tolerations | list | `[]` |  |
+| updateStrategy | object | `{}` | Update strategy for apisix ingress 
controller deployment |
diff --git a/charts/apisix-ingress-controller/templates/deployment.yaml 
b/charts/apisix-ingress-controller/templates/deployment.yaml
index df0337d..34a0b49 100644
--- a/charts/apisix-ingress-controller/templates/deployment.yaml
+++ b/charts/apisix-ingress-controller/templates/deployment.yaml
@@ -28,6 +28,9 @@ spec:
   selector:
 matchLabels:
   {{- include "apisix-ingress-controller.selectorLabels" . | nindent 6 }}
+  {{- with .Values.updateStrategy }}
+  strategy: {{ toYaml . | nindent 4 }}
+  {{- end }}
   template:
 metadata:
   annotations:
diff --git a/charts/apisix-ingress-controller/values.yaml 
b/charts/apisix-ingress-controller/values.yaml
index 266c828..2ffce72 100644
--- a/charts/apisix-ingress-controller/values.yaml
+++ b/charts/apisix-ingress-controller/values.yaml
@@ -160,6 +160,10 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+# -- Update strategy for apisix ingress controller deployment
+updateStrategy: {}
+  # type: RollingUpdate
+
 nodeSelector: {}
 tolerations: []
 
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 58ae897..8771b08 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -225,7 +225,7 @@ The command removes all the Kub

[apisix-helm-chart] branch master updated: feat: support adding metrics relabeling config (#579)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 4927258  feat: support adding metrics relabeling config (#579)
4927258 is described below

commit 4927258548799205ef9ca302b9b63abdf7e80cd5
Author: Abhishek Choudhary 
AuthorDate: Wed Jul 12 08:50:32 2023 +0545

feat: support adding metrics relabeling config (#579)
---
 charts/apisix-ingress-controller/README.md | 3 ++-
 charts/apisix-ingress-controller/templates/servicemonitor.yaml | 1 +
 charts/apisix-ingress-controller/values.yaml   | 3 +++
 charts/apisix/README.md| 3 ++-
 charts/apisix/templates/service-monitor.yaml   | 1 +
 charts/apisix/values.yaml  | 3 +++
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/charts/apisix-ingress-controller/README.md 
b/charts/apisix-ingress-controller/README.md
index f35686a..e9736e5 100644
--- a/charts/apisix-ingress-controller/README.md
+++ b/charts/apisix-ingress-controller/README.md
@@ -159,7 +159,8 @@ The same for container level, you need to set:
 | serviceAccount.automountServiceAccountToken | bool | `true` | Whether 
automounting API credentials for a service account |
 | serviceAccount.create | bool | `true` | Specifies whether a ServiceAccount 
should be created |
 | serviceAccount.name | string | `""` | The name of the ServiceAccount to use. 
If not set and create is true, a name is generated using the fullname template |
-| serviceMonitor | object | 
`{"annotations":{},"enabled":false,"interval":"15s","labels":{},"namespace":"monitoring"}`
 | namespace: "ingress-apisix" |
+| serviceMonitor | object | 
`{"annotations":{},"enabled":false,"interval":"15s","labels":{},"metricRelabelings":{},"namespace":"monitoring"}`
 | namespace: "ingress-apisix" |
 | serviceMonitor.annotations | object | `{}` | @param 
serviceMonitor.annotations ServiceMonitor annotations |
 | serviceMonitor.labels | object | `{}` | @param serviceMonitor.labels 
ServiceMonitor extra labels |
+| serviceMonitor.metricRelabelings | object | `{}` | @param 
serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples 
before ingestion. ref: 
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
 |
 | tolerations | list | `[]` |  |
diff --git a/charts/apisix-ingress-controller/templates/servicemonitor.yaml 
b/charts/apisix-ingress-controller/templates/servicemonitor.yaml
index 1968d20..f8dd9dc 100644
--- a/charts/apisix-ingress-controller/templates/servicemonitor.yaml
+++ b/charts/apisix-ingress-controller/templates/servicemonitor.yaml
@@ -35,6 +35,7 @@ spec:
 {{- if .Values.serviceMonitor.interval }}
 interval: {{ .Values.serviceMonitor.interval }}
 {{- end }}
+metricRelabelings: {{ .Values.serviceMonitor.metricRelabelings }}
   namespaceSelector:
 matchNames:
 - {{ template "apisix-ingress-controller.namespace" . }}
diff --git a/charts/apisix-ingress-controller/values.yaml 
b/charts/apisix-ingress-controller/values.yaml
index 8fcd598..266c828 100644
--- a/charts/apisix-ingress-controller/values.yaml
+++ b/charts/apisix-ingress-controller/values.yaml
@@ -173,6 +173,9 @@ serviceMonitor:
   labels: {}
   # -- @param serviceMonitor.annotations ServiceMonitor annotations
   annotations: {}
+  # -- @param serviceMonitor.metricRelabelings MetricRelabelConfigs to apply 
to samples before ingestion.
+  # ref: 
https://prometheus.io/docs/prometheus/latest/configuration/configuration/#metric_relabel_configs
+  metricRelabelings: {}
 
 
 podSecurityContext: {}
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 30e8201..58ae897 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -213,13 +213,14 @@ The command removes all the Kubernetes components 
associated with the chart and
 | serviceAccount.annotations | object | `{}` |  |
 | serviceAccount.create | bool | `false` |  |
 | serviceAccount.name | string | `""` |  |
-| serviceMonitor | object | 
`{"annotations":{},"containerPort":9091,"enabled":false,"interval":"15s","labels":{},"metricPrefix":"apisix_","name":"","namespace":"","path":"/apisix/prometheus/metrics"}`
 | Observability configuration. ref: 
https://apisix.apache.org/docs/apisix/plugins/prometheus/ |
+| serviceMonitor | object | 
`{"annotations":{},"containerPort":9091,"enabled":false,"interval":&quo

[apisix-docker] branch master updated: Update apisix uid in the Debian Dockerfile (#478)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git


The following commit(s) were added to refs/heads/master by this push:
 new 615a38a  Update apisix uid in the Debian Dockerfile (#478)
615a38a is described below

commit 615a38a405e7447fd0e07b9486d366ed71eaf9ec
Author: Traky Deng 
AuthorDate: Tue Jul 11 11:50:19 2023 +0800

Update apisix uid in the Debian Dockerfile (#478)
---
 debian/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/Dockerfile b/debian/Dockerfile
index 5261a80..1265642 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -48,7 +48,9 @@ WORKDIR /usr/local/apisix
 
 ENV 
PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin
 
-RUN useradd -u 1001 apisix && chown -R apisix:apisix /usr/local/apisix
+RUN groupadd --system --gid 636 apisix \
+&& useradd --system --gid apisix --no-create-home --shell 
/usr/sbin/nologin --uid 636 apisix \
+&& chown -R apisix:apisix /usr/local/apisix
 
 USER apisix
 

[apisix-helm-chart] branch master updated: feat: allow customize meta in `nginx_config` (#569)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 9f54140  feat: allow customize meta in `nginx_config` (#569)
9f54140 is described below

commit 9f54140f0fe4f1bdda9017442b7fb91fbbe4bd0d
Author: fengxsong 
AuthorDate: Tue Jul 11 11:46:44 2023 +0800

feat: allow customize meta in `nginx_config` (#569)
---
 charts/apisix/README.md| 1 +
 charts/apisix/templates/configmap.yaml | 2 ++
 charts/apisix/values.yaml  | 4 
 3 files changed, 7 insertions(+)

diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 7bb5ad7..30e8201 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -203,6 +203,7 @@ The command removes all the Kubernetes components 
associated with the chart and
 | nameOverride | string | `""` |  |
 | nginx.enableCPUAffinity | bool | `true` |  |
 | nginx.envs | list | `[]` |  |
+| nginx.meta | string | `"lua_shared_dict:\n  prometheus-metrics: 15m\n"` | 
allow customize meta in `nginx_config` section |
 | nginx.workerConnections | string | `"10620"` |  |
 | nginx.workerProcesses | string | `"auto"` |  |
 | nginx.workerRlimitNofile | string | `"20480"` |  |
diff --git a/charts/apisix/templates/configmap.yaml 
b/charts/apisix/templates/configmap.yaml
index 6037052..d884774 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -163,6 +163,8 @@ data:
   worker_rlimit_nofile: {{ default "20480" 
.Values.nginx.workerRlimitNofile }}  # the number of files a worker process can 
open, should be larger than worker_connections
   event:
 worker_connections: {{ default "10620" .Values.nginx.workerConnections 
 }}
+  meta:
+{{- .Values.nginx.meta | nindent 8 }}
   {{- with .Values.nginx.envs }}
   envs:
   {{- range $env := . }}
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index aa8bf29..62d51d5 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -393,6 +393,10 @@ nginx:
   workerProcesses: auto
   enableCPUAffinity: true
   envs: []
+  # -- allow customize meta in `nginx_config` section
+  meta: |
+lua_shared_dict:
+  prometheus-metrics: 15m
 
 # -- Customize the list of APISIX plugins to enable. By default, APISIX's 
default plugins are automatically used. See 
[config-default.yaml](https://github.com/apache/apisix/blob/master/conf/config-default.yaml)
 plugins: []

[apisix-helm-chart] branch dev updated: chore: upgrade APISIX to 3.4.0 (dev) (#577)

[zhangjintao]

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

zhangjintao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/dev by this push:
 new 6808ebb  chore: upgrade APISIX to 3.4.0 (dev) (#577)
6808ebb is described below

commit 6808ebbddd816effe765134ca76cf0899923a8ac
Author: Xin Rong 
AuthorDate: Mon Jul 10 15:11:48 2023 +0800

chore: upgrade APISIX to 3.4.0 (dev) (#577)
---
 charts/apisix/Chart.yaml  | 4 ++--
 charts/apisix/README.md   | 2 +-
 charts/apisix/values.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index e7e2225..3109821 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,12 +31,12 @@ type: application
 # This is the chart version. This version number should be incremented each 
time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.0
+version: 2.1.0
 
 # This is the version number of the application being deployed. This version 
number should be
 # incremented each time you make changes to the application. Versions are not 
expected to
 # follow Semantic Versioning. They should reflect the version the application 
is using.
-appVersion: 3.3.0
+appVersion: 3.4.0
 sources:
   - https://github.com/apache/apisix-helm-chart
 
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 27f8c0c..aa3ce75 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -178,7 +178,7 @@ The command removes all the Kubernetes components 
associated with the chart and
 | hostNetwork | bool | `false` |  |
 | image.pullPolicy | string | `"IfNotPresent"` | Apache APISIX image pull 
policy |
 | image.repository | string | `"apache/apisix"` | Apache APISIX image 
repository |
-| image.tag | string | `"3.3.0-debian"` | Apache APISIX image tag Overrides 
the image tag whose default is the chart appVersion. |
+| image.tag | string | `"3.4.0-debian"` | Apache APISIX image tag Overrides 
the image tag whose default is the chart appVersion. |
 | ingress | object | 
`{"annotations":{},"enabled":false,"hosts":[{"host":"apisix.local","paths":[]}],"tls":[]}`
 | Using ingress access Apache APISIX service |
 | ingress-controller | object | 
`{"config":{"apisix":{"adminAPIVersion":"v3"}},"enabled":false}` | Ingress 
controller configuration |
 | ingress.annotations | object | `{}` | Ingress annotations |
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index af4930e..7dfd71a 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -29,7 +29,7 @@ image:
   pullPolicy: IfNotPresent
   # -- Apache APISIX image tag
   # Overrides the image tag whose default is the chart appVersion.
-  tag: 3.3.0-debian
+  tag: 3.4.0-debian
 
 # -- set false to use `Deployment`, set true to use `DaemonSet`
 useDaemonSet: false

[apisix-helm-chart] branch master updated: chore: upgrade APISIX to 3.4.0 (#576)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new fbfafbd  chore: upgrade APISIX to 3.4.0 (#576)
fbfafbd is described below

commit fbfafbd03ab819b109badcc52425dca27f619df2
Author: Xin Rong 
AuthorDate: Mon Jul 10 10:40:29 2023 +0800

chore: upgrade APISIX to 3.4.0 (#576)
---
 charts/apisix/Chart.yaml  | 4 ++--
 charts/apisix/README.md   | 2 +-
 charts/apisix/values.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 3303b3a..9da5b5b 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,12 +31,12 @@ type: application
 # This is the chart version. This version number should be incremented each 
time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.1
+version: 1.5.0
 
 # This is the version number of the application being deployed. This version 
number should be
 # incremented each time you make changes to the application. Versions are not 
expected to
 # follow Semantic Versioning. They should reflect the version the application 
is using.
-appVersion: 3.3.0
+appVersion: 3.4.0
 sources:
   - https://github.com/apache/apisix-helm-chart
 
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 72eeefd..7bb5ad7 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -68,7 +68,7 @@ The command removes all the Kubernetes components associated 
with the chart and
 | apisix.httpRouter | string | `"radixtree_host_uri"` | Defines how apisix 
handles routing: - radixtree_uri: match route by uri(base on radixtree) - 
radixtree_host_uri: match route by host + uri(base on radixtree) - 
radixtree_uri_with_parameter: match route by uri with parameters |
 | apisix.image.pullPolicy | string | `"IfNotPresent"` | Apache APISIX image 
pull policy |
 | apisix.image.repository | string | `"apache/apisix"` | Apache APISIX image 
repository |
-| apisix.image.tag | string | `"3.3.0-debian"` | Apache APISIX image tag 
Overrides the image tag whose default is the chart appVersion. |
+| apisix.image.tag | string | `"3.4.0-debian"` | Apache APISIX image tag 
Overrides the image tag whose default is the chart appVersion. |
 | apisix.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` |
 | apisix.luaModuleHook | object | 
`{"configMapRef":{"mounts":[{"key":"","path":""}],"name":""},"enabled":false,"hookPoint":"","luaPath":""}`
 | Whether to add a custom lua module |
 | apisix.luaModuleHook.configMapRef | object | 
`{"mounts":[{"key":"","path":""}],"name":""}` | configmap that stores the codes 
|
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 18b3e4d..aa8bf29 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -99,7 +99,7 @@ apisix:
 pullPolicy: IfNotPresent
 # -- Apache APISIX image tag
 # Overrides the image tag whose default is the chart appVersion.
-tag: 3.3.0-debian
+tag: 3.4.0-debian
 
   # -- Use a `DaemonSet` or `Deployment`
   kind: Deployment

[apisix-helm-chart] branch master updated: feat: allow to provide etcd creds from secrets (#555)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new f5c7256  feat: allow to provide etcd creds from secrets (#555)
f5c7256 is described below

commit f5c7256ea9c0d07ac897cdf2fdcd365e429a3e26
Author: ikatlinsky 
AuthorDate: Fri Jul 7 09:53:02 2023 +0200

feat: allow to provide etcd creds from secrets (#555)

Co-authored-by: Katlinsky, Ilya 
---
 charts/apisix/README.md| 10 --
 charts/apisix/ci/default-values.yaml   |  0
 charts/apisix/ci/etcd-password-values.yaml | 21 +++
 charts/apisix/templates/_helpers.tpl   | 56 ++
 charts/apisix/templates/_pod.tpl   | 19 ++
 charts/apisix/templates/configmap.yaml |  8 +
 charts/apisix/templates/secrets.yaml   | 14 
 charts/apisix/values.yaml  | 16 +
 8 files changed, 135 insertions(+), 9 deletions(-)

diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index feb67db..72eeefd 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -144,9 +144,11 @@ The command removes all the Kubernetes components 
associated with the chart and
 | dns.resolvers[5] | string | `"8.8.8.8"` |  |
 | dns.timeout | int | `5` |  |
 | dns.validity | int | `30` |  |
-| etcd | object | 
`{"auth":{"rbac":{"create":false,"rootPassword":""},"tls":{"certFilename":"","certKeyFilename":"","enabled":false,"existingSecret":"","sni":"","verify":true}},"enabled":true,"host":["http://etcd.host:2379"],"password":"","prefix":"/apisix","replicaCount":3,"service":{"port":2379},"timeout":30,"user":""}`
 | etcd configuration use the FQDN address or the IP of the etcd |
-| etcd.auth | object | 
`{"rbac":{"create":false,"rootPassword":""},"tls":{"certFilename":"","certKeyFilename":"","enabled":false,"existingSecret":"","sni":"","verify":true}}`
 | if etcd.enabled is true, set more values of bitnami/etcd helm chart |
+| etcd | object | 
`{"auth":{"rbac":{"create":false,"existingSecret":"","existingSecretPasswordKey":"","rootPassword":""},"tls":{"certFilename":"","certKeyFilename":"","enabled":false,"existingSecret":"","sni":"","verify":true}},"enabled":true,"existingSecret":"","existingSecretPasswordKey":"","existingSecretUserKey":"","host":["http://etcd.host:2379"],"password":"","prefix":"/apisix","replicaCount":3,"service":{"port":2379},"timeout":30,"user":""}`
 | etcd configuration use the FQDN addre [...]
+| etcd.auth | object | 
`{"rbac":{"create":false,"existingSecret":"","existingSecretPasswordKey":"","rootPassword":""},"tls":{"certFilename":"","certKeyFilename":"","enabled":false,"existingSecret":"","sni":"","verify":true}}`
 | if etcd.enabled is true, set more values of bitnami/etcd helm chart |
 | etcd.auth.rbac.create | bool | `false` | No authentication by default. 
Switch to enable RBAC authentication |
+| etcd.auth.rbac.existingSecret | string | `""` | Name of the existing secret 
containing credentials for the root user |
+| etcd.auth.rbac.existingSecretPasswordKey | string | `""` | Name of key 
containing password to be retrieved from the existing secret |
 | etcd.auth.rbac.rootPassword | string | `""` | root password for etcd. 
Requires etcd.auth.rbac.create to be true. |
 | etcd.auth.tls.certFilename | string | `""` | etcd client cert filename using 
in etcd.auth.tls.existingSecret |
 | etcd.auth.tls.certKeyFilename | string | `""` | etcd client cert key 
filename using in etcd.auth.tls.existingSecret |
@@ -155,6 +157,9 @@ The command removes all the Kubernetes components 
associated with the chart and
 | etcd.auth.tls.sni | string | `""` | specify the TLS Server Name Indication 
extension, the ETCD endpoint hostname will be used w

[apisix-helm-chart] branch master updated: chore: release apisix v1.4.1 with ingress v0.11.7 (#573)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 45c6b48  chore: release apisix v1.4.1 with ingress v0.11.7 (#573)
45c6b48 is described below

commit 45c6b4843c6276c6145152321871775eac511393
Author: ikatlinsky 
AuthorDate: Thu Jul 6 10:45:12 2023 +0200

chore: release apisix v1.4.1 with ingress v0.11.7 (#573)

Co-authored-by: Katlinsky, Ilya 
---
 charts/apisix/Chart.lock|   6 +++---
 charts/apisix/Chart.yaml|   4 ++--
 .../apisix/charts/apisix-ingress-controller-0.11.6.tgz  | Bin 16291 -> 0 bytes
 .../apisix/charts/apisix-ingress-controller-0.11.7.tgz  | Bin 0 -> 16791 bytes
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/apisix/Chart.lock b/charts/apisix/Chart.lock
index b72040c..b0713bb 100644
--- a/charts/apisix/Chart.lock
+++ b/charts/apisix/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 0.8.0
 - name: apisix-ingress-controller
   repository: https://charts.apiseven.com
-  version: 0.11.6
-digest: sha256:9df7b6647db898e47bfcb2ccf80fa2ee8df210d609cb2af31fe614aab3c64934
-generated: "2023-06-20T15:14:46.946284767+08:00"
+  version: 0.11.7
+digest: sha256:459d973b6f8f20e6f80831056a0bc924cebfac139f44fe7e45abd7cc91d0142b
+generated: "2023-07-05T07:50:48.489645+02:00"
diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 1c6454a..3303b3a 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,7 +31,7 @@ type: application
 # This is the chart version. This version number should be incremented each 
time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.0
+version: 1.4.1
 
 # This is the version number of the application being deployed. This version 
number should be
 # incremented each time you make changes to the application. Versions are not 
expected to
@@ -51,7 +51,7 @@ dependencies:
 condition: dashboard.enabled
 alias: dashboard
   - name: apisix-ingress-controller
-version: 0.11.6
+version: 0.11.7
 repository: https://charts.apiseven.com
 condition: ingress-controller.enabled
 alias: ingress-controller
diff --git a/charts/apisix/charts/apisix-ingress-controller-0.11.6.tgz 
b/charts/apisix/charts/apisix-ingress-controller-0.11.6.tgz
deleted file mode 100644
index 8759e9f..000
Binary files a/charts/apisix/charts/apisix-ingress-controller-0.11.6.tgz and 
/dev/null differ
diff --git a/charts/apisix/charts/apisix-ingress-controller-0.11.7.tgz 
b/charts/apisix/charts/apisix-ingress-controller-0.11.7.tgz
new file mode 100644
index 000..8df6372
Binary files /dev/null and 
b/charts/apisix/charts/apisix-ingress-controller-0.11.7.tgz differ

[apisix-helm-chart] branch master updated: fix: render ServiceMonitor regardless of presented CRDs (#571)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new e3ed4c1  fix: render ServiceMonitor regardless of presented CRDs (#571)
e3ed4c1 is described below

commit e3ed4c10e09a18ade8034664507c5b95bca16845
Author: German Lashevich 
AuthorDate: Wed Jul 5 03:55:36 2023 +

fix: render ServiceMonitor regardless of presented CRDs (#571)

Remove the check of monitoring.coreos.com/v1 API to make it possible to 
render the ServiceMonitor resource without connection to the target Kubernetes 
cluster and without supplying --api-versions flag for helm.
---
 charts/apisix-ingress-controller/templates/servicemonitor.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/apisix-ingress-controller/templates/servicemonitor.yaml 
b/charts/apisix-ingress-controller/templates/servicemonitor.yaml
index 8d1af14..1968d20 100644
--- a/charts/apisix-ingress-controller/templates/servicemonitor.yaml
+++ b/charts/apisix-ingress-controller/templates/servicemonitor.yaml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) 
.Values.serviceMonitor.enabled }}
+{{- if .Values.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

[apisix-helm-chart] branch master updated: feat: PDB updated to Kubernetes 1.25 (#508)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 250d720  feat: PDB updated to Kubernetes 1.25 (#508)
250d720 is described below

commit 250d72052d03a343115c9fe591b6621516f24b3f
Author: Łukasz Biegaj 
AuthorDate: Thu Jun 29 03:30:15 2023 +0200

feat: PDB updated to Kubernetes 1.25 (#508)

Why:
* Chart could not be installed in Kubernetes 1.25
* The PodDisruptionBudget used apiVersion that is deprecated before and 
unavailable in 1.25.

How:
* PodDisruptionBudget apiVersion is updated to match the Kubernetes 
version. No spec adjustments needed.
* Changes are applied also to k8s versions in which old api versions were 
deprecated.

Reference:
* 
https://kubernetes.io/docs/reference/using-api/deprecation-guide/#poddisruptionbudget-v125

I have tested the changes on a 1.25 cluster and reviewed templates visually 
for older version.
---
 charts/apisix/templates/pdb.yaml | 4 
 1 file changed, 4 insertions(+)

diff --git a/charts/apisix/templates/pdb.yaml b/charts/apisix/templates/pdb.yaml
index e37239f..60c71bb 100644
--- a/charts/apisix/templates/pdb.yaml
+++ b/charts/apisix/templates/pdb.yaml
@@ -15,7 +15,11 @@
 # limitations under the License.
 
 {{- if (and .Values.apisix.enabled .Values.apisix.podDisruptionBudget.enabled) 
}}
+{{ if semverCompare "<1.21-0" .Capabilities.KubeVersion.Version -}}
 apiVersion: policy/v1beta1
+{{- else -}}
+apiVersion: policy/v1
+{{- end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "apisix.fullname" . }}

[apisix-helm-chart] branch master updated: feat: allow proxy protocol configuration for APISIX (#528)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 9efc9f3  feat: allow proxy protocol configuration for APISIX (#528)
9efc9f3 is described below

commit 9efc9f36efa3e47976c68445df227576a50c39f4
Author: Pierre P 
AuthorDate: Tue Jun 27 09:55:05 2023 +0200

feat: allow proxy protocol configuration for APISIX (#528)

Co-authored-by: Horacio Granillo 
---
 charts/apisix/README.md  |  8 +++
 charts/apisix/templates/configmap.yaml   | 18 +---
 charts/apisix/templates/service-gateway.yaml | 18 
 charts/apisix/values.yaml| 32 
 4 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index b7c862b..feb67db 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -85,6 +85,11 @@ The command removes all the Kubernetes components associated 
with the chart and
 | apisix.podDisruptionBudget.minAvailable | string | `"90%"` | Set the 
`minAvailable` of podDisruptionBudget. You can specify only one of 
`maxUnavailable` and `minAvailable` in a single PodDisruptionBudget. See 
[Specifying a Disruption Budget for your 
Application](https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget)
 for more details |
 | apisix.podSecurityContext | object | `{}` | Set the securityContext for 
Apache APISIX pods |
 | apisix.priorityClassName | string | `""` | Set 
[priorityClassName](https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority)
 for Apache APISIX pods |
+| apisix.proxyProtocol | object | 
`{"enabled":false,"listenHttpPort":9181,"listenHttpsPort":9182,"tcp":true,"upstream":true}`
 | Enable Proxy Protocol |
+| apisix.proxyProtocol.listenHttpPort | int | `9181` | The port with proxy 
protocol for http, it differs from node_listen and admin_listen. |
+| apisix.proxyProtocol.listenHttpsPort | int | `9182` | The port with proxy 
protocol for https |
+| apisix.proxyProtocol.tcp | bool | `true` | Enable the proxy protocol for tcp 
proxy, it works for stream_proxy.tcp option |
+| apisix.proxyProtocol.upstream | bool | `true` | Enable the proxy protocol to 
the upstream server |
 | apisix.readinessProbe | object | 
`{"failureThreshold":6,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"tcpSocket":{"port":9080},"timeoutSeconds":1}`
 | Set the readinessProbe for Apache APISIX pods |
 | apisix.replicaCount | int | `1` | kind is DaemonSet, replicaCount not become 
effective |
 | apisix.resources | object | `{}` | Set pod resource requests & limits |
@@ -168,6 +173,9 @@ The command removes all the Kubernetes components 
associated with the chart and
 | gateway.ingress | object | 
`{"annotations":{},"enabled":false,"hosts":[{"host":"apisix.local","paths":[]}],"tls":[]}`
 | Using ingress access Apache APISIX service |
 | gateway.ingress.annotations | object | `{}` | Ingress annotations |
 | gateway.labelsOverride | object | `{}` | Override default labels assigned to 
Apache APISIX gateway resources |
+| gateway.proxyProtocol | object | 
`{"http":{"containerPort":9181,"enabled":false,"servicePort":9181},"https":{"containerPort":9182,"enabled":false,"servicePort":9182}}`
 | Proxy Protocol Configuration |
+| gateway.proxyProtocol.http | object | 
`{"containerPort":9181,"enabled":false,"servicePort":9181}` | If you enable 
proxy protocol, you must use this port to receive http request with proxy 
protocol |
+| gateway.proxyProtocol.https | object | 
`{"containerPort":9182,"enabled":false,"servicePort":9182}` | The port with 
proxy protocol for https |
 | gateway.stream | object | `{"enabled":false,"only":false,"tcp":[],"udp":[]}` 
| Apache APISIX service settings for stream. L4 proxy (TCP/UDP) |
 | gateway.tls | object | 
`{"additionalContainerPorts":[],"certCAFilename":"","containerPort":9443,"enabled":false,"existingCASecret":"","fallbackSNI":"","http2":{"enabled":true},"servicePort":443,"sslProtocols":"TLSv1.2
 TLSv1.3"}` | Apache APISIX service settings for tls |
 | gateway.tls.additionalContainerPorts | list | `[]` | Support multiple https 
ports, See 
[Configuration](https://github.com/apache/apisix/blob

[apisix-ingress-controller] branch master updated (8e86331c -> a79c1404)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 8e86331c docs: update docs links (#1873)
 add a79c1404 chore(deps): bump k8s.io/client-go from 0.27.1 to 0.27.3 in 
/test/e2e (#1866)

No new revisions were added by this update.

Summary of changes:
 test/e2e/go.mod |  6 +++---
 test/e2e/go.sum | 12 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

[apisix-helm-chart] branch master updated: feat: adding fallback_sni to apisix conf (#546)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new e7a79ff  feat: adding fallback_sni to apisix conf (#546)
e7a79ff is described below

commit e7a79ffeb6d060fd08687e9f6d90f01ac909b673
Author: apalapal <98978955+apala...@users.noreply.github.com>
AuthorDate: Sun Jun 25 02:23:33 2023 +0100

feat: adding fallback_sni to apisix conf (#546)

Co-authored-by: AP 
---
 charts/apisix/README.md| 3 ++-
 charts/apisix/templates/configmap.yaml | 3 +++
 charts/apisix/values.yaml  | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 78dedd5..b7c862b 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -169,10 +169,11 @@ The command removes all the Kubernetes components 
associated with the chart and
 | gateway.ingress.annotations | object | `{}` | Ingress annotations |
 | gateway.labelsOverride | object | `{}` | Override default labels assigned to 
Apache APISIX gateway resources |
 | gateway.stream | object | `{"enabled":false,"only":false,"tcp":[],"udp":[]}` 
| Apache APISIX service settings for stream. L4 proxy (TCP/UDP) |
-| gateway.tls | object | 
`{"additionalContainerPorts":[],"certCAFilename":"","containerPort":9443,"enabled":false,"existingCASecret":"","http2":{"enabled":true},"servicePort":443,"sslProtocols":"TLSv1.2
 TLSv1.3"}` | Apache APISIX service settings for tls |
+| gateway.tls | object | 
`{"additionalContainerPorts":[],"certCAFilename":"","containerPort":9443,"enabled":false,"existingCASecret":"","fallbackSNI":"","http2":{"enabled":true},"servicePort":443,"sslProtocols":"TLSv1.2
 TLSv1.3"}` | Apache APISIX service settings for tls |
 | gateway.tls.additionalContainerPorts | list | `[]` | Support multiple https 
ports, See 
[Configuration](https://github.com/apache/apisix/blob/0bc65ea9acd726f79f80ae0abd8f50b7eb172e3d/conf/config-default.yaml#L99)
 |
 | gateway.tls.certCAFilename | string | `""` | Filename be used in the 
gateway.tls.existingCASecret |
 | gateway.tls.existingCASecret | string | `""` | Specifies the name of Secret 
contains trusted CA certificates in the PEM format used to verify the 
certificate when APISIX needs to do SSL/TLS handshaking with external services 
(e.g. etcd) |
+| gateway.tls.fallbackSNI | string | `""` | Define SNI to fallback if none is 
presented by client |
 | gateway.tls.sslProtocols | string | `"TLSv1.2 TLSv1.3"` | TLS protocols 
allowed to use. |
 | gateway.type | string | `"NodePort"` | Apache APISIX service type for user 
access itself |
 | global.imagePullSecrets | list | `[]` | Global Docker registry secret names 
as an array |
diff --git a/charts/apisix/templates/configmap.yaml 
b/charts/apisix/templates/configmap.yaml
index 3f13b21..6cb25a9 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -149,6 +149,9 @@ data:
 {{- if and .Values.gateway.tls.enabled 
.Values.gateway.tls.existingCASecret }}
 ssl_trusted_certificate: "/usr/local/apisix/conf/ssl/{{ 
.Values.gateway.tls.certCAFilename }}"
 {{- end }}
+{{- if and .Values.gateway.tls.enabled .Values.gateway.tls.fallbackSNI 
}}
+fallback_sni: {{ .Values.gateway.tls.fallbackSNI | quote }}
+{{- end }}
 
 nginx_config:# config for render the template to genarate nginx.conf
   error_log: "{{ .Values.logs.errorLog }}"
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 272d358..8b9aa9f 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -268,6 +268,8 @@ gateway:
   enabled: true
 # -- TLS protocols allowed to use.
 sslProtocols: "TLSv1.2 TLSv1.3"
+# -- Define SNI to fallback if none is presented by client
+fallbackSNI: ""
   # -- Apache APISIX service settings for stream. L4 proxy (TCP/UDP)
   stream:
 enabled: false

[apisix-helm-chart] branch master updated: feat: add security context for ingress container (#564)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 6c51011  feat: add security context for ingress container (#564)
6c51011 is described below

commit 6c51011921d7c9437767b4959ad7e1084cbb7f90
Author: ikatlinsky 
AuthorDate: Sun Jun 25 03:20:46 2023 +0200

feat: add security context for ingress container (#564)

Co-authored-by: Katlinsky, Ilya 
---
 charts/apisix-ingress-controller/templates/deployment.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/charts/apisix-ingress-controller/templates/deployment.yaml 
b/charts/apisix-ingress-controller/templates/deployment.yaml
index ba73b48..df0337d 100644
--- a/charts/apisix-ingress-controller/templates/deployment.yaml
+++ b/charts/apisix-ingress-controller/templates/deployment.yaml
@@ -75,6 +75,8 @@ spec:
 - ingress
 - --config-path
 - /ingress-apisix/conf/config.yaml
+  securityContext:
+{{- toYaml .Values.securityContext | nindent 12 }}
   image: "{{ .Values.image.repository }}:{{ .Values.image.tag | 
default .Chart.AppVersion }}"
   imagePullPolicy: {{ .Values.image.pullPolicy }}
   ports:

[apisix-helm-chart] branch master updated: feat: allow to override admin token for ingress controller (#553)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new c486ada  feat: allow to override admin token for ingress controller 
(#553)
c486ada is described below

commit c486adad8730a06c604118415142d3a1bb74edd5
Author: ikatlinsky 
AuthorDate: Sun Jun 25 03:13:27 2023 +0200

feat: allow to override admin token for ingress controller (#553)

Co-authored-by: Katlinsky, Ilya 
---
 charts/apisix-ingress-controller/README.md |  4 +++-
 charts/apisix-ingress-controller/templates/_helpers.tpl| 11 +++
 charts/apisix-ingress-controller/templates/configmap.yaml  |  2 ++
 charts/apisix-ingress-controller/templates/deployment.yaml |  7 +++
 charts/apisix-ingress-controller/values.yaml   |  6 ++
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/charts/apisix-ingress-controller/README.md 
b/charts/apisix-ingress-controller/README.md
index 90f84d1..f35686a 100644
--- a/charts/apisix-ingress-controller/README.md
+++ b/charts/apisix-ingress-controller/README.md
@@ -111,8 +111,10 @@ The same for container level, you need to set:
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | autoscaling.version | string | `"v2"` | HPA version, the value is "v2" or 
"v2beta1", default "v2" |
 | clusterDomain | string | `"cluster.local"` |  |
-| config.apisix | object | 
`{"adminAPIVersion":"v2","adminKey":"edd1c9f034335f136f87ad84b625c8f1","clusterName":"default","serviceName":"apisix-admin","serviceNamespace":"ingress-apisix","servicePort":9180}`
 | APISIX related configurations. |
+| config.apisix | object | 
`{"adminAPIVersion":"v2","adminKey":"edd1c9f034335f136f87ad84b625c8f1","clusterName":"default","existingSecret":"","existingSecretAdminKeyKey":"","serviceName":"apisix-admin","serviceNamespace":"ingress-apisix","servicePort":9180}`
 | APISIX related configurations. |
 | config.apisix.adminAPIVersion | string | `"v2"` | the APISIX admin API 
version. can be "v2" or "v3", default is "v2". |
+| config.apisix.existingSecret | string | `""` | The APISIX Helm chart 
supports storing user credentials in a secret. The secret needs to contain a 
single key for admin token with key adminKey by default. |
+| config.apisix.existingSecretAdminKeyKey | string | `""` | Name of the admin 
token key in the secret, overrides the default key name "adminKey" |
 | config.apisix.serviceName | string | `"apisix-admin"` | Enabling this value, 
overrides serviceName and serviceNamespace. serviceFullname: 
"apisix-admin.apisix.svc.local" |
 | config.apisixResourceSyncInterval | string | `"1h"` | Default interval for 
synchronizing Kubernetes resources to APISIX |
 | config.certFile | string | `"/etc/webhook/certs/cert.pem"` | the TLS 
certificate file path. |
diff --git a/charts/apisix-ingress-controller/templates/_helpers.tpl 
b/charts/apisix-ingress-controller/templates/_helpers.tpl
index 4426f90..6efcc0e 100644
--- a/charts/apisix-ingress-controller/templates/_helpers.tpl
+++ b/charts/apisix-ingress-controller/templates/_helpers.tpl
@@ -85,3 +85,14 @@ Create the name of the service account to use
 {{- define "apisix-ingress-controller.namespace" -}}
 {{- default .Release.Namespace .Values.namespace -}}
 {{- end -}}
+
+{{/*
+Key to use to fetch admin token from secret
+*/}}
+{{- define "apisix-ingress-controller.credentials.secretAdminKey" -}}
+{{- if .Values.config.apisix.existingSecretAdminKeyKey }}
+{{- .Values.config.apisix.existingSecretAdminKeyKey }}
+{{- else }}
+{{- "adminKey" }}
+{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/apisix-ingress-controller/templates/configmap.yaml 
b/charts/apisix-ingress-controller/templates/configmap.yaml
index 107a7fb..f5a0a95 100644
--- a/charts/apisix-ingress-controller/templates/configmap.yaml
+++ b/charts/apisix-ingress-controller/templates/configmap.yaml
@@ -58,7 +58,9 @@ data:
   {{ else }}
   default_cluster_base_url: http://{{ .Values.config.apisix.serviceName 
}}.{{ .Values.config.apisix.serviceNamespace }}.svc.{{ .Values.clusterDomain 
}}:{{ .Values.config.apisix.servicePort }}/apisix/admin
   {{- end}}
+  {{- if not .Values.config.apisix.existingSecret }}
   default_cluster_admin_key: {{ .Values.config.apisix.adminKey | quote }}
+  {{- end }}
   default_cluster_name: {{ .Values.config.apisix.clusterName 

[apisix-helm-chart] branch master updated: chore: bump apisix-ingress v0.11.6 (#565)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new e7d608d  chore: bump apisix-ingress v0.11.6 (#565)
e7d608d is described below

commit e7d608dbac1a4a2ac5d0fa277b621a77182bc8dd
Author: Jintao Zhang 
AuthorDate: Tue Jun 20 15:51:39 2023 +0800

chore: bump apisix-ingress v0.11.6 (#565)

Signed-off-by: Jintao Zhang 
---
 charts/apisix/Chart.lock|   6 +++---
 charts/apisix/Chart.yaml|   2 +-
 .../apisix/charts/apisix-ingress-controller-0.11.4.tgz  | Bin 16001 -> 0 bytes
 .../apisix/charts/apisix-ingress-controller-0.11.6.tgz  | Bin 0 -> 16291 bytes
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/apisix/Chart.lock b/charts/apisix/Chart.lock
index ac23f62..b72040c 100644
--- a/charts/apisix/Chart.lock
+++ b/charts/apisix/Chart.lock
@@ -7,6 +7,6 @@ dependencies:
   version: 0.8.0
 - name: apisix-ingress-controller
   repository: https://charts.apiseven.com
-  version: 0.11.4
-digest: sha256:4a768defccf772b470d8ac2ee0005c64ccb2fec0a0f31ca098a1581735b40a6c
-generated: "2023-03-30T10:41:53.873367347+08:00"
+  version: 0.11.6
+digest: sha256:9df7b6647db898e47bfcb2ccf80fa2ee8df210d609cb2af31fe614aab3c64934
+generated: "2023-06-20T15:14:46.946284767+08:00"
diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index d9665ed..1c6454a 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -51,7 +51,7 @@ dependencies:
 condition: dashboard.enabled
 alias: dashboard
   - name: apisix-ingress-controller
-version: 0.11.4
+version: 0.11.6
 repository: https://charts.apiseven.com
 condition: ingress-controller.enabled
 alias: ingress-controller
diff --git a/charts/apisix/charts/apisix-ingress-controller-0.11.4.tgz 
b/charts/apisix/charts/apisix-ingress-controller-0.11.4.tgz
deleted file mode 100644
index 4d92ff9..000
Binary files a/charts/apisix/charts/apisix-ingress-controller-0.11.4.tgz and 
/dev/null differ
diff --git a/charts/apisix/charts/apisix-ingress-controller-0.11.6.tgz 
b/charts/apisix/charts/apisix-ingress-controller-0.11.6.tgz
new file mode 100644
index 000..8759e9f
Binary files /dev/null and 
b/charts/apisix/charts/apisix-ingress-controller-0.11.6.tgz differ

[apisix-helm-chart] branch master updated: feat: allow to override admin and viewer token keys in secret for adm… (#551)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new eb74cb0  feat: allow to override admin and viewer token keys in secret 
for adm… (#551)
eb74cb0 is described below

commit eb74cb04c4950c487d25ed6916d6c0606a75b0bc
Author: ikatlinsky 
AuthorDate: Fri Jun 16 09:03:25 2023 +0200

feat: allow to override admin and viewer token keys in secret for adm… 
(#551)

Co-authored-by: Katlinsky, Ilya 
---
 charts/apisix/README.md  |  4 +++-
 charts/apisix/templates/_helpers.tpl | 22 ++
 charts/apisix/templates/_pod.tpl |  8 
 charts/apisix/values.yaml|  4 
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index b47e500..eb9c68c 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -42,9 +42,11 @@ The command removes all the Kubernetes components associated 
with the chart and
 |-|--|-|-|
 | admin.allow.ipList | list | `["127.0.0.1/24"]` | The client IP CIDR allowed 
to access Apache APISIX Admin API service. |
 | admin.cors | bool | `true` | Admin API support CORS response headers |
-| admin.credentials | object | 
`{"admin":"edd1c9f034335f136f87ad84b625c8f1","secretName":"","viewer":"4054f7cf07e344346cd3f287985e76a2"}`
 | Admin API credentials |
+| admin.credentials | object | 
`{"admin":"edd1c9f034335f136f87ad84b625c8f1","secretAdminKey":"","secretName":"","secretViewerKey":"","viewer":"4054f7cf07e344346cd3f287985e76a2"}`
 | Admin API credentials |
 | admin.credentials.admin | string | `"edd1c9f034335f136f87ad84b625c8f1"` | 
Apache APISIX admin API admin role credentials |
+| admin.credentials.secretAdminKey | string | `""` | Name of the admin role 
key in the secret, overrides the default key name "admin" |
 | admin.credentials.secretName | string | `""` | The APISIX Helm chart 
supports storing user credentials in a secret. The secret needs to contain two 
keys, admin and viewer, with their respective values set. |
+| admin.credentials.secretViewerKey | string | `""` | Name of the viewer role 
key in the secret, overrides the default key name "viewer" |
 | admin.credentials.viewer | string | `"4054f7cf07e344346cd3f287985e76a2"` | 
Apache APISIX admin API viewer role credentials |
 | admin.enabled | bool | `true` | Enable Admin API |
 | admin.externalIPs | list | `[]` | IPs for which nodes in the cluster will 
also accept traffic for the servic |
diff --git a/charts/apisix/templates/_helpers.tpl 
b/charts/apisix/templates/_helpers.tpl
index 2198734..41a98b1 100644
--- a/charts/apisix/templates/_helpers.tpl
+++ b/charts/apisix/templates/_helpers.tpl
@@ -111,3 +111,25 @@ Scheme to use while connecting etcd
 {{- "http" }}
 {{- end }}
 {{- end }}
+
+{{/*
+Key to use to fetch admin token from secret
+*/}}
+{{- define "apisix.admin.credentials.secretAdminKey" -}}
+{{- if .Values.admin.credentials.secretAdminKey }}
+{{- .Values.admin.credentials.secretAdminKey }}
+{{- else }}
+{{- "admin" }}
+{{- end }}
+{{- end }}
+
+{{/*
+Key to use to fetch viewer token from secret
+*/}}
+{{- define "apisix.admin.credentials.secretViewerKey" -}}
+{{- if .Values.admin.credentials.secretViewerKey }}
+{{- .Values.admin.credentials.secretViewerKey }}
+{{- else }}
+{{- "viewer" }}
+{{- end }}
+{{- end }}
diff --git a/charts/apisix/templates/_pod.tpl b/charts/apisix/templates/_pod.tpl
index 50f2732..d2860a9 100644
--- a/charts/apisix/templates/_pod.tpl
+++ b/charts/apisix/templates/_pod.tpl
@@ -45,13 +45,13 @@ spec:
 - name: APISIX_ADMIN_KEY
   valueFrom:
 secretKeyRef:
-  name: {{ .Values.admin.credentials.secretName }}
-  key: admin
+  name: {{ .Values.admin.credentials.secretName | quote }}
+  key: {{ include "apisix.admin.credentials.secretAdminKey" . }}
 - name: APISIX_VIEWER_KEY
   valueFrom:
 secretKeyRef:
-  name: {{ .Values.admin.credentials.secretName }}
-  key: viewer
+  name: {{ .Values.admin.credentials.secretName | quote }}
+  key: {{ include "apisix.admin.credentials.secretViewerKey" . }}
   {{- end }}
 
   ports:
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 7f5de42..805d52f 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -311,6 +311,10 @@ admin:
 # -- The APISIX Helm chart supports storing user credentials in a secret

[apisix-helm-chart] branch master updated: fix: config map admin/viewer secret key (#549)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new b4e77c5  fix: config map admin/viewer secret key (#549)
b4e77c5 is described below

commit b4e77c5ecf41fd50f8d27184e98ddda666c6a7fc
Author: apalapal <98978955+apala...@users.noreply.github.com>
AuthorDate: Fri Jun 16 07:40:20 2023 +0100

fix: config map admin/viewer secret key (#549)
---
 charts/apisix/templates/configmap.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/apisix/templates/configmap.yaml 
b/charts/apisix/templates/configmap.yaml
index 26a669b..3f13b21 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -315,7 +315,7 @@ data:
   # admin: can everything for configuration data
   - name: "admin"
 {{- if .Values.admin.credentials.secretName }}
-key: "{{"{{"}}APISIX_ADMIN_KEY{{"}}"}}"
+key: ${{"{{"}}APISIX_ADMIN_KEY{{"}}"}}
 {{- else }}
 key: {{ .Values.admin.credentials.admin }}
 {{- end }}
@@ -323,7 +323,7 @@ data:
   # viewer: only can view configuration data
   - name: "viewer"
 {{- if .Values.admin.credentials.secretName }}
-key: "{{"{{"}}APISIX_VIEWER_KEY{{"}}"}}"
+key: ${{"{{"}}APISIX_VIEWER_KEY{{"}}"}}
 {{- else }}
 key: {{ .Values.admin.credentials.viewer }}
 {{- end }}

[apisix-ingress-controller] branch master updated: Update issuer.yaml (#1856)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 32c07516 Update issuer.yaml (#1856)
32c07516 is described below

commit 32c07516b6bf2fe8ff86ecdf65ee04a7afc0c535
Author: harvies 
AuthorDate: Tue Jun 13 17:04:01 2023 +0800

Update issuer.yaml (#1856)
---
 docs/en/latest/tutorials/cert-manager/issuer.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/latest/tutorials/cert-manager/issuer.yaml 
b/docs/en/latest/tutorials/cert-manager/issuer.yaml
index 1ac30b90..f69d8cdc 100644
--- a/docs/en/latest/tutorials/cert-manager/issuer.yaml
+++ b/docs/en/latest/tutorials/cert-manager/issuer.yaml
@@ -13,7 +13,7 @@
 # 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.
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: ca-issuer

[apisix-helm-chart] branch dev updated: chore: add release trigger for dev branch (#558) (#559)

[zhangjintao]

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

zhangjintao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/dev by this push:
 new 6f95e30  chore: add release trigger for dev branch (#558) (#559)
6f95e30 is described below

commit 6f95e306c750818c12baadc4421c9dca9113772a
Author: Jintao Zhang 
AuthorDate: Fri Jun 9 09:03:29 2023 +0800

chore: add release trigger for dev branch (#558) (#559)

Due to the refactoring of APISIX Helm chart, we plan to maintain it
through the dev branch.

Signed-off-by: Jintao Zhang 
---
 .asf.yaml  | 3 +++
 .github/workflows/release.yaml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
index e252223..103ff83 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -44,3 +44,6 @@ github:
   legacy:
 required_pull_request_reviews:
   required_approving_review_count: 2
+  dev:
+required_pull_request_reviews:
+  required_approving_review_count: 2
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 51f4c17..78fb6d1 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -5,6 +5,7 @@ on:
 branches:
   - master
   - legacy
+  - dev
 
 jobs:
   release:

[apisix-helm-chart] branch dev updated: feat: re-struct apisix chart values (#547)

[zhangjintao]

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

zhangjintao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/dev by this push:
 new f2e21dc  feat: re-struct apisix chart values (#547)
f2e21dc is described below

commit f2e21dc3d405fe2e48e299d0ff6d1c27f7906997
Author: Sarasa Kisaragi 
AuthorDate: Thu Jun 8 16:27:01 2023 +0800

feat: re-struct apisix chart values (#547)
---
 charts/apisix/Chart.yaml   |   2 +-
 charts/apisix/README.md| 258 +++---
 charts/apisix/templates/NOTES.txt  |  14 +-
 charts/apisix/templates/_helpers.tpl   |  42 +-
 charts/apisix/templates/_pod.tpl   | 267 --
 charts/apisix/templates/configmap.yaml | 215 +++--
 charts/apisix/templates/daemonset.yaml |  33 -
 charts/apisix/templates/deployment.yaml| 286 ++-
 charts/apisix/templates/etcd-secret.yaml   |  10 +
 charts/apisix/templates/hpa.yaml   |   2 +-
 charts/apisix/templates/ingress-admin.yaml |  22 +-
 charts/apisix/templates/ingress.yaml   |  22 +-
 charts/apisix/templates/pdb.yaml   |   8 +-
 charts/apisix/templates/service-admin.yaml |  28 +-
 charts/apisix/templates/service-control-plane.yaml |   8 +-
 charts/apisix/templates/service-gateway.yaml   |  50 +-
 charts/apisix/templates/service-metrics.yaml   |   6 +-
 charts/apisix/templates/service-monitor.yaml   |  20 +-
 charts/apisix/values.yaml  | 908 +++--
 19 files changed, 1113 insertions(+), 1088 deletions(-)

diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index d9665ed..e7e2225 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,7 +31,7 @@ type: application
 # This is the chart version. This version number should be incremented each 
time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.0
+version: 2.0.0
 
 # This is the version number of the application being deployed. This version 
number should be
 # incremented each time you make changes to the application. Versions are not 
expected to
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 08628ce..27f8c0c 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -40,34 +40,62 @@ The command removes all the Kubernetes components 
associated with the chart and
 
 | Key | Type | Default | Description |
 |-|--|-|-|
-| admin.allow.ipList | list | `["127.0.0.1/24"]` | The client IP CIDR allowed 
to access Apache APISIX Admin API service. |
-| admin.cors | bool | `true` | Admin API support CORS response headers |
-| admin.credentials | object | 
`{"admin":"edd1c9f034335f136f87ad84b625c8f1","secretName":"","viewer":"4054f7cf07e344346cd3f287985e76a2"}`
 | Admin API credentials |
-| admin.credentials.admin | string | `"edd1c9f034335f136f87ad84b625c8f1"` | 
Apache APISIX admin API admin role credentials |
-| admin.credentials.secretName | string | `""` | The APISIX Helm chart 
supports storing user credentials in a secret. The secret needs to contain two 
keys, admin and viewer, with their respective values set. |
-| admin.credentials.viewer | string | `"4054f7cf07e344346cd3f287985e76a2"` | 
Apache APISIX admin API viewer role credentials |
-| admin.enabled | bool | `true` | Enable Admin API |
-| admin.externalIPs | list | `[]` | IPs for which nodes in the cluster will 
also accept traffic for the servic |
-| admin.ingress | object | 
`{"annotations":{},"enabled":false,"hosts":[{"host":"apisix-admin.local","paths":["/apisix"]}],"tls":[]}`
 | Using ingress access Apache APISIX admin service |
-| admin.ingress.annotations | object | `{}` | Ingress annotations |
-| admin.ip | string | `"0.0.0.0"` | which ip to listen on for Apache APISIX 
admin API. Set to `"[::]"` when on IPv6 single stack |
-| admin.port | int | `9180` | which port to use for Apache APISIX admin API |
-| admin.servicePort | int | `9180` | Service port to use for Apache APISIX 
admin API |
-| admin.type | string | `"ClusterIP"` | admin service type |
-| apisix.affinity | object | `{}` | Set affinity for Apache APISIX deploy |
-| apisix.customLuaSharedDicts | list | `[]` | Add custom 
[lua_shared_dict](https://github.com/openresty/lua-nginx-module#toc88) 
settings, click 
[here](https://github.com/apache/apisix-helm-chart/blob/master/charts/apisix/values.yaml#L27-L30)
 to learn the format of a shared dict |
-| apisix.customizedConfig | object | `{}` | If apis

[apisix-helm-chart] branch master updated: Added an init container to modify system configurations. (#557)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new e1e02fe  Added an init container to modify system configurations. 
(#557)
e1e02fe is described below

commit e1e02feb8546eb94b26127a6046ef357d9aba909
Author: Jintao Zhang 
AuthorDate: Wed Jun 7 09:01:07 2023 +0800

Added an init container to modify system configurations. (#557)
---
 charts/apisix/README.md   |  2 +-
 charts/apisix/values.yaml | 17 -
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 08628ce..b47e500 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -154,7 +154,7 @@ The command removes all the Kubernetes components 
associated with the chart and
 | etcd.user | string | `""` | if etcd.enabled is false, username for external 
etcd. If etcd.enabled is true, use etcd.auth.rbac.rootPassword instead. |
 | extPlugin.cmd | list | `["/path/to/apisix-plugin-runner/runner","run"]` | 
the command and its arguements to run as a subprocess |
 | extPlugin.enabled | bool | `false` | Enable External Plugins. See [external 
plugin](https://apisix.apache.org/docs/apisix/next/external-plugin/) |
-| extraInitContainers | list | `[]` | Additional `initContainers`, See 
[Kubernetes 
initContainers](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)
 for the detail. |
+| extraInitContainers | list | `[{"command":["/bin/sh","-c","sysctl -w 
net.core.somaxconn=65535\nsysctl -w net.ipv4.ip_local_port_range=\"1024 
65535\"\nsysctl -w net.ipv4.tcp_max_syn_backlog=8192\nsysctl -w 
fs.file-max=1048576\nsysctl -w fs.inotify.max_user_instances=16384\nsysctl -w 
fs.inotify.max_user_watches=524288\nsysctl -w 
fs.inotify.max_queued_events=16384\n"],"image":"busybox:1.28","name":"init-sysctl","securityContext":{"privileged":true}}]`
 | Additional `initContainers`, See [K [...]
 | extraVolumeMounts | list | `[]` | Additional `volume`, See [Kubernetes 
Volumes](https://kubernetes.io/docs/concepts/storage/volumes/) for the detail. |
 | extraVolumes | list | `[]` | Additional `volume`, See [Kubernetes 
Volumes](https://kubernetes.io/docs/concepts/storage/volumes/) for the detail. |
 | fullnameOverride | string | `""` |  |
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index bec9c4b..7f5de42 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -396,7 +396,22 @@ extraVolumeMounts: []
 #   readOnly: true
 
 # -- Additional `initContainers`, See [Kubernetes 
initContainers](https://kubernetes.io/docs/concepts/workloads/pods/init-containers/)
 for the detail.
-extraInitContainers: []
+extraInitContainers:
+  - name: init-sysctl
+image: busybox:1.28
+command:
+  - /bin/sh
+  - -c
+  - |
+sysctl -w net.core.somaxconn=65535
+sysctl -w net.ipv4.ip_local_port_range="1024 65535"
+sysctl -w net.ipv4.tcp_max_syn_backlog=8192
+sysctl -w fs.file-max=1048576
+sysctl -w fs.inotify.max_user_instances=16384
+sysctl -w fs.inotify.max_user_watches=524288
+sysctl -w fs.inotify.max_queued_events=16384
+securityContext:
+  privileged: true
 # - name: init-myservice
 #   image: busybox:1.28
 #   command: ['sh', '-c', "until nslookup myservice.$(cat 
/var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local; do 
echo waiting for myservice; sleep 2; done"]

[apisix-helm-chart] branch dev created (now 04193e1)

[zhangjintao]

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

zhangjintao pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


  at 04193e1  chore: The metrics interface should not be provided by 
apisix-gateway service (#544)

No new revisions were added by this update.

[apisix-ingress-controller] branch master updated (373839a9 -> e5db08a3)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 373839a9 chore(deps): bump github.com/stretchr/testify in /test/e2e 
(#1842)
 add e5db08a3 chore(deps): bump github.com/onsi/ginkgo/v2 in /test/e2e 
(#1837)

No new revisions were added by this update.

Summary of changes:
 test/e2e/go.mod | 2 +-
 test/e2e/go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

[apisix-docker] branch master updated: chore: clean up useless files (#465)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git


The following commit(s) were added to refs/heads/master by this push:
 new 729dd18  chore: clean up useless files (#465)
729dd18 is described below

commit 729dd182b0e0c194633c0b6ece61b4dd212f28b8
Author: Jintao Zhang 
AuthorDate: Sun May 28 00:42:27 2023 +0800

chore: clean up useless files (#465)
---
 centos/hooks/build | 22 --
 debian/hooks/build | 22 --
 2 files changed, 44 deletions(-)

diff --git a/centos/hooks/build b/centos/hooks/build
deleted file mode 100644
index e229008..000
--- a/centos/hooks/build
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# hooks/build
-# https://docs.docker.com/docker-cloud/builds/advanced/
-
-#
-# 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.
-#
-
-docker build --build-arg APISIX_VERSION=$APISIX_VERSION -t $IMAGE_NAME .
diff --git a/debian/hooks/build b/debian/hooks/build
deleted file mode 100644
index e229008..000
--- a/debian/hooks/build
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# hooks/build
-# https://docs.docker.com/docker-cloud/builds/advanced/
-
-#
-# 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.
-#
-
-docker build --build-arg APISIX_VERSION=$APISIX_VERSION -t $IMAGE_NAME .

[apisix-docker] branch release/apisix-3.3.0 updated: feat: add build for platform=redhat with ubi based image (#462) (#467)

[zhangjintao]

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

zhangjintao pushed a commit to branch release/apisix-3.3.0
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git


The following commit(s) were added to refs/heads/release/apisix-3.3.0 by this 
push:
 new 0e0ddec  feat: add build for platform=redhat with ubi based image 
(#462) (#467)
0e0ddec is described below

commit 0e0ddec788c55fcc67492f7cfcf351064805dc87
Author: Ashish Tiwari 
AuthorDate: Fri May 26 13:32:26 2023 +0530

feat: add build for platform=redhat with ubi based image (#462) (#467)
---
 .github/workflows/apisix-docker-example-test.yaml |  1 +
 .github/workflows/apisix_push_docker_hub.yaml |  1 +
 Makefile  | 15 
 debian-dev/Dockerfile |  1 +
 redhat/Dockerfile | 46 +++
 redhat/docker-entrypoint.sh   | 46 +++
 redhat/yum.repos.d/apache-apisix.repo |  9 +
 redhat/yum.repos.d/openresty.repo |  9 +
 8 files changed, 128 insertions(+)

diff --git a/.github/workflows/apisix-docker-example-test.yaml 
b/.github/workflows/apisix-docker-example-test.yaml
index 96b0752..db6bbc4 100644
--- a/.github/workflows/apisix-docker-example-test.yaml
+++ b/.github/workflows/apisix-docker-example-test.yaml
@@ -43,6 +43,7 @@ jobs:
 platform:
   - centos
   - debian
+  - redhat
 
 steps:
   - uses: actions/checkout@v2
diff --git a/.github/workflows/apisix_push_docker_hub.yaml 
b/.github/workflows/apisix_push_docker_hub.yaml
index c6ff77d..2ce3b48 100644
--- a/.github/workflows/apisix_push_docker_hub.yaml
+++ b/.github/workflows/apisix_push_docker_hub.yaml
@@ -12,6 +12,7 @@ jobs:
 platform:
   - centos
   - debian
+  - redhat
 env:
   APISIX_DOCKER_TAG: 3.3.0-${{ matrix.platform }}
 
diff --git a/Makefile b/Makefile
index b208308..a94dcfa 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,12 @@ build-on-centos:
$(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-centos -f 
./centos/Dockerfile centos
@$(call func_echo_success_status, "$@ -> [ Done ]")
 
+### build-on-redhat : Build apache/apisix:xx-redhat image
+.PHONY: build-on-redhat
+build-on-redhat:
+   @$(call func_echo_status, "$@ -> [ Start ]")
+   $(ENV_DOCKER) build -t $(ENV_APISIX_IMAGE_TAG_NAME)-redhat -f 
./redhat/Dockerfile redhat
+   @$(call func_echo_success_status, "$@ -> [ Done ]")
 
 ### build-on-debian-dev : Build apache/apisix:xx-debian-dev image
 .PHONY: build-on-debian-dev
@@ -118,6 +124,15 @@ push-multiarch-on-centos:
-f ./centos/Dockerfile centos
@$(call func_echo_success_status, "$@ -> [ Done ]")
 
+### push-multiarch-on-redhat : Push apache/apisix:xx-redhat image
+.PHONY: push-multiarch-on-redhat
+push-multiarch-on-redhat:
+   @$(call func_echo_status, "$@ -> [ Start ]")
+   $(ENV_DOCKER) buildx build --network=host --push \
+   -t $(ENV_APISIX_IMAGE_TAG_NAME)-redhat \
+   --platform linux/amd64 \
+   -f ./redhat/Dockerfile redhat
+   @$(call func_echo_success_status, "$@ -> [ Done ]")
 
 ### push-multiarch-on-latest : Push apache/apisix:latest image
 .PHONY: push-multiarch-on-latest
diff --git a/debian-dev/Dockerfile b/debian-dev/Dockerfile
index 59df830..03d89c9 100644
--- a/debian-dev/Dockerfile
+++ b/debian-dev/Dockerfile
@@ -34,6 +34,7 @@ RUN set -x \
 sudo \
 unzip \
 wget \
+rustc \
 && curl 
https://raw.githubusercontent.com/apache/apisix/master/utils/linux-install-luarocks.sh
 -sL | bash - \
 && luarocks install 
https://github.com/apache/apisix/raw/master/rockspec/apisix-master-0.rockspec 
--tree=/usr/local/apisix/deps PCRE_DIR=/usr/local/openresty/pcre \
 && cp -v 
/usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/master-0/bin/apisix 
/usr/bin/ \
diff --git a/redhat/Dockerfile b/redhat/Dockerfile
new file mode 100644
index 000..645909a
--- /dev/null
+++ b/redhat/Dockerfile
@@ -0,0 +1,46 @@
+#
+# 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 th

[apisix-ingress-controller] branch master updated: docs: Update powered-by.md (#1841)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new ff43aeee docs: Update powered-by.md (#1841)
ff43aeee is described below

commit ff43aeeea1d4a01c376c5ab64e49a819ecb97a1a
Author: Carson Yang 
AuthorDate: Sat May 20 16:34:24 2023 +0800

docs: Update powered-by.md (#1841)
---
 powered-by.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/powered-by.md b/powered-by.md
index a7569974..08363f1b 100644
--- a/powered-by.md
+++ b/powered-by.md
@@ -38,3 +38,4 @@ Users are encouraged to add themselves to this page, 
[issue](https://github.com/
 1. https://www.jiakaobaodian.com/"; 
rel="nofollow">Jiakaobaodian(驾考宝典)
 1. https://www.horizon.ai/"; rel="nofollow">Horizon Robotics(地平线)
 1. https://www.xiaopeng.com/"; rel="nofollow">小鹏汽车
+1. https://laf.run/"; rel="nofollow">Laf

[apisix-ingress-controller] branch master updated: chore(deps): Update dependencies (#1833)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new e91dbf53 chore(deps):  Update dependencies (#1833)
e91dbf53 is described below

commit e91dbf5303c2ec8a775eabc8a7d9955e053b20f1
Author: Jintao Zhang 
AuthorDate: Thu May 18 16:06:08 2023 +0800

chore(deps):  Update dependencies (#1833)

* chore(deps): bump k8s.io/client-go from 0.26.3 to 0.27.1

Bumps [k8s.io/client-go](https://github.com/kubernetes/client-go) from 
0.26.3 to 0.27.1.
- [Release notes](https://github.com/kubernetes/client-go/releases)
- 
[Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- 
[Commits](https://github.com/kubernetes/client-go/compare/v0.26.3...v0.27.1)

---
updated-dependencies:
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 

* chore(deps): bump k8s.io/client-go from 0.26.3 to 0.27.1 in /test/e2e

Signed-off-by: Jintao Zhang 

* chore(deps): bump k8s.io/code-generator from 0.26.3 to 0.27.1

Signed-off-by: Jintao Zhang 

* chore(deps): bump github.com/prometheus/client_golang from 1.14.0 to 
1.15.1

Signed-off-by: Jintao Zhang 

* chore(deps): bump github.com/prometheus/client_model from 0.3.0 to 0.4.0

Signed-off-by: Jintao Zhang 

* fix: k8s v1.27 wait.ExponentialBackoffWithContext

Signed-off-by: Jintao Zhang 

-

Signed-off-by: dependabot[bot] 
Signed-off-by: Jintao Zhang 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 28 -
 go.sum | 67 +++---
 pkg/apisix/cluster.go  | 14 -
 .../config/v2/fake/fake_apisixclusterconfig.go |  5 +-
 .../typed/config/v2/fake/fake_apisixconsumer.go|  5 +-
 .../typed/config/v2/fake/fake_apisixglobalrule.go  |  5 +-
 .../config/v2/fake/fake_apisixpluginconfig.go  |  5 +-
 .../typed/config/v2/fake/fake_apisixroute.go   |  5 +-
 .../typed/config/v2/fake/fake_apisixtls.go |  5 +-
 .../typed/config/v2/fake/fake_apisixupstream.go|  5 +-
 test/e2e/go.mod| 26 -
 test/e2e/go.sum| 59 ++-
 12 files changed, 117 insertions(+), 112 deletions(-)

diff --git a/go.mod b/go.mod
index 1beb41af..b314d408 100644
--- a/go.mod
+++ b/go.mod
@@ -9,22 +9,22 @@ require (
github.com/imdario/mergo v0.3.15
github.com/incubator4/go-resty-expr v0.1.1
github.com/pkg/errors v0.9.1
-   github.com/prometheus/client_golang v1.14.0
-   github.com/prometheus/client_model v0.3.0
+   github.com/prometheus/client_golang v1.15.1
+   github.com/prometheus/client_model v0.4.0
github.com/slok/kubewebhook/v2 v2.5.0
github.com/spf13/cobra v1.7.0
github.com/stretchr/testify v1.8.2
github.com/xeipuuv/gojsonschema v1.2.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.24.0
-   golang.org/x/net v0.9.0
+   golang.org/x/net v0.10.0
gopkg.in/go-playground/pool.v3 v3.1.1
gopkg.in/natefinch/lumberjack.v2 v2.2.1
gopkg.in/yaml.v2 v2.4.0
-   k8s.io/api v0.26.3
-   k8s.io/apimachinery v0.26.3
-   k8s.io/client-go v0.26.3
-   k8s.io/code-generator v0.26.3
+   k8s.io/api v0.27.1
+   k8s.io/apimachinery v0.27.1
+   k8s.io/client-go v0.27.1
+   k8s.io/code-generator v0.27.1
sigs.k8s.io/controller-runtime v0.14.6
sigs.k8s.io/gateway-api v0.6.2
sigs.k8s.io/yaml v1.3.0
@@ -81,22 +81,22 @@ require (
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
golang.org/x/crypto v0.5.0 // indirect
-   golang.org/x/mod v0.8.0 // indirect
+   golang.org/x/mod v0.10.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
-   golang.org/x/sys v0.7.0 // indirect
-   golang.org/x/term v0.7.0 // indirect
+   golang.org/x/sys v0.8.0 // indirect
+   golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
-   golang.org/x/tools v0.6.0 // indirect
+   golang.org/x/tools v0.9.1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v

[apisix-helm-chart] branch master updated: chore: The metrics interface should not be provided by apisix-gateway service (#544)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 04193e1  chore: The metrics interface should not be provided by 
apisix-gateway service (#544)
04193e1 is described below

commit 04193e13a6bd3c0c267b3daef0e8139fc9506869
Author: Xin Rong 
AuthorDate: Wed May 17 18:52:34 2023 +0800

chore: The metrics interface should not be provided by apisix-gateway 
service (#544)
---
 charts/apisix/templates/service-gateway.yaml |  6 -
 charts/apisix/templates/service-metrics.yaml | 34 
 charts/apisix/templates/service-monitor.yaml |  2 +-
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/charts/apisix/templates/service-gateway.yaml 
b/charts/apisix/templates/service-gateway.yaml
index 0c3744a..1d4aafa 100644
--- a/charts/apisix/templates/service-gateway.yaml
+++ b/charts/apisix/templates/service-gateway.yaml
@@ -77,12 +77,6 @@ spec:
 port: {{ .port }}
 targetPort: {{ .port }}
   {{- end }}
-  {{- if .Values.serviceMonitor.enabled }}
-  - name: prometheus
-port: {{ .Values.serviceMonitor.containerPort }}
-targetPort: {{ .Values.serviceMonitor.containerPort }}
-protocol: TCP
-  {{- end }}
   {{- if and .Values.gateway.stream.enabled (or (gt (len 
.Values.gateway.stream.tcp) 0) (gt (len .Values.gateway.stream.udp) 0)) }}
   {{- with .Values.gateway.stream }}
   {{- if (gt (len .tcp) 0) }}
diff --git a/charts/apisix/templates/service-metrics.yaml 
b/charts/apisix/templates/service-metrics.yaml
new file mode 100644
index 000..aa05713
--- /dev/null
+++ b/charts/apisix/templates/service-metrics.yaml
@@ -0,0 +1,34 @@
+#
+# 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.
+{{- if .Values.serviceMonitor.enabled}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "apisix.fullname" . }}-prometheus-metrics
+  namespace: {{ .Release.Namespace }}
+  labels:
+{{- include "apisix.labels" . | nindent 4 }}
+app.kubernetes.io/service: apisix-prometheus-metrics
+spec:
+  type: ClusterIP
+  ports:
+  - name: prometheus
+port: {{ .Values.serviceMonitor.containerPort }}
+targetPort: {{ .Values.serviceMonitor.containerPort }}
+protocol: TCP
+  selector:
+{{- include "apisix.selectorLabels" . | nindent 4 }}
+{{- end }}
diff --git a/charts/apisix/templates/service-monitor.yaml 
b/charts/apisix/templates/service-monitor.yaml
index a556ef0..b35b0d4 100644
--- a/charts/apisix/templates/service-monitor.yaml
+++ b/charts/apisix/templates/service-monitor.yaml
@@ -35,7 +35,7 @@ spec:
   selector:
 matchLabels:
   {{- include "apisix.labels" . | nindent 6 }}
-  app.kubernetes.io/service: apisix-gateway
+  app.kubernetes.io/service: apisix-prometheus-metrics
   endpoints:
   - scheme: http
 targetPort: prometheus

[apisix-ingress-controller] branch master updated: chore: rename all v2beta3 to v2 in e2e templates (#1832)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 113defc7 chore: rename all v2beta3 to v2 in e2e templates (#1832)
113defc7 is described below

commit 113defc7329febff963f06bb675f51d2c8379784
Author: Jintao Zhang 
AuthorDate: Tue May 16 15:33:04 2023 +0800

chore: rename all v2beta3 to v2 in e2e templates (#1832)

Signed-off-by: Jintao Zhang 
---
 test/e2e/scaffold/upstream_tls.go  |  2 +-
 test/e2e/suite-annotations/plugin_conifg.go|  2 +-
 test/e2e/suite-chore/config.go |  2 +-
 test/e2e/suite-chore/consistency.go|  2 +-
 test/e2e/suite-chore/endpoints.go  |  6 ++--
 test/e2e/suite-cluster/apisix_cluster_config.go|  2 +-
 test/e2e/suite-features/healthcheck.go |  8 ++---
 test/e2e/suite-features/remote_addrs_match.go  |  4 +--
 test/e2e/suite-features/retries.go | 12 
 test/e2e/suite-features/route_match_exprs.go   | 22 ++---
 test/e2e/suite-features/scheme.go  |  8 ++---
 test/e2e/suite-features/subset.go  | 10 +++---
 test/e2e/suite-features/sync-comparison.go |  8 ++---
 test/e2e/suite-features/sync-delay.go  |  8 ++---
 test/e2e/suite-features/traffic_split.go   |  4 +--
 test/e2e/suite-features/websocket.go   |  2 +-
 .../suite-ingress-features/compare.go  |  2 +-
 .../suite-ingress-features/resourcesync.go |  8 ++---
 .../suite-ingress/suite-ingress-features/sanity.go |  6 ++--
 .../suite-ingress/suite-ingress-features/secret.go |  6 ++--
 .../suite-ingress/suite-ingress-features/status.go |  2 +-
 .../suite-ingress-resource/resourcepushing.go  | 28 -
 .../suite-ingress/suite-ingress-resource/ssl.go|  2 +-
 .../suite-ingress/suite-ingress-resource/stream.go |  4 +--
 .../suite-ingress-resource/upstream_tls.go |  4 +--
 .../suite-plugins-authentication/basic.go  |  4 +--
 .../suite-plugins-authentication/hmac.go   |  8 ++---
 .../suite-plugins-authentication/jwt.go| 12 
 .../suite-plugins-authentication/key.go|  4 +--
 .../suite-plugins-authentication/wolfrbac.go   | 12 
 .../suite-plugins/suite-plugins-general/echo.go| 10 +++---
 .../suite-plugins-general/redirect.go  | 10 +++---
 .../suite-plugins-other/plugin_config.go   | 36 +++---
 .../suite-plugins-other/serverless.go  |  4 +--
 .../suite-plugins-security/consumer-restriction.go |  4 +--
 .../suite-plugins/suite-plugins-security/cors.go   | 12 
 .../suite-plugins/suite-plugins-security/csrf.go   |  4 +--
 .../suite-plugins-security/ip-restriction.go   | 10 +++---
 .../suite-plugins-security/referer-restriction.go  | 10 +++---
 .../suite-plugins-security/uri_blocker.go  |  8 ++---
 .../suite-plugins-traffic/api_breaker.go   |  4 +--
 .../suite-plugins-traffic/client-control.go|  4 +--
 .../suite-plugins-traffic/limit_count.go   |  8 ++---
 .../suite-plugins-traffic/request-validation.go|  4 +--
 .../suite-plugins-traffic/request_id.go|  8 ++---
 .../fault_injection.go | 10 +++---
 .../suite-plugins-transformation/proxy_rewrite.go  | 10 +++---
 .../response_rewrite.go| 10 +++---
 48 files changed, 185 insertions(+), 185 deletions(-)

diff --git a/test/e2e/scaffold/upstream_tls.go 
b/test/e2e/scaffold/upstream_tls.go
index f0edfbef..c6b479d0 100644
--- a/test/e2e/scaffold/upstream_tls.go
+++ b/test/e2e/scaffold/upstream_tls.go
@@ -21,7 +21,7 @@ import (
 
 var (
_apisixUpstreamsWithMTLSTemplate = `
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixUpstream
 metadata:
   name: %s
diff --git a/test/e2e/suite-annotations/plugin_conifg.go 
b/test/e2e/suite-annotations/plugin_conifg.go
index 3ea63d1f..3f8e740b 100644
--- a/test/e2e/suite-annotations/plugin_conifg.go
+++ b/test/e2e/suite-annotations/plugin_conifg.go
@@ -28,7 +28,7 @@ import (
 
 func _createAPC(s *scaffold.Scaffold) {
apc := fmt.Sprintf(`
-apiVersion: apisix.apache.org/v2beta3
+apiVersion: apisix.apache.org/v2
 kind: ApisixPluginConfig
 metadata:
   name: echo-and-cors-apc
diff --git a/test/e2e/suite-chore/config.go b/test/e2e/suite-chore/config.go
index 83bff708..6d7f026b 100644
--- a/test/e2e/suite-chore/config.go
+++ b/test/e2e/suite-chore/config.go
@@ -46,7 +46,7 @@ data:
 kubernetes:
   namespace_selector:
   - %s
-  apisix_route_version: "apisix.apache.org/v2beta3"
+  apisix_route_version: "apisix.apache.org/v2"
   watch_endpoint_slices: true
 `
 )
diff --git a/test/e2e/suite-

[apisix-ingress-controller] branch master updated: chore: StringToByte without mem-allocation supports v1.20 (#1750)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 7b81a8b0 chore: StringToByte without mem-allocation supports v1.20 
(#1750)
7b81a8b0 is described below

commit 7b81a8b0dc785217adab3377db428564f6e64726
Author: tyltr 
AuthorDate: Tue May 16 11:48:29 2023 +0800

chore: StringToByte without mem-allocation supports v1.20 (#1750)
---
 .gitignore |  1 +
 pkg/id/idgen.go| 11 +++---
 pkg/{id/idgen.go => utils/s2b_new.go}  | 27 ++-
 pkg/{id/idgen.go => utils/s2b_old.go}  | 32 +--
 pkg/{id/idgen.go => utils/s2b_test.go} | 40 --
 5 files changed, 51 insertions(+), 60 deletions(-)

diff --git a/.gitignore b/.gitignore
index be473d69..9d9280ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ release
 
 .vscode
 .idea
+vendor/
 .DS_Store
 coverage.txt
 test/e2e/coverage.txt
diff --git a/pkg/id/idgen.go b/pkg/id/idgen.go
index 19990647..c08efe25 100644
--- a/pkg/id/idgen.go
+++ b/pkg/id/idgen.go
@@ -18,8 +18,8 @@ package id
 import (
"fmt"
"hash/crc32"
-   "reflect"
-   "unsafe"
+
+   "github.com/apache/apisix-ingress-controller/pkg/utils"
 )
 
 // GenID generates an ID according to the raw material.
@@ -27,12 +27,7 @@ func GenID(raw string) string {
if raw == "" {
return ""
}
-   sh := &reflect.SliceHeader{
-   Data: (*reflect.StringHeader)(unsafe.Pointer(&raw)).Data,
-   Len:  len(raw),
-   Cap:  len(raw),
-   }
-   p := *(*[]byte)(unsafe.Pointer(sh))
+   p := utils.String2Byte(raw)
 
res := crc32.ChecksumIEEE(p)
return fmt.Sprintf("%x", res)
diff --git a/pkg/id/idgen.go b/pkg/utils/s2b_new.go
similarity index 66%
copy from pkg/id/idgen.go
copy to pkg/utils/s2b_new.go
index 19990647..209069a8 100644
--- a/pkg/id/idgen.go
+++ b/pkg/utils/s2b_new.go
@@ -13,27 +13,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package id
+//go:build go1.20
+// +build go1.20
 
-import (
-   "fmt"
-   "hash/crc32"
-   "reflect"
-   "unsafe"
-)
+package utils
 
-// GenID generates an ID according to the raw material.
-func GenID(raw string) string {
-   if raw == "" {
-   return ""
-   }
-   sh := &reflect.SliceHeader{
-   Data: (*reflect.StringHeader)(unsafe.Pointer(&raw)).Data,
-   Len:  len(raw),
-   Cap:  len(raw),
-   }
-   p := *(*[]byte)(unsafe.Pointer(sh))
+import "unsafe"
 
-   res := crc32.ChecksumIEEE(p)
-   return fmt.Sprintf("%x", res)
+// s2b converts string to a byte slice without memory allocation.
+func String2Byte(s string) []byte {
+   return unsafe.Slice(unsafe.StringData(s), len(s))
 }
diff --git a/pkg/id/idgen.go b/pkg/utils/s2b_old.go
similarity index 61%
copy from pkg/id/idgen.go
copy to pkg/utils/s2b_old.go
index 19990647..ba045b89 100644
--- a/pkg/id/idgen.go
+++ b/pkg/utils/s2b_old.go
@@ -13,27 +13,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package id
+//go:build !go1.20
+// +build !go1.20
+
+package utils
 
 import (
-   "fmt"
-   "hash/crc32"
"reflect"
"unsafe"
 )
 
-// GenID generates an ID according to the raw material.
-func GenID(raw string) string {
-   if raw == "" {
-   return ""
-   }
-   sh := &reflect.SliceHeader{
-   Data: (*reflect.StringHeader)(unsafe.Pointer(&raw)).Data,
-   Len:  len(raw),
-   Cap:  len(raw),
-   }
-   p := *(*[]byte)(unsafe.Pointer(sh))
+// String2Byte converts a string to a byte slice without memory allocation.
+//
+// Note since Go 1.20, the reflect.StringHeader and reflect.SliceHeader types
+// will be depreciated and not recommended to be used.
+func String2Byte(raw string) (b []byte) {
+
+   strHeader := (*reflect.StringHeader)(unsafe.Pointer(&raw))
+   bHeader := (*reflect.SliceHeader)(unsafe.Pointer(&b))
 
-   res := crc32.ChecksumIEEE(p)
-   return fmt.Sprintf("%x", res)
+   bHeader.Data = strHeader.Data
+   bHeader.Cap = strHeader.Len
+   bHeader.Len = strHeader.Len
+   return b
 }
diff --git a/pkg/id/idgen.go b/pkg/utils/s2b_test.go
similarity index 64%
copy from pkg/id/idgen.go
copy to pkg/utils/s2b_test.go
index 19990647..b177c7f6 100644
--- a/pkg/id/id

[apisix-ingress-controller] branch master updated (c6a13b3b -> 050d2014)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from c6a13b3b chore(deps): bump github.com/onsi/ginkgo/v2 in /test/e2e 
(#1827)
 add 050d2014 chore: remove v2beta3 (#1817)

No new revisions were added by this update.

Summary of changes:
 conf/config-default.yaml   |2 +-
 pkg/api/validation/apisix_route_test.go|6 -
 pkg/api/validation/utils_test.go   |4 +-
 pkg/config/config.go   |4 +-
 pkg/kube/apisix/apis/config/v1/types.go|8 +-
 pkg/kube/apisix/apis/config/v2beta3/doc.go |   18 -
 pkg/kube/apisix/apis/config/v2beta3/types.go   |  708 -
 .../apis/config/v2beta3/zz_generated.deepcopy.go   | 1496 
 .../apis/config/v2beta3/zz_generated.register.go   |   79 --
 .../apisix/client/clientset/versioned/clientset.go |   15 +-
 .../versioned/fake/clientset_generated.go  |7 -
 .../client/clientset/versioned/fake/register.go|2 -
 .../client/clientset/versioned/scheme/register.go  |2 -
 .../typed/config/v2beta3/apisixclusterconfig.go|  183 ---
 .../typed/config/v2beta3/apisixconsumer.go |  194 ---
 .../typed/config/v2beta3/apisixpluginconfig.go |  194 ---
 .../versioned/typed/config/v2beta3/apisixroute.go  |  194 ---
 .../versioned/typed/config/v2beta3/apisixtls.go|  194 ---
 .../typed/config/v2beta3/apisixupstream.go |  194 ---
 .../typed/config/v2beta3/config_client.go  |  131 --
 .../versioned/typed/config/v2beta3/doc.go  |   19 -
 .../versioned/typed/config/v2beta3/fake/doc.go |   19 -
 .../v2beta3/fake/fake_apisixclusterconfig.go   |  132 --
 .../config/v2beta3/fake/fake_apisixconsumer.go |  141 --
 .../config/v2beta3/fake/fake_apisixpluginconfig.go |  141 --
 .../typed/config/v2beta3/fake/fake_apisixroute.go  |  141 --
 .../typed/config/v2beta3/fake/fake_apisixtls.go|  141 --
 .../config/v2beta3/fake/fake_apisixupstream.go |  141 --
 .../config/v2beta3/fake/fake_config_client.go  |   59 -
 .../typed/config/v2beta3/generated_expansion.go|   30 -
 .../informers/externalversions/config/interface.go |8 -
 .../config/v2beta3/apisixclusterconfig.go  |   88 --
 .../config/v2beta3/apisixconsumer.go   |   89 --
 .../config/v2beta3/apisixpluginconfig.go   |   89 --
 .../externalversions/config/v2beta3/apisixroute.go |   89 --
 .../externalversions/config/v2beta3/apisixtls.go   |   89 --
 .../config/v2beta3/apisixupstream.go   |   89 --
 .../externalversions/config/v2beta3/interface.go   |   79 --
 .../client/informers/externalversions/generic.go   |   15 -
 .../listers/config/v2beta3/apisixclusterconfig.go  |   67 -
 .../listers/config/v2beta3/apisixconsumer.go   |   98 --
 .../listers/config/v2beta3/apisixpluginconfig.go   |   98 --
 .../client/listers/config/v2beta3/apisixroute.go   |   98 --
 .../client/listers/config/v2beta3/apisixtls.go |   98 --
 .../listers/config/v2beta3/apisixupstream.go   |   98 --
 .../listers/config/v2beta3/expansion_generated.go  |   62 -
 pkg/kube/apisix_cluster_config.go  |   47 +-
 pkg/kube/apisix_consumer.go|   52 +-
 pkg/kube/apisix_plugin_config.go   |   50 +-
 pkg/kube/apisix_route.go   |   54 +-
 pkg/kube/apisix_tls.go |   48 +-
 pkg/kube/apisix_upstream.go|   50 +-
 pkg/providers/apisix/apisix_cluster_config.go  |   93 --
 pkg/providers/apisix/apisix_consumer.go|   50 -
 pkg/providers/apisix/apisix_plugin_config.go   |   41 -
 pkg/providers/apisix/apisix_route.go   |  100 --
 pkg/providers/apisix/apisix_tls.go |   70 -
 pkg/providers/apisix/apisix_upstream.go|  102 --
 pkg/providers/apisix/provider_init.go  |   68 -
 .../apisix/translation/apisix_cluster_config.go|   21 -
 .../translation/apisix_cluster_config_test.go  |   29 -
 .../apisix/translation/apisix_consumer.go  |   44 -
 .../apisix/translation/apisix_consumer_test.go |  129 --
 pkg/providers/apisix/translation/apisix_plugin.go  |  221 ---
 .../apisix/translation/apisix_plugin_test.go   |  130 +-
 .../apisix/translation/apisix_pluginconfig.go  |   41 -
 .../apisix/translation/apisix_pluginconfig_test.go |   22 +-
 pkg/providers/apisix/translation/apisix_route.go   |  350 -
 .../apisix/translation/apisix_route_test.go|  155 +-
 pkg/providers/apisix/translation/apisix_ssl.go |   45 -
 pkg/providers/apisix/translation/translator.go |   23 +-
 pkg/providers/controller.go|   34 +-
 .../gateway/translation/gateway_httproute_test.go  |1 -
 .../gateway/translation/gateway_tcproute_test.go   |1 -
 pkg

[apisix-helm-chart] branch master updated: chore: upgrade APISIX to 3.3.0 (#543)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new ef59001  chore: upgrade APISIX to 3.3.0 (#543)
ef59001 is described below

commit ef59001161a91714a941ac49156f15d29e26dcd7
Author: Gallardot 
AuthorDate: Thu May 11 14:34:12 2023 +0800

chore: upgrade APISIX to 3.3.0 (#543)
---
 .gitignore| 3 ++-
 charts/apisix/Chart.yaml  | 4 ++--
 charts/apisix/README.md   | 4 ++--
 charts/apisix/values.yaml | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 084301c..16eed78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .idea/
+.vscode/
 .DS_Store
 test_**.yaml
-.history
\ No newline at end of file
+.history
diff --git a/charts/apisix/Chart.yaml b/charts/apisix/Chart.yaml
index 4aa0e9d..d9665ed 100644
--- a/charts/apisix/Chart.yaml
+++ b/charts/apisix/Chart.yaml
@@ -31,12 +31,12 @@ type: application
 # This is the chart version. This version number should be incremented each 
time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.1
+version: 1.4.0
 
 # This is the version number of the application being deployed. This version 
number should be
 # incremented each time you make changes to the application. Versions are not 
expected to
 # follow Semantic Versioning. They should reflect the version the application 
is using.
-appVersion: 3.2.0
+appVersion: 3.3.0
 sources:
   - https://github.com/apache/apisix-helm-chart
 
diff --git a/charts/apisix/README.md b/charts/apisix/README.md
index 6661326..08628ce 100644
--- a/charts/apisix/README.md
+++ b/charts/apisix/README.md
@@ -63,10 +63,10 @@ The command removes all the Kubernetes components 
associated with the chart and
 | apisix.enabled | bool | `true` | Enable or disable Apache APISIX itself Set 
it to false and ingress-controller.enabled=true will deploy only 
ingress-controller |
 | apisix.extraEnvVars | list | `[]` | extraEnvVars An array to add extra env 
vars e.g: extraEnvVars:   - name: FOO value: "bar"   - name: FOO2 
valueFrom:   secretKeyRef: name: SECRET_NAME key: KEY |
 | apisix.hostNetwork | bool | `false` |  |
-| apisix.httpRouter | string | `"radixtree_uri"` | Defines how apisix handles 
routing: - radixtree_uri: match route by uri(base on radixtree) - 
radixtree_host_uri: match route by host + uri(base on radixtree) - 
radixtree_uri_with_parameter: match route by uri with parameters |
+| apisix.httpRouter | string | `"radixtree_host_uri"` | Defines how apisix 
handles routing: - radixtree_uri: match route by uri(base on radixtree) - 
radixtree_host_uri: match route by host + uri(base on radixtree) - 
radixtree_uri_with_parameter: match route by uri with parameters |
 | apisix.image.pullPolicy | string | `"IfNotPresent"` | Apache APISIX image 
pull policy |
 | apisix.image.repository | string | `"apache/apisix"` | Apache APISIX image 
repository |
-| apisix.image.tag | string | `"3.2.0-debian"` | Apache APISIX image tag 
Overrides the image tag whose default is the chart appVersion. |
+| apisix.image.tag | string | `"3.3.0-debian"` | Apache APISIX image tag 
Overrides the image tag whose default is the chart appVersion. |
 | apisix.kind | string | `"Deployment"` | Use a `DaemonSet` or `Deployment` |
 | apisix.luaModuleHook | object | 
`{"configMapRef":{"mounts":[{"key":"","path":""}],"name":""},"enabled":false,"hookPoint":"","luaPath":""}`
 | Whether to add a custom lua module |
 | apisix.luaModuleHook.configMapRef | object | 
`{"mounts":[{"key":"","path":""}],"name":""}` | configmap that stores the codes 
|
diff --git a/charts/apisix/values.yaml b/charts/apisix/values.yaml
index 8d8e8bf..bec9c4b 100644
--- a/charts/apisix/values.yaml
+++ b/charts/apisix/values.yaml
@@ -66,7 +66,7 @@ apisix:
   # - radixtree_uri: match route by uri(base on radixtree)
   # - radixtree_host_uri: match route by host + uri(base on radixtree)
   # - radixtree_uri_with_parameter: match route by uri with parameters
-  httpRouter: radixtree_uri
+  httpRouter: radixtree_host_uri
 
   # -- Enable full customized config.yaml
   enableCustomizedConfig: false
@@ -81,7 +81,7 @@ apisix:
 pullPolicy: IfNotPresent
 # -- Apache APISIX image tag
 # Overrides the image tag whose default is the chart appVersion.
-tag: 3.2.0-debian
+tag: 3.3.0-debian
 
   # -- Use a `DaemonSet` or `Deployment`
   kind: Deployment

[apisix-ingress-controller] branch master updated (31891bac -> c6a13b3b)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 31891bac fix: Referencing empty objects during tcproute and httproute 
updates (#1825)
 add c6a13b3b chore(deps): bump github.com/onsi/ginkgo/v2 in /test/e2e 
(#1827)

No new revisions were added by this update.

Summary of changes:
 test/e2e/go.mod |  4 ++--
 test/e2e/go.sum | 10 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

[apisix-ingress-controller] branch master updated: fix: Referencing empty objects during tcproute and httproute updates (#1825)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 31891bac fix: Referencing empty objects during tcproute and httproute 
updates (#1825)
31891bac is described below

commit 31891bac85f02bc3487069af47a22ad403a863e5
Author: Xin Rong 
AuthorDate: Fri May 5 17:58:40 2023 +0800

fix: Referencing empty objects during tcproute and httproute updates (#1825)
---
 pkg/providers/gateway/gateway_httproute.go | 28 
 pkg/providers/gateway/gateway_tcproute.go  | 28 
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/pkg/providers/gateway/gateway_httproute.go 
b/pkg/providers/gateway/gateway_httproute.go
index 30de8f19..22fd40cb 100644
--- a/pkg/providers/gateway/gateway_httproute.go
+++ b/pkg/providers/gateway/gateway_httproute.go
@@ -163,22 +163,17 @@ func (c *gatewayHTTPRouteController) sync(ctx 
context.Context, ev *types.Event)
} else {
var oldCtx *translation.TranslateContext
oldObj := ev.OldObject.(*gatewayv1beta1.HTTPRoute)
-   oldCtx, err = 
c.controller.translator.TranslateGatewayHTTPRouteV1beta1(oldObj)
-   if err != nil {
-   log.Errorw("failed to translate old HTTPRoute",
-   zap.String("version", oldObj.APIVersion),
-   zap.String("event_type", "update"),
-   zap.Any("HTTPRoute", oldObj),
-   zap.Error(err),
-   )
-   return err
-   }
+   oldCtx, _ = 
c.controller.translator.TranslateGatewayHTTPRouteV1beta1(oldObj)
+   if oldCtx != nil {
 
-   om := &utils.Manifest{
-   Routes:oldCtx.Routes,
-   Upstreams: oldCtx.Upstreams,
+   om := &utils.Manifest{
+   Routes:oldCtx.Routes,
+   Upstreams: oldCtx.Upstreams,
+   }
+   added, updated, deleted = m.Diff(om)
+   } else {
+   added = m
}
-   added, updated, deleted = m.Diff(om)
}
 
return utils.SyncManifests(ctx, c.controller.APISIX, 
c.controller.APISIXClusterName, added, updated, deleted, false)
@@ -252,8 +247,9 @@ func (c *gatewayHTTPRouteController) onUpdate(oldObj, 
newObj interface{}) {
)
 
c.workqueue.Add(&types.Event{
-   Type:   types.EventUpdate,
-   Object: key,
+   Type:  types.EventUpdate,
+   Object:key,
+   OldObject: oldHTTPRoute,
})
 }
 
diff --git a/pkg/providers/gateway/gateway_tcproute.go 
b/pkg/providers/gateway/gateway_tcproute.go
index 7a08f85a..028b3f5b 100644
--- a/pkg/providers/gateway/gateway_tcproute.go
+++ b/pkg/providers/gateway/gateway_tcproute.go
@@ -134,22 +134,17 @@ func (c *gatewayTCPRouteController) sync(ctx 
context.Context, ev *types.Event) e
} else {
var oldCtx *translation.TranslateContext
oldObj := ev.OldObject.(*gatewayv1alpha2.TCPRoute)
-   oldCtx, err = 
c.controller.translator.TranslateGatewayTCPRouteV1Alpha2(oldObj)
-   if err != nil {
-   log.Errorw("failed to translate old TCPRoute",
-   zap.String("version", oldObj.APIVersion),
-   zap.String("event_type", "update"),
-   zap.Any("TCPRoute", oldObj),
-   zap.Error(err),
-   )
-   return err
+   oldCtx, _ = 
c.controller.translator.TranslateGatewayTCPRouteV1Alpha2(oldObj)
+   if oldCtx != nil {
+   om := &utils.Manifest{
+   StreamRoutes: oldCtx.StreamRoutes,
+   Upstreams:oldCtx.Upstreams,
+   }
+   added, updated, deleted = m.Diff(om)
+   } else {
+   added = m
}
 
-   om := &utils.Manifest{
-   StreamRoutes: oldCtx.StreamRoutes,
-   Upstreams:oldCtx.Upstreams,
-   }
-   added, updated, deleted = m.Diff(om)
}
 
return utils.SyncManifests(ctx, c.controller.APISIX, 
c.controller.APISIXClusterName, added, updated, deleted, false)
@@ -246,8 +241,9 @@ func (c *gatewayTCPRouteController) onUpdate(oldObj, newObj 
interface{

[apisix-ingress-controller] branch master updated: CI: add regression testing with apisix:dev (#1721)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 2182a48c CI: add regression testing with apisix:dev (#1721)
2182a48c is described below

commit 2182a48cbca785373eca745a13d8cf2b7d9ab6c8
Author: Priyansh Singh 
AuthorDate: Sun Apr 23 12:34:50 2023 +0530

CI: add regression testing with apisix:dev (#1721)
---
 .github/workflows/e2e-test-ci-v2-cron-dev.yml | 217 ++
 Makefile  |   9 +-
 2 files changed, 221 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e2e-test-ci-v2-cron-dev.yml 
b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
new file mode 100644
index ..e34aa220
--- /dev/null
+++ b/.github/workflows/e2e-test-ci-v2-cron-dev.yml
@@ -0,0 +1,217 @@
+#
+# 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.
+#
+
+name: e2e-test-ci (dev)
+
+on:
+  schedule:
+  - cron: '0 0 * * *'
+  push:
+branches:
+  - master
+  - v1.6.0
+  pull_request:
+branches:
+  - master
+  - v1.6.0
+types: [opened, synchronize, reopened, review_requested]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || 
github.ref }}-dev
+  cancel-in-progress: true
+
+jobs:
+  changes:
+if: ${{ (!github.event.pull_request.draft || github.event.schedule == '0 0 
* * *') }}
+runs-on: ubuntu-20.04
+outputs:
+  docs: ${{ steps.filter.outputs.docs }}
+  go: ${{ steps.filter.outputs.go }}
+steps:
+  - name: Checkout
+uses: actions/checkout@v3
+with:
+  submodules: recursive
+
+  - uses: ./.github/actions/paths-filter
+id: filter
+with:
+  token: ${{ secrets.GITHUB_TOKEN }}
+  filters: |
+docs:
+  - 'docs/**/*'
+  - '*.md'
+go:
+  - '*.go'
+  - '**/*.go'
+  - 'go.mod'
+  - 'go.sum'
+  - 'Makefile'
+  - 'Dockerfile'
+  - 'test/e2e/**/*'
+  - 'conf/**'
+  - 'utils/**'
+  - ".github/**"
+  build:
+name: Build
+runs-on: ubuntu-20.04
+needs: changes
+if: needs.changes.outputs.go == 'true'
+
+steps:
+
+  - name: Checkout
+uses: actions/checkout@v3 # v3.0.2
+
+  - name: Setup Go Env
+id: go
+uses: actions/setup-go@v3 # v3.2.0
+with:
+  go-version: '1.19'
+
+  - name: Set up QEMU
+uses: docker/setup-qemu-action@v2 #v2.0.0
+
+  - name: Set up Docker Buildx
+id: buildx
+uses: docker/setup-buildx-action@v2 # v2.0.0
+with:
+  version: latest
+
+  - name: Prepare Host
+run: |
+  curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64
+  chmod +x ./kind
+  sudo mv kind /usr/local/bin
+
+  - name: Build images
+env:
+  APISIX_ADMIN_API_VERSION: "v3"
+  TAG: dev
+  ARCH: amd64
+  REGISTRY: localhost:5000
+  ENABLE_PROXY: "false"
+run: |
+  echo "building images..."
+  TARGET_APISIX_VERSION=dev make clean-image build-images
+
+  echo "creating images cache..."
+  docker save \
+${REGISTRY}/apisix:dev \
+${REGISTRY}/etcd:dev \
+${REGISTRY}/apisix-ingress-controller:dev \
+${REGISTRY}/httpbin:dev \
+${REGISTRY}/test-backend:dev \
+${REGISTRY}/echo-server:dev \
+${REGISTRY}/busybox:dev \
+| pigz > docker-dev.tar.gz
+
+  - name: cache
+uses: actions/upload-artifact@v3 # v3.1.0
+with:
+  name: docker-dev.tar.gz
+  path: docker-dev.tar.gz
+
+  prepare:
+needs: changes
+if: needs.changes.outputs.go == 'true&#x

[apisix-ingress-controller] branch master updated: chore: add docker compose and docker-compose compatible (#1808)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 2641b782 chore: add docker compose and docker-compose compatible 
(#1808)
2641b782 is described below

commit 2641b782b7c46c53f865f6d7e4b1e702e9141d4e
Author: John Chever 
AuthorDate: Sun Apr 23 15:01:24 2023 +0800

chore: add docker compose and docker-compose compatible (#1808)
---
 test/e2e/testdata/ldap/cmd.sh  | 16 +---
 test/e2e/testdata/wolf-rbac/cmd.sh | 18 ++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/test/e2e/testdata/ldap/cmd.sh b/test/e2e/testdata/ldap/cmd.sh
index 7f2f5927..871dcbab 100755
--- a/test/e2e/testdata/ldap/cmd.sh
+++ b/test/e2e/testdata/ldap/cmd.sh
@@ -20,17 +20,27 @@
 cd test/e2e/testdata/ldap/
 
 OPTION=$1
+COMPOSE_CMD=""
+
+if command -v "docker-compose" > /dev/null 2>&1; then
+COMPOSE_CMD="docker-compose"
+elif command -v "docker" > /dev/null 2>&1; then
+COMPOSE_CMD="docker compose"
+else
+echo "docker-compose or docker compose not found"
+exit 1
+fi
 
 if  [ $OPTION = "ip" ]; then
 echo -n `docker inspect -f '{{range 
.NetworkSettings.Networks}}{{.Gateway}}{{end}}' openldap`
 elif [ $OPTION = "start" ]; then
-docker-compose -f 'docker-compose.yaml'  -p 'openldap' down
+$COMPOSE_CMD -f 'docker-compose.yaml'  -p 'openldap' down
 
 # start openldap
-docker-compose -f 'docker-compose.yaml'  -p 'openldap' up -d
+$COMPOSE_CMD -f 'docker-compose.yaml'  -p 'openldap' up -d
 
 elif [ $OPTION = "stop" ]; then
-docker-compose -f  'docker-compose.yaml'  -p 'openldap' down
+$COMPOSE_CMD -f  'docker-compose.yaml'  -p 'openldap' down
 else
 echo "argument is one of [ip, start, stop]"
 fi
diff --git a/test/e2e/testdata/wolf-rbac/cmd.sh 
b/test/e2e/testdata/wolf-rbac/cmd.sh
index 54cd1c85..13aff671 100755
--- a/test/e2e/testdata/wolf-rbac/cmd.sh
+++ b/test/e2e/testdata/wolf-rbac/cmd.sh
@@ -20,20 +20,30 @@
 cd test/e2e/testdata/wolf-rbac/
 
 OPTION=$1
+COMPOSE_CMD=""
+
+if command -v "docker-compose" > /dev/null 2>&1; then
+COMPOSE_CMD="docker-compose"
+elif command -v "docker" > /dev/null 2>&1; then
+COMPOSE_CMD="docker compose"
+else
+echo "docker-compose or docker compose not found"
+exit 1
+fi
 
 if  [ $OPTION = "ip" ]; then
 echo -n `docker inspect -f '{{range 
.NetworkSettings.Networks}}{{.Gateway}}{{end}}' wolf-server`
 elif [ $OPTION = "start" ]; then
-docker-compose -f 'docker-compose.yaml'  -p 'wolf-rbac' down
+$COMPOSE_CMD -f 'docker-compose.yaml'  -p 'wolf-rbac' down
 rm -rf db-psql.sql
 
 wget 
https://raw.githubusercontent.com/iGeeky/wolf/f6ddeb75a37bff90406f0f0a2b7ae5d16f6f3bd4/server/script/db-psql.sql
 
 # start database
-docker-compose up -d database
+$COMPOSE_CMD up -d database
 
 # start wolf-server
-docker-compose up -d server restful-demo agent-or agent-demo
+$COMPOSE_CMD up -d server restful-demo agent-or agent-demo
 
 sleep 6
 
@@ -68,7 +78,7 @@ elif [ $OPTION = "start" ]; then
 "appIDs": ["test-app"]
 }'
 elif [ $OPTION = "stop" ]; then
-docker-compose -f 'docker-compose.yaml'  -p 'wolf-rbac' down
+$COMPOSE_CMD -f 'docker-compose.yaml'  -p 'wolf-rbac' down
 rm -rf db-psql.sql
 else
 echo "argument is one of [ip, start, stop]"

[apisix-ingress-controller] branch master updated: fix: Keep health checker running when health check failed. Make healthcheck function pure (#1779)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new abfacd6a fix: Keep health checker running when health check failed. 
Make healthcheck function pure (#1779)
abfacd6a is described below

commit abfacd6ab7ff8129898ef9a1c5e880b92fd52313
Author: basefas 
AuthorDate: Fri Apr 21 10:35:02 2023 +0800

fix: Keep health checker running when health check failed. Make healthcheck 
function pure (#1779)
---
 pkg/apisix/cluster.go   | 33 +
 pkg/providers/controller.go | 16 ++--
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/pkg/apisix/cluster.go b/pkg/apisix/cluster.go
index 7f551208..a50e9383 100644
--- a/pkg/apisix/cluster.go
+++ b/pkg/apisix/cluster.go
@@ -506,33 +506,22 @@ func (c *cluster) UpstreamServiceRelation() 
UpstreamServiceRelation {
 
 // HealthCheck implements Cluster.HealthCheck method.
 func (c *cluster) HealthCheck(ctx context.Context) (err error) {
-   if c.cacheSyncErr != nil {
-   err = c.cacheSyncErr
-   return
-   }
-   if atomic.LoadInt32(&c.cacheState) == _cacheSyncing {
-   return
-   }
-
// Retry three times in a row, and exit if all of them fail.
backoff := wait.Backoff{
Duration: 5 * time.Second,
Factor:   1,
Steps:3,
}
-   var lastCheckErr error
+
err = wait.ExponentialBackoffWithContext(ctx, backoff, func() (done 
bool, _ error) {
-   if lastCheckErr = c.healthCheck(ctx); lastCheckErr != nil {
+   if lastCheckErr := c.healthCheck(ctx); lastCheckErr != nil {
log.Warnf("failed to check health for cluster %s: %s, 
will retry", c.name, lastCheckErr)
return
}
done = true
return
})
-   if err != nil {
-   // if ErrWaitTimeout then set lastSyncErr
-   c.cacheSyncErr = lastCheckErr
-   }
+
return err
 }
 
@@ -543,12 +532,16 @@ func (c *cluster) healthCheck(ctx context.Context) (err 
error) {
if err != nil {
return err
}
-   if er := conn.Close(); er != nil {
-   log.Warnw("failed to close tcp probe connection",
-   zap.Error(err),
-   zap.String("cluster", c.name),
-   )
-   }
+   defer func(conn net.Conn) {
+   err := conn.Close()
+   if err != nil {
+   log.Warnw("failed to close tcp probe connection",
+   zap.Error(err),
+   zap.String("cluster", c.name),
+   )
+   }
+   }(conn)
+
return
 }
 
diff --git a/pkg/providers/controller.go b/pkg/providers/controller.go
index f59a934a..93ae1db5 100644
--- a/pkg/providers/controller.go
+++ b/pkg/providers/controller.go
@@ -570,16 +570,20 @@ func (c *Controller) checkClusterHealth(ctx 
context.Context, cancelFunc context.
 
err := 
c.apisix.Cluster(c.cfg.APISIX.DefaultClusterName).HealthCheck(ctx)
if err != nil {
-   // Finally failed health check, then give up leader.
-   log.Warnf("failed to check health for default cluster: 
%s, give up leader", err)
c.apiServer.HealthState.Lock()
c.apiServer.HealthState.Err = err
c.apiServer.HealthState.Unlock()
-
-   return
+   // Finally failed health check, then give up leader.
+   log.Warnf("failed to check health for default cluster: 
%s, give up leader", err)
+   } else {
+   if c.apiServer.HealthState.Err != nil {
+   c.apiServer.HealthState.Lock()
+   c.apiServer.HealthState.Err = err
+   c.apiServer.HealthState.Unlock()
+   }
+   log.Debugf("success check health for default cluster")
+   c.MetricsCollector.IncrCheckClusterHealth(c.name)
}
-   log.Debugf("success check health for default cluster")
-   c.MetricsCollector.IncrCheckClusterHealth(c.name)
}
 }
 

[apisix-ingress-controller] branch master updated: fix: secret reference update Ingress (#1780)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a414df75 fix: secret reference update Ingress (#1780)
a414df75 is described below

commit a414df7531f904481afccce44f5436f3d45d2c86
Author: Sarasa Kisaragi 
AuthorDate: Fri Apr 21 10:33:52 2023 +0800

fix: secret reference update Ingress (#1780)
---
 pkg/providers/apisix/apisix_tls.go | 248 +++-
 pkg/providers/ingress/ingress.go   | 170 +++-
 pkg/providers/ingress/translation/translator.go|  27 +-
 pkg/providers/k8s/namespace/namespace.go   |   3 +
 test/e2e/scaffold/scaffold.go  |   2 +-
 .../suite-ingress-features/namespace.go|   3 +
 .../suite-ingress/suite-ingress-features/secret.go | 439 -
 7 files changed, 563 insertions(+), 329 deletions(-)

diff --git a/pkg/providers/apisix/apisix_tls.go 
b/pkg/providers/apisix/apisix_tls.go
index 7fa219c8..bb6cf420 100644
--- a/pkg/providers/apisix/apisix_tls.go
+++ b/pkg/providers/apisix/apisix_tls.go
@@ -36,10 +36,8 @@ import (
configv2 
"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2"
configv2beta3 
"github.com/apache/apisix-ingress-controller/pkg/kube/apisix/apis/config/v2beta3"
"github.com/apache/apisix-ingress-controller/pkg/log"
-   "github.com/apache/apisix-ingress-controller/pkg/providers/translation"
"github.com/apache/apisix-ingress-controller/pkg/providers/utils"
"github.com/apache/apisix-ingress-controller/pkg/types"
-   v1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
 )
 
 type apisixTlsController struct {
@@ -49,11 +47,11 @@ type apisixTlsController struct {
workers   int
pool  pool.Pool
 
-   // secretSSLMap stores reference from K8s secret to ApisixTls
-   // type: Map>
-   // SecretKey -> ApisixTlsKey -> SSL object in APISIX
+   // secretRefMap stores reference from K8s secret to ApisixTls
+   // type: Map>
+   // SecretKey -> ApisixTlsKey -> empty object in APISIX
// SecretKey and ApisixTlsKey are kube-style meta key: `namespace/name`
-   secretSSLMap *sync.Map
+   secretRefMap *sync.Map
 }
 
 func newApisixTlsController(common *apisixCommon) *apisixTlsController {
@@ -63,7 +61,7 @@ func newApisixTlsController(common *apisixCommon) 
*apisixTlsController {
workers:  1,
pool: pool.NewLimited(2),
 
-   secretSSLMap: new(sync.Map),
+   secretRefMap: new(sync.Map),
}
 
c.ApisixTlsInformer.AddEventHandler(
@@ -156,18 +154,16 @@ func (c *apisixTlsController) sync(ctx context.Context, 
ev *types.Event) error {
switch event.GroupVersion {
case config.ApisixV2beta3:
tls := multiVersionedTls.V2beta3()
-   ssl, err := c.translator.TranslateSSLV2Beta3(tls)
-
-   // We should cache the relations regardless the translation 
succeed or not
secretKey := tls.Spec.Secret.Namespace + "/" + 
tls.Spec.Secret.Name
-   c.storeSecretCache(secretKey, apisixTlsKey, ssl, ev.Type)
+   c.storeSecretCache(secretKey, apisixTlsKey, ev.Type)
if tls.Spec.Client != nil {
caSecretKey := tls.Spec.Client.CASecret.Namespace + "/" 
+ tls.Spec.Client.CASecret.Name
if caSecretKey != secretKey {
-   c.storeSecretCache(caSecretKey, apisixTlsKey, 
ssl, ev.Type)
+   c.storeSecretCache(caSecretKey, apisixTlsKey, 
ev.Type)
}
}
 
+   ssl, err := c.translator.TranslateSSLV2Beta3(tls)
if err != nil {
log.Errorw("failed to translate ApisixTls",
zap.Error(err),
@@ -191,18 +187,16 @@ func (c *apisixTlsController) sync(ctx context.Context, 
ev *types.Event) error {
}
case config.ApisixV2:
tls := multiVersionedTls.V2()
-   ssl, err := c.translator.TranslateSSLV2(tls)
-
-   // We should cache the relations regardless the translation 
succeed or not
secretKey := tls.Spec.Secret.Namespace + "/" + 
tls.Spec.Secret.Name
-   c.storeSecretCache(secretKey, apisixTlsKey, ssl, ev.Type)
+   c.storeSecretCache(secretKey, apisixTlsKey, ev.Type)
if tls.Spec.Client != nil {
caSecretKey := tls.Spec.Client.CASecret.Namespace + "/" 
+ tls.Spec.Client.CASecret.Name
   

[apisix-ingress-controller] branch master updated: chore: upgrade ginkgo 1.9.0 to 1.9.2 (#1800)

[zhangjintao]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 20618245 chore: upgrade ginkgo 1.9.0 to 1.9.2 (#1800)
20618245 is described below

commit 2061824543bca34704f434f3040c08c35764524e
Author: ermao <39941928+wve...@users.noreply.github.com>
AuthorDate: Wed Apr 19 21:28:44 2023 +0800

chore: upgrade ginkgo 1.9.0 to 1.9.2 (#1800)
---
 .github/workflows/e2e-test-ci-v2-cron.yml | 2 +-
 .github/workflows/e2e-test-ci.yml | 2 +-
 .github/workflows/k8s-timer-ci.yml| 2 +-
 Makefile  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e-test-ci-v2-cron.yml 
b/.github/workflows/e2e-test-ci-v2-cron.yml
index 044f3ce3..fcdb14e7 100644
--- a/.github/workflows/e2e-test-ci-v2-cron.yml
+++ b/.github/workflows/e2e-test-ci-v2-cron.yml
@@ -166,7 +166,7 @@ jobs:
 
   - name: Install ginkgo
 run: |
-  go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.0
+  go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.2
   sudo cp ~/go/bin/ginkgo /usr/local/bin
 
   - name: cache
diff --git a/.github/workflows/e2e-test-ci.yml 
b/.github/workflows/e2e-test-ci.yml
index 00cdc8ad..bfe63a5a 100644
--- a/.github/workflows/e2e-test-ci.yml
+++ b/.github/workflows/e2e-test-ci.yml
@@ -166,7 +166,7 @@ jobs:
 
   - name: Install ginkgo
 run: |
-  go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.0
+  go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.2
   sudo cp ~/go/bin/ginkgo /usr/local/bin
 
   - name: cache
diff --git a/.github/workflows/k8s-timer-ci.yml 
b/.github/workflows/k8s-timer-ci.yml
index 788a84e7..e7b5c75f 100644
--- a/.github/workflows/k8s-timer-ci.yml
+++ b/.github/workflows/k8s-timer-ci.yml
@@ -150,7 +150,7 @@ jobs:
 
   - name: Install ginkgo
 run: |
-  go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.0
+  go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.2
   sudo cp ~/go/bin/ginkgo /usr/local/bin
 
   - name: cache
diff --git a/Makefile b/Makefile
index 4585bb46..819e0799 100644
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,7 @@ e2e-test-local: kind-up e2e-test
 .PHONY: ginkgo-check
 ginkgo-check:
 ifeq ("$(wildcard $(GINKGO))", "")
-   @echo "ERROR: Need to install ginkgo first, run: go get -u 
github.com/onsi/ginkgo/v2/ginkgo@v2.9.0 or go install -mod=mod 
github.com/onsi/ginkgo/v2/ginkgo@v2.9.0"
+   @echo "ERROR: Need to install ginkgo first, run: go get -u 
github.com/onsi/ginkgo/v2/ginkgo@v2.9.2 or go install -mod=mod 
github.com/onsi/ginkgo/v2/ginkgo@v2.9.2"
exit 1
 endif
 

[apisix-ingress-controller] branch master updated (8e437006 -> 5ef48f98)

[zhangjintao]

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

zhangjintao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


from 8e437006 dep: Updated some dependencies. (#1782)
 add 5ef48f98 chore(deps): bump github.com/gavv/httpexpect/v2 in /test/e2e 
(#1774)

No new revisions were added by this update.

Summary of changes:
 test/e2e/go.mod |  4 +++-
 test/e2e/go.sum | 49 ++---
 2 files changed, 17 insertions(+), 36 deletions(-)

[apisix-helm-chart] branch master updated: fix:service discovery minimal Kubernetes (#526)

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new f46b547  fix:service discovery minimal Kubernetes (#526)
f46b547 is described below

commit f46b54735f0179eb8c074aca9168045a8089fe1c
Author: Gallardot 
AuthorDate: Wed Apr 12 15:47:56 2023 +0800

fix:service discovery minimal Kubernetes (#526)

Signed-off-by: Gallardot 
---
 charts/apisix/templates/configmap.yaml | 4 
 1 file changed, 4 insertions(+)

diff --git a/charts/apisix/templates/configmap.yaml 
b/charts/apisix/templates/configmap.yaml
index 5fc970b..26a669b 100644
--- a/charts/apisix/templates/configmap.yaml
+++ b/charts/apisix/templates/configmap.yaml
@@ -208,8 +208,12 @@ data:
 {{- if .Values.discovery.enabled }}
 discovery:
   {{- range $key, $value := .Values.discovery.registry }}
+  {{- if $value }}
   {{ $key }}:
 {{- include "apisix.tplvalues.render" (dict "value" $value "context" 
$) | nindent 8 }}
+  {{- else }}
+  {{ $key }}: {}
+  {{- end }}
   {{- end }}
 {{- end }}
 

[apisix-helm-chart] branch master updated: When the version of the K8S server is lower than 1.14-0, ingress cannot be used because of the indentation problem of this else, which caused the incorrect d

[zhangjintao]

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

zhangjintao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-helm-chart.git


The following commit(s) were added to refs/heads/master by this push:
 new 19dd21f  When the version of the K8S server is lower than 1.14-0, 
ingress cannot be used because of the indentation problem of this else, which 
caused the incorrect deletion of an extra line (#533)
19dd21f is described below

commit 19dd21f2c781dc1f9f517f344f90bab659b0b865
Author: flylan 
AuthorDate: Wed Apr 12 15:11:55 2023 +0800

When the version of the K8S server is lower than 1.14-0, ingress cannot be 
used because of the indentation problem of this else, which caused the 
incorrect deletion of an extra line (#533)

Signed-off-by: fengzhibin 
---
 charts/apisix-dashboard/templates/ingress.yaml | 2 +-
 charts/apisix/templates/ingress-admin.yaml | 2 +-
 charts/apisix/templates/ingress.yaml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/apisix-dashboard/templates/ingress.yaml 
b/charts/apisix-dashboard/templates/ingress.yaml
index a3c53b5..bcee1de 100644
--- a/charts/apisix-dashboard/templates/ingress.yaml
+++ b/charts/apisix-dashboard/templates/ingress.yaml
@@ -62,7 +62,7 @@ spec:
 name: {{ $fullName }}
 port:
   number:  {{ $svcPort }}
-{{- else -}}
+{{- else }}
 backend:
   serviceName: {{ $fullName }}
   servicePort: {{ $svcPort }}
diff --git a/charts/apisix/templates/ingress-admin.yaml 
b/charts/apisix/templates/ingress-admin.yaml
index 5a96cde..8d5e3ff 100644
--- a/charts/apisix/templates/ingress-admin.yaml
+++ b/charts/apisix/templates/ingress-admin.yaml
@@ -66,7 +66,7 @@ spec:
 name: {{ $fullName }}-admin
 port:
   number:  {{ $svcPort }}
-{{- else -}}
+{{- else }}
 backend:
   serviceName: {{ $fullName }}-admin
   servicePort: {{ $svcPort }}
diff --git a/charts/apisix/templates/ingress.yaml 
b/charts/apisix/templates/ingress.yaml
index 5cd55de..7ab3347 100644
--- a/charts/apisix/templates/ingress.yaml
+++ b/charts/apisix/templates/ingress.yaml
@@ -66,7 +66,7 @@ spec:
 name: {{ $fullName }}-gateway
 port:
   number:  {{ $svcPort }}
-{{- else -}}
+{{- else }}
 backend:
   serviceName: {{ $fullName }}-gateway
   servicePort: {{ $svcPort }}