Skip to content

Commit 7af972b

Browse files
mdnfirasmdnfiras
authored
Merge branch 'apache:master' into master
2 parents e4853ed + 7e5b8df commit 7af972b

File tree

10 files changed

+33
-26
lines changed

10 files changed

+33
-26
lines changed

‎charts/apisix-ingress-controller/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ keywords:
2424
- nginx
2525
- crd
2626
type: application
27-
version: 1.0.7
28-
appVersion: 2.0.0-rc5
27+
version: 1.1.1
28+
appVersion: 2.0.1
2929
sources:
3030
- https://github.com/apache/apisix-helm-chart
3131

‎charts/apisix-ingress-controller/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ The same for container level, you need to set:
111111
| autoscaling.enabled | bool | `false` | |
112112
| autoscaling.minReplicas | int | `1` | |
113113
| config.controllerName | string | `"apisix.apache.org/apisix-ingress-controller"` | |
114+
| config.disableGatewayAPI | bool | `false` | |
114115
| config.enableHTTP2 | bool | `false` | |
115116
| config.execADCTimeout | string | `"15s"` | |
116117
| config.kubernetes.defaultIngressClass | bool | `false` | |
@@ -127,12 +128,12 @@ The same for container level, you need to set:
127128
| config.provider.syncPeriod | string | `"1m"` | |
128129
| config.provider.type | string | `"apisix"` | |
129130
| config.secureMetrics | bool | `false` | |
130-
| deployment.adcContainer | object | `{"config":{"logLevel":"info"},"image":{"repository":"ghcr.io/api7/adc","tag":"0.22.1"}}` | Set adc sidecar container configuration |
131+
| deployment.adcContainer | object | `{"config":{"logLevel":"info"},"image":{"repository":"ghcr.io/api7/adc","tag":"0.23.1"}}` | Set adc sidecar container configuration |
131132
| deployment.affinity | object | `{}` | |
132133
| deployment.annotations | object | `{}` | Add annotations to Apache APISIX ingress controller resource |
133134
| deployment.image.pullPolicy | string | `"IfNotPresent"` | |
134135
| deployment.image.repository | string | `"apache/apisix-ingress-controller"` | |
135-
| deployment.image.tag | string | `"2.0.0-rc5"` | |
136+
| deployment.image.tag | string | `"2.0.1"` | |
136137
| deployment.nodeSelector | object | `{}` | |
137138
| deployment.podAnnotations | object | `{}` | |
138139
| deployment.podSecurityContext | object | `{"fsGroup":2000}` | Set security context for the pod fsGroup: 2000 ensures containers can share Unix socket files via a common group. |

‎charts/apisix-ingress-controller/crds/apisixic-crds.yaml‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ spec:
714714
name: v2
715715
schema:
716716
openAPIV3Schema:
717-
description: ApisixRoute is defines configuration for HTTP and stream routes.
717+
description: ApisixRoute defines configuration for HTTP and stream routes.
718718
properties:
719719
apiVersion:
720720
description: |-
@@ -1027,7 +1027,7 @@ spec:
10271027
Each rule specifies conditions to match TCP/UDP traffic and how to forward them.
10281028
items:
10291029
description: ApisixRouteStream defines the configuration for a Layer
1030-
4 (TCP/UDP) route. Currently not supported.
1030+
4 (TCP/UDP) route.
10311031
properties:
10321032
backend:
10331033
description: Backend specifies the destination service to which
@@ -1585,9 +1585,8 @@ spec:
15851585
minimum: 0
15861586
type: integer
15871587
timeout:
1588-
description: |-
1589-
Timeout sets health check timeout in seconds.
1590-
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
1588+
description: Timeout sets the number of timeouts to define
1589+
an unhealthy target.
15911590
maximum: 254
15921591
minimum: 1
15931592
type: integer
@@ -1649,9 +1648,8 @@ spec:
16491648
minimum: 0
16501649
type: integer
16511650
timeout:
1652-
description: |-
1653-
Timeout sets health check timeout in seconds.
1654-
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
1651+
description: Timeout sets the number of timeouts to define
1652+
an unhealthy target.
16551653
maximum: 254
16561654
minimum: 1
16571655
type: integer
@@ -1846,9 +1844,8 @@ spec:
18461844
minimum: 0
18471845
type: integer
18481846
timeout:
1849-
description: |-
1850-
Timeout sets health check timeout in seconds.
1851-
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
1847+
description: Timeout sets the number of timeouts
1848+
to define an unhealthy target.
18521849
maximum: 254
18531850
minimum: 1
18541851
type: integer
@@ -1910,9 +1907,8 @@ spec:
19101907
minimum: 0
19111908
type: integer
19121909
timeout:
1913-
description: |-
1914-
Timeout sets health check timeout in seconds.
1915-
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
1910+
description: Timeout sets the number of timeouts
1911+
to define an unhealthy target.
19161912
maximum: 254
19171913
minimum: 1
19181914
type: integer
@@ -3029,6 +3025,11 @@ spec:
30293025
type: string
30303026
minItems: 1
30313027
type: array
3028+
mode:
3029+
description: |-
3030+
Mode specifies the mode of control plane provider.
3031+
Can be `apisix` or `apisix-standalone`.
3032+
type: string
30323033
service:
30333034
properties:
30343035
name:
@@ -3052,6 +3053,9 @@ spec:
30523053
type: object
30533054
x-kubernetes-validations:
30543055
- rule: has(self.endpoints) != has(self.service)
3056+
- message: mode is immutable
3057+
rule: oldSelf == null || (!has(self.mode) && !has(oldSelf.mode))
3058+
|| self.mode == oldSelf.mode
30553059
type:
30563060
description: Type specifies the type of provider. Can only be
30573061
`ControlPlane`.

