Skip to content

Commit 63b7603

Browse files
ronethingronething
committed
Merge remote-tracking branch 'origin/master' into feat/webhook_server
Signed-off-by: Ashing Zheng <[email protected]>
2 parents 93adf17 + 4883379 commit 63b7603

File tree

8 files changed

+11710
-4309
lines changed

8 files changed

+11710
-4309
lines changed

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,19 @@ The same for container level, you need to set:
141141
| deployment.tolerations | list | `[]` | |
142142
| deployment.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 |
143143
| fullnameOverride | string | `""` | |
144-
| gatewayProxy.createDefault | bool | `false` | |
145-
| gatewayProxy.provider.controlPlane.auth.adminKey.value | string | `"edd1c9f034335f136f87ad84b625c8f1"` | |
146-
| gatewayProxy.provider.controlPlane.auth.type | string | `"AdminKey"` | |
147-
| gatewayProxy.provider.controlPlane.endpoints | list | `[]` | |
148-
| gatewayProxy.provider.type | string | `"ControlPlane"` | |
144+
| gatewayProxy.createDefault | bool | `false` | Controls whether to create a default GatewayProxy custom resource. |
145+
| gatewayProxy.provider | object | `{"controlPlane":{"auth":{"adminKey":{"value":"edd1c9f034335f136f87ad84b625c8f1","valueFrom":{}},"type":"AdminKey"},"endpoints":[],"service":{"name":"","port":9180}},"pluginMetadata":{},"plugins":[],"type":"ControlPlane"}` | Configuration for the GatewayProxy provider connection |
146+
| gatewayProxy.provider.controlPlane | object | `{"auth":{"adminKey":{"value":"edd1c9f034335f136f87ad84b625c8f1","valueFrom":{}},"type":"AdminKey"},"endpoints":[],"service":{"name":"","port":9180}}` | ControlPlane provider specific configuration Either `endpoints` or `service` must be specified, but not both. |
147+
| gatewayProxy.provider.controlPlane.auth | object | `{"adminKey":{"value":"edd1c9f034335f136f87ad84b625c8f1","valueFrom":{}},"type":"AdminKey"}` | Authentication configuration for control plane connection |
148+
| gatewayProxy.provider.controlPlane.auth.adminKey | object | `{"value":"edd1c9f034335f136f87ad84b625c8f1","valueFrom":{}}` | AdminKey authentication configuration. Either `value` or `valueFrom` must be specified, but not both. |
149+
| gatewayProxy.provider.controlPlane.auth.adminKey.value | string | `"edd1c9f034335f136f87ad84b625c8f1"` | The admin key value for authentication. |
150+
| gatewayProxy.provider.controlPlane.auth.adminKey.valueFrom | object | `{}` | Reference to admin key stored in a Kubernetes Secret |
151+
| gatewayProxy.provider.controlPlane.auth.type | string | `AdminKey` | Authentication type. Only `AdminKey` is currently supported. |
152+
| gatewayProxy.provider.controlPlane.endpoints | list | `[]` | List of APISIX control plane Admin API endpoints. example: ["http://apisix-admin.default.svc.cluster.local:9180"] |
153+
| gatewayProxy.provider.controlPlane.service | object | `{"name":"","port":9180}` | Alternatively, reference a Kubernetes Service for the APISIX Admin API. |
154+
| gatewayProxy.provider.pluginMetadata | object | `{}` | Global plugin metadata shared by all instances of the same plugin. |
155+
| gatewayProxy.provider.plugins | list | `[]` | List of global plugins to be enabled on the GatewayProxy. |
156+
| gatewayProxy.provider.type | string | `"ControlPlane"` | Specifies the provider type for the GatewayProxy. |
149157
| labelsOverride | object | `{}` | Override default labels assigned to Apache APISIX ingress controller resource |
150158
| nameOverride | string | `""` | Default values for apisix-ingress-controller. This is a YAML-formatted file. Declare variables to be passed into your templates. |
151159
| podDisruptionBudget | object | `{"enabled":false,"maxUnavailable":1,"minAvailable":"90%"}` | See https://kubernetes.io/docs/tasks/run-application/configure-pdb/ for more details |

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

Lines changed: 602 additions & 307 deletions
Large diffs are not rendered by default.

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

