This is an automated email from the ASF dual-hosted git repository.
juzhiyuan 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 354800d feat: release ingress 2.0.0-rc4 (#866)
354800d is described below
commit 354800d59fd6c82062da7c8826f377695f4d3f62
Author: AlinsRan <alins...@apache.org>
AuthorDate: Mon Sep 1 10:28:15 2025 +0800
feat: release ingress 2.0.0-rc4 (#866)
---
charts/apisix-ingress-controller/Chart.yaml | 4 +--
charts/apisix-ingress-controller/README.md | 3 +-
.../templates/deployment.yaml | 38 ++++++++++++++++++++++
charts/apisix-ingress-controller/values.yaml | 10 +++++-
4 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/charts/apisix-ingress-controller/Chart.yaml
b/charts/apisix-ingress-controller/Chart.yaml
index 0890476..02c685b 100644
--- a/charts/apisix-ingress-controller/Chart.yaml
+++ b/charts/apisix-ingress-controller/Chart.yaml
@@ -24,8 +24,8 @@ keywords:
- nginx
- crd
type: application
-version: 1.0.4
-appVersion: 2.0.0-rc3
+version: 1.0.5
+appVersion: 2.0.0-rc4
sources:
- https://github.com/apache/apisix-helm-chart
diff --git a/charts/apisix-ingress-controller/README.md
b/charts/apisix-ingress-controller/README.md
index 62d4e25..590ff0b 100644
--- a/charts/apisix-ingress-controller/README.md
+++ b/charts/apisix-ingress-controller/README.md
@@ -127,11 +127,12 @@ The same for container level, you need to set:
| config.provider.syncPeriod | string | `"1m"` | |
| config.provider.type | string | `"apisix"` | |
| config.secureMetrics | bool | `false` | |
+| deployment.adcContainer | object |
`{"config":{"logLevel":"info"},"image":{"repository":"ghcr.io/api7/adc","tag":"0.21.0"}}`
| Set adc sidecar container configuration |
| deployment.affinity | object | `{}` | |
| deployment.annotations | object | `{}` | Add annotations to Apache APISIX
ingress controller resource |
| deployment.image.pullPolicy | string | `"IfNotPresent"` | |
| deployment.image.repository | string | `"apache/apisix-ingress-controller"`
| |
-| deployment.image.tag | string | `"2.0.0-rc3"` | |
+| deployment.image.tag | string | `"2.0.0-rc4"` | |
| deployment.nodeSelector | object | `{}` | |
| deployment.podAnnotations | object | `{}` | |
| deployment.podSecurityContext | object | `{}` | |
diff --git a/charts/apisix-ingress-controller/templates/deployment.yaml
b/charts/apisix-ingress-controller/templates/deployment.yaml
index 746ea8d..ac61846 100644
--- a/charts/apisix-ingress-controller/templates/deployment.yaml
+++ b/charts/apisix-ingress-controller/templates/deployment.yaml
@@ -53,6 +53,7 @@ spec:
fieldRef:
fieldPath: metadata.name
image: "{{ .Values.deployment.image.repository }}:{{
.Values.deployment.image.tag }}"
+ imagePullPolicy: {{ .Values.deployment.image.pullPolicy }}
ports:
- containerPort: {{ splitList ":" .Values.config.metricsAddr | last |
int }}
name: metrics
@@ -78,6 +79,43 @@ spec:
{{- toYaml .Values.deployment.resources | nindent 10 }}
securityContext:
{{- toYaml .Values.deployment.podSecurityContext | nindent 10 }}
+ - name: adc-server
+ image: "{{ .Values.deployment.adcContainer.image.repository }}:{{
.Values.deployment.adcContainer.image.tag }}"
+ imagePullPolicy: {{ .Values.deployment.image.pullPolicy }}
+ args:
+ - "server"
+ - "--listen"
+ - "http://127.0.0.1:3000";
+ - "--listen-status"
+ - "3001"
+ env:
+ - name: ADC_RUNNING_MODE
+ value: "ingress"
+ - name: ADC_EXPERIMENTAL_FEATURE_FLAGS
+ value: "remote-state-file,parallel-backend-request"
+ - name: ADC_INGRESS_LOG_LEVEL
+ value: "{{ .Values.deployment.adcContainer.config.logLevel }}"
+ ports:
+ - name: http-status
+ containerPort: 3001
+ protocol: TCP
+ livenessProbe:
+ httpGet:
+ path: /healthz/ready
+ port: 3001
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
+ readinessProbe:
+ httpGet:
+ path: /healthz/ready
+ port: 3001
+ initialDelaySeconds: 5
+ periodSeconds: 5
+ resources:
+ {{- toYaml .Values.deployment.resources | nindent 10 }}
+ securityContext:
+ {{- toYaml .Values.deployment.podSecurityContext | nindent 10 }}
{{- with .Values.deployment.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
diff --git a/charts/apisix-ingress-controller/values.yaml
b/charts/apisix-ingress-controller/values.yaml
index 9e4d034..ec68e3a 100644
--- a/charts/apisix-ingress-controller/values.yaml
+++ b/charts/apisix-ingress-controller/values.yaml
@@ -60,10 +60,18 @@ deployment:
image:
repository: apache/apisix-ingress-controller
pullPolicy: IfNotPresent
- tag: "2.0.0-rc3"
+ tag: "2.0.0-rc4"
# -- Set pod resource requests & limits
resources: {}
+ # -- Set adc sidecar container configuration
+ adcContainer:
+ image:
+ repository: ghcr.io/api7/adc
+ tag: "0.21.0"
+ config:
+ logLevel: "info"
+
config:
logLevel: "info"
controllerName: apisix.apache.org/apisix-ingress-controller