‎charts/apisix-ingress-controller/templates/configmap.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ data:
3434
probe_addr: {{ .Values.config.probeAddr | default ":8081" }}
3535
secure_metrics: {{ .Values.config.secureMetrics | default false }}
3636
exec_adc_timeout: {{ .Values.config.execADCTimeout | default "15s" }}
37+
disable_gateway_api: {{ .Values.config.disableGatewayAPI | default false }}
3738
provider:
3839
type: {{ .Values.config.provider.type | default "apisix" }}
3940
sync_period: {{ .Values.config.provider.syncPeriod | default "1s" }}

‎charts/apisix-ingress-controller/values.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ deployment:
6464
image:
6565
repository: apache/apisix-ingress-controller
6666
pullPolicy: IfNotPresent
67-
tag: "2.0.0-rc5"
67+
tag: "2.0.1"
6868
# -- Set pod resource requests & limits
6969
resources: {}
7070

7171
# -- Set adc sidecar container configuration
7272
adcContainer:
7373
image:
7474
repository: ghcr.io/api7/adc
75-
tag: "0.22.1"
75+
tag: "0.23.1"
7676
config:
7777
logLevel: "info"
7878

@@ -90,6 +90,7 @@ config:
9090
probeAddr: ":8081"
9191
secureMetrics: false
9292
execADCTimeout: "15s"
93+
disableGatewayAPI: false
9394
provider:
9495
type: "apisix"
9596
syncPeriod: "1m"

‎charts/apisix/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ dependencies:
44
version: 12.0.18
55
- name: apisix-ingress-controller
66
repository: https://apache.github.io/apisix-helm-chart
7-
version: 1.0.6
8-
digest: sha256:fc56154e41aeac1a86d71d22cdd32b0881e75602ebcf531a9096c6eb2e2453db
9-
generated: "2025-10-27T08:35:56.210142+08:00"
7+
version: 1.1.1
8+
digest: sha256:394de9f38f63e35a2b4f48901ef3965b07a8aec6849717894ad920d6089eb3eb
9+
generated: "2026-01-19T15:56:51.701826+08:00"

‎charts/apisix/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type: application
3131
# This is the chart version. This version number should be incremented each time you make changes
3232
# to the chart and its templates, including the app version.
3333
# Versions are expected to follow Semantic Versioning (https://semver.org/)
34-
version: 2.12.4
34+
version: 2.12.6
3535

3636
# This is the version number of the application being deployed. This version number should be
3737
# incremented each time you make changes to the application. Versions are not expected to
@@ -46,7 +46,7 @@ dependencies:
4646
repository: https://charts.bitnami.com/bitnami
4747
condition: etcd.enabled
4848
- name: apisix-ingress-controller
49-
version: 1.0.6
49+
version: 1.1.1
5050
repository: https://apache.github.io/apisix-helm-chart
5151
condition: ingress-controller.enabled
5252
alias: ingress-controller

‎charts/apisix/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ The command removes all the Kubernetes components associated with the chart and
6868
| apisix.customPlugins.plugins[0].configMap.name | string | `"configmap-name"` | name of configmap. |
6969
| apisix.deployment.mode | string | `"traditional"` | Apache APISIX deployment mode Optional: traditional, decoupled, standalone ref: https://apisix.apache.org/docs/apisix/deployment-modes/ |
7070
| apisix.deployment.role | string | `"traditional"` | Deployment role Optional: traditional, data_plane, control_plane ref: https://apisix.apache.org/docs/apisix/deployment-modes/ |
71+
| apisix.deployment.role_traditional.config_provider | string | `"etcd"` | |
7172
| apisix.deployment.standalone | object | `{"config":"routes:\n-\n uri: /hi\n upstream:\n nodes:\n \"127.0.0.1:1980\": 1\n type: roundrobin\n","existingConfigMap":""}` | Standalone rules configuration ref: https://apisix.apache.org/docs/apisix/deployment-modes/#standalone |
7273
| apisix.deployment.standalone.config | string | `"routes:\n-\n uri: /hi\n upstream:\n nodes:\n \"127.0.0.1:1980\": 1\n type: roundrobin\n"` | Rules which are set to the default apisix.yaml configmap. If apisix.delpoyment.standalone.existingConfigMap is empty, these are used. |
7374
| apisix.deployment.standalone.existingConfigMap | string | `""` | Specifies the name of the ConfigMap that contains the rule configurations. The configuration must be set to the key named `apisix.yaml` in the configmap. |
74-
| apisix.deployment.role_traditional.config_provider | string | `"etcd"` | |
7575
| apisix.discovery.enabled | bool | `false` | Enable or disable Apache APISIX integration service discovery |
7676
| apisix.discovery.registry | object | `{}` | Service discovery registry. Refer to [configuration under discovery](https://github.com/apache/apisix/blob/master/conf/config.yaml.example#L307) for example. Also see [example of using external service discovery](https://apisix.apache.org/docs/ingress-controller/1.8.0/tutorials/external-service-discovery/). |
7777
| apisix.dns.resolvers[0] | string | `"127.0.0.1"` | |

‎charts/apisix/charts/apisix-ingress-controller-1.0.6.tgz‎

-175 KB
Binary file not shown.

‎charts/apisix/charts/apisix-ingress-controller-1.1.1.tgz‎

175 KB
Binary file not shown.

0 commit comments

Comments
 (0)