Skip to content

Commit 8a6b47c

Browse files
committed
feat: add more config for gatewayproxy
1 parent 7f3a519 commit 8a6b47c

2 files changed

Lines changed: 69 additions & 1 deletion

File tree

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

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,51 @@ spec:
2424
provider:
2525
type: {{ .Values.gatewayProxy.provider.type }}
2626
controlPlane:
27+
{{- with .Values.gatewayProxy.provider.controlPlane.endpoints }}
28+
{{- if (gt (len .) 0) }}
29+
endpoints:
30+
{{- toYaml . | nindent 8 }}
31+
{{- else }}
2732
service:
2833
name: {{ .Values.apisix.adminService.name }}
2934
port: {{ .Values.apisix.adminService.port }}
35+
{{- end }}
36+
{{- end }}
37+
38+
{{- with .Values.gatewayProxy.provider.controlPlane.tlsVerify }}
39+
tlsVerify: {{ . }}
40+
{{- end }}
41+
3042
{{- with .Values.gatewayProxy.provider.controlPlane.auth }}
3143
auth:
32-
{{- toYaml . | nindent 8 }}
44+
type: {{ .type }}
45+
{{- with .adminKey }}
46+
adminKey:
47+
{{- if .value }}
48+
value: {{ .value | quote }}
49+
{{- else if .valueFrom }}
50+
valueFrom:
51+
{{- toYaml .valueFrom | nindent 12 }}
52+
{{- end }}
53+
{{- end }}
3354
{{- end }}
55+
56+
{{- with .Values.gatewayProxy.publishService }}
57+
publishService: {{ . | quote }}
58+
{{- end }}
59+
60+
{{- with .Values.gatewayProxy.statusAddress }}
61+
statusAddress:
62+
{{- toYaml . | nindent 4 }}
63+
{{- end }}
64+
65+
{{- with .Values.gatewayProxy.plugins }}
66+
plugins:
67+
{{- toYaml . | nindent 4 }}
68+
{{- end }}
69+
70+
{{- with .Values.gatewayProxy.pluginMetadata }}
71+
pluginMetadata:
72+
{{- toYaml . | nindent 4 }}
73+
{{- end }}
3474
{{- end }}

charts/apisix-ingress-controller/values.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,34 @@ gatewayProxy:
104104
type: AdminKey
105105
adminKey:
106106
value: "edd1c9f034335f136f87ad84b625c8f1"
107+
#valueFrom:
108+
# secretKeyRef:
109+
# name: apisix-admin-secret
110+
# key: admin-key
111+
112+
#statusAddress:
113+
# - 1.2.3.4
114+
# - apisix.example.com
115+
116+
#publishService: "apisix-gateway"
117+
118+
#plugins:
119+
# - name: cors
120+
# enabled: true
121+
# config:
122+
# allow_origins: "*"
123+
# allow_methods: "GET,POST,PUT,DELETE"
124+
# - name: ip-restriction
125+
# enabled: false
126+
# config:
127+
# whitelist:
128+
# - 10.0.0.0/8
129+
# - 192.168.0.0/16
130+
131+
#pluginMetadata:
132+
# prometheus:
133+
# disable: false
134+
# export_uri: /apisix/prometheus/metrics
107135

108136
apisix:
109137
adminService:

0 commit comments

Comments
 (0)