Lines changed: 10998 additions & 3992 deletions
Large diffs are not rendered by default.

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

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,53 @@ spec:
2424
provider:
2525
type: {{ .Values.gatewayProxy.provider.type }}
2626
controlPlane:
27+
{{- if .Values.gatewayProxy.provider.controlPlane.endpoints }}
28+
endpoints:
29+
{{- toYaml .Values.gatewayProxy.provider.controlPlane.endpoints | nindent 8 }}
30+
{{- else if .Values.gatewayProxy.provider.controlPlane.service.name }}
31+
service:
32+
name: {{ .Values.gatewayProxy.provider.controlPlane.service.name }}
33+
port: {{ .Values.gatewayProxy.provider.controlPlane.service.port }}
34+
{{- else }}
2735
service:
2836
name: {{ .Values.apisix.adminService.name }}
2937
port: {{ .Values.apisix.adminService.port }}
38+
{{- end }}
39+
40+
{{- with .Values.gatewayProxy.provider.controlPlane.tlsVerify }}
41+
tlsVerify: {{ . }}
42+
{{- end }}
43+
3044
{{- with .Values.gatewayProxy.provider.controlPlane.auth }}
3145
auth:
32-
{{- toYaml . | nindent 8 }}
46+
type: {{ .type }}
47+
{{- with .adminKey }}
48+
adminKey:
49+
{{- if .valueFrom }}
50+
valueFrom:
51+
{{- toYaml .valueFrom | nindent 12 }}
52+
{{- else if .value }}
53+
value: {{ .value | quote }}
54+
{{- end }}
55+
{{- end }}
3356
{{- end }}
57+
58+
{{- with .Values.gatewayProxy.publishService }}
59+
publishService: {{ . | quote }}
60+
{{- end }}
61+
62+
{{- with .Values.gatewayProxy.statusAddress }}
63+
statusAddress:
64+
{{- toYaml . | nindent 4 }}
65+
{{- end }}
66+
67+
{{- with .Values.gatewayProxy.plugins }}
68+
plugins:
69+
{{- toYaml . | nindent 4 }}
70+
{{- end }}
71+
72+
{{- with .Values.gatewayProxy.pluginMetadata }}
73+
pluginMetadata:
74+
{{- toYaml . | nindent 4 }}
75+
{{- end }}
3476
{{- end }}

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,67 @@ webhook:
112112
# -- CA bundle in base64 format (required if provided is true)
113113
# caBundle: ""
114114

115+
# The GatewayProxy resource configures gateway proxy instances including networking,
116+
# provider connection, global plugins, and plugin metadata.
115117
gatewayProxy:
118+
# -- Controls whether to create a default GatewayProxy custom resource.
116119
createDefault: false
120+
121+
# -- Configuration for the GatewayProxy provider connection
117122
provider:
123+
# -- Specifies the provider type for the GatewayProxy.
118124
type: ControlPlane
125+
126+
# -- ControlPlane provider specific configuration
127+
# Either `endpoints` or `service` must be specified, but not both.
119128
controlPlane:
129+
# -- List of APISIX control plane Admin API endpoints.
130+
# example: ["http://apisix-admin.default.svc.cluster.local:9180"]
120131
endpoints: []
132+
133+
# -- Alternatively, reference a Kubernetes Service for the APISIX Admin API.
134+
service:
135+
name: ""
136+
port: 9180
137+
138+
# -- Authentication configuration for control plane connection
121139
auth:
140+
# -- Authentication type. Only `AdminKey` is currently supported.
141+
# @default -- `AdminKey`
122142
type: AdminKey
143+
144+
# -- AdminKey authentication configuration.
145+
# Either `value` or `valueFrom` must be specified, but not both.
123146
adminKey:
147+
# -- The admin key value for authentication.
124148
value: "edd1c9f034335f136f87ad84b625c8f1"
125149

150+
# -- Reference to admin key stored in a Kubernetes Secret
151+
valueFrom: {}
152+
# secretKeyRef:
153+
# name: apisix-admin-secret
154+
# key: admin-key
155+
156+
# -- List of global plugins to be enabled on the GatewayProxy.
157+
plugins: []
158+
# - name: cors
159+
# enabled: true
160+
# config:
161+
# allow_origins: "*"
162+
# allow_methods: "GET,POST,PUT,DELETE"
163+
# - name: ip-restriction
164+
# enabled: false
165+
# config:
166+
# whitelist:
167+
# - 10.0.0.0/8
168+
# - 192.168.0.0/16
169+
170+
# -- Global plugin metadata shared by all instances of the same plugin.
171+
pluginMetadata: {}
172+
# prometheus:
173+
# disable: false
174+
# export_uri: /apisix/prometheus/metrics
175+
126176
apisix:
127177
adminService:
128178
namespace: apisix-ingress

‎charts/apisix/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ 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.0
34+
version: 2.12.1
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
3838
# follow Semantic Versioning. They should reflect the version the application is using.
39-
appVersion: 3.14.0
39+
appVersion: 3.14.1
4040
sources:
4141
- https://github.com/apache/apisix-helm-chart
4242

‎charts/apisix/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ The command removes all the Kubernetes components associated with the chart and
184184
| hostNetwork | bool | `false` | |
185185
| image.pullPolicy | string | `"IfNotPresent"` | Apache APISIX image pull policy |
186186
| image.repository | string | `"apache/apisix"` | Apache APISIX image repository |
187-
| image.tag | string | `"3.14.0-ubuntu"` | Apache APISIX image tag Overrides the image tag whose default is the chart appVersion. |
187+
| image.tag | string | `"3.14.1-ubuntu"` | Apache APISIX image tag Overrides the image tag whose default is the chart appVersion. |
188188
| ingress | object | `{"annotations":{},"enabled":false,"hosts":[{"host":"apisix.local","paths":[]}],"servicePort":null,"tls":[]}` | Using ingress access Apache APISIX service |
189189
| ingress-controller | object | `{"enabled":false}` | Ingress controller configuration |
190190
| ingress.annotations | object | `{}` | Ingress annotations |

‎charts/apisix/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ image:
2929
pullPolicy: IfNotPresent
3030
# -- Apache APISIX image tag
3131
# Overrides the image tag whose default is the chart appVersion.
32-
tag: 3.14.0-ubuntu
32+
tag: 3.14.1-ubuntu
3333

3434
# -- set false to use `Deployment`, set true to use `DaemonSet`
3535
useDaemonSet: false

0 commit comments

Comments
 (0)