Skip to content

Commit e4a1129

Browse files
ronethingronething
authored
chore: upgrade ingress controller image to 2.0.9 (#217)
Signed-off-by: Ashing Zheng <[email protected]>
1 parent 2fcaf23 commit e4a1129

File tree

6 files changed

+135
-27
lines changed

6 files changed

+135
-27
lines changed

‎charts/ingress-controller/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ keywords:
66
- api7
77
- crd
88
type: application
9-
version: 0.1.14
10-
appVersion: 2.0.8
9+
version: 0.1.15
10+
appVersion: 2.0.9
1111
maintainers:
1212
- name: API7
1313
email: [email protected]

‎charts/ingress-controller/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# api7-ingress-controller
22

3-
![Version: 0.1.14](https://img.shields.io/badge/Version-0.1.14-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.8](https://img.shields.io/badge/AppVersion-2.0.8-informational?style=flat-square)
3+
![Version: 0.1.15](https://img.shields.io/badge/Version-0.1.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.9](https://img.shields.io/badge/AppVersion-2.0.9-informational?style=flat-square)
44

55
Ingress Controller for API7
66

@@ -20,7 +20,7 @@ Ingress Controller for API7
2020
|-----|------|---------|-------------|
2121
| adc.image.pullPolicy | string | `"IfNotPresent"` | |
2222
| adc.image.repository | string | `"ghcr.io/api7/adc"` | |
23-
| adc.image.tag | string | `"0.21.1"` | |
23+
| adc.image.tag | string | `"0.21.2"` | |
2424
| adc.resources | object | `{}` | |
2525
| adc.securityContext | object | `{}` | |
2626
| autoscaling.enabled | bool | `false` | |
@@ -44,7 +44,7 @@ Ingress Controller for API7
4444
| deployment.annotations | object | `{}` | |
4545
| deployment.image.pullPolicy | string | `"IfNotPresent"` | |
4646
| deployment.image.repository | string | `"api7/api7-ingress-controller"` | |
47-
| deployment.image.tag | string | `"2.0.8"` | |
47+
| deployment.image.tag | string | `"2.0.9"` | |
4848
| deployment.nodeSelector | object | `{}` | |
4949
| deployment.podAnnotations | object | `{}` | |
5050
| deployment.podSecurityContext | object | `{}` | |

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

Lines changed: 60 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,6 +1015,9 @@ spec:
10151015
- name
10161016
type: object
10171017
type: array
1018+
x-kubernetes-list-map-keys:
1019+
- name
1020+
x-kubernetes-list-type: map
10181021
ingressClassName:
10191022
description: |-
10201023
IngressClassName is the name of the IngressClass this route belongs to.
@@ -1128,6 +1131,9 @@ spec:
11281131
- protocol
11291132
type: object
11301133
type: array
1134+
x-kubernetes-list-map-keys:
1135+
- name
1136+
x-kubernetes-list-type: map
11311137
type: object
11321138
status:
11331139
description: ApisixStatus is the status report for Apisix ingress Resources
@@ -1433,9 +1439,7 @@ spec:
14331439
description: ApisixUpstreamSpec defines the upstream configuration.
14341440
properties:
14351441
discovery:
1436-
description: |-
1437-
Discovery configures service discovery for the upstream.
1438-
Deprecated: no longer supported in standalone mode.
1442+
description: Discovery configures service discovery for the upstream.
14391443
properties:
14401444
args:
14411445
additionalProperties:
@@ -1472,6 +1476,8 @@ spec:
14721476
port:
14731477
description: Port specifies the port number on which the external
14741478
node is accepting traffic.
1479+
maximum: 65535
1480+
minimum: 1
14751481
type: integer
14761482
type:
14771483
description: Type indicates the kind of external node. Can be
@@ -1486,9 +1492,8 @@ spec:
14861492
minItems: 1
14871493
type: array
14881494
healthCheck:
1489-
description: |-
1490-
HealthCheck defines the active and passive health check configuration for the upstream.
1491-
Deprecated: no longer supported in standalone mode.
1495+
description: HealthCheck defines the active and passive health check
1496+
configuration for the upstream.
14921497
properties:
14931498
active:
14941499
description: Active health checks proactively send requests to
@@ -1531,7 +1536,7 @@ spec:
15311536
description: Port sets the upstream port.
15321537
format: int32
15331538
maximum: 65535
1534-
minimum: 0
1539+
minimum: 1
15351540
type: integer
15361541
requestHeaders:
15371542
description: RequestHeaders sets the request headers.
@@ -1546,6 +1551,7 @@ spec:
15461551
format: int64
15471552
type: integer
15481553
type:
1554+
default: http
15491555
description: Type is the health check type. Can be `http`,
15501556
`https`, or `tcp`.
15511557
enum:
@@ -1581,7 +1587,11 @@ spec:
15811587
minimum: 0
15821588
type: integer
15831589
timeout:
1584-
description: Timeout sets health check timeout in seconds.
1590+
description: |-
1591+
Timeout sets health check timeout in seconds.
1592+
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
1593+
maximum: 254
1594+
minimum: 1
15851595
type: integer
15861596
type: object
15871597
type: object
@@ -1608,9 +1618,14 @@ spec:
16081618
type: integer
16091619
type: object
16101620
type:
1621+
default: http
16111622
description: |-
16121623
Type specifies the type of passive health check.
16131624
Can be `http`, `https`, or `tcp`.
1625+
enum:
1626+
- http
1627+
- https
1628+
- tcp
16141629
type: string
16151630
unhealthy:
16161631
description: Unhealthy defines the conditions under which
@@ -1636,7 +1651,11 @@ spec:
16361651
minimum: 0
16371652
type: integer
16381653
timeout:
1639-
description: Timeout sets health check timeout in seconds.
1654+
description: |-
1655+
Timeout sets health check timeout in seconds.
1656+
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
1657+
maximum: 254
1658+
minimum: 1
16401659
type: integer
16411660
type: object
16421661
type: object
@@ -1713,9 +1732,8 @@ spec:
17131732
them if they are set on the port level.
17141733
properties:
17151734
discovery:
1716-
description: |-
1717-
Discovery configures service discovery for the upstream.
1718-
Deprecated: no longer supported in standalone mode.
1735+
description: Discovery configures service discovery for the
1736+
upstream.
17191737
properties:
17201738
args:
17211739
additionalProperties:
@@ -1735,9 +1753,8 @@ spec:
17351753
- type
17361754
type: object
17371755
healthCheck:
1738-
description: |-
1739-
HealthCheck defines the active and passive health check configuration for the upstream.
1740-
Deprecated: no longer supported in standalone mode.
1756+
description: HealthCheck defines the active and passive health
1757+
check configuration for the upstream.
17411758
properties:
17421759
active:
17431760
description: Active health checks proactively send requests
@@ -1780,7 +1797,7 @@ spec:
17801797
description: Port sets the upstream port.
17811798
format: int32
17821799
maximum: 65535
1783-
minimum: 0
1800+
minimum: 1
17841801
type: integer
17851802
requestHeaders:
17861803
description: RequestHeaders sets the request headers.
@@ -1795,6 +1812,7 @@ spec:
17951812
format: int64
17961813
type: integer
17971814
type:
1815+
default: http
17981816
description: Type is the health check type. Can be `http`,
17991817
`https`, or `tcp`.
18001818
enum:
@@ -1830,8 +1848,11 @@ spec:
18301848
minimum: 0
18311849
type: integer
18321850
timeout:
1833-
description: Timeout sets health check timeout in
1834-
seconds.
1851+
description: |-
1852+
Timeout sets health check timeout in seconds.
1853+
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
1854+
maximum: 254
1855+
minimum: 1
18351856
type: integer
18361857
type: object
18371858
type: object
@@ -1858,9 +1879,14 @@ spec:
18581879
type: integer
18591880
type: object
18601881
type:
1882+
default: http
18611883
description: |-
18621884
Type specifies the type of passive health check.
18631885
Can be `http`, `https`, or `tcp`.
1886+
enum:
1887+
- http
1888+
- https
1889+
- tcp
18641890
type: string
18651891
unhealthy:
18661892
description: Unhealthy defines the conditions under
@@ -1886,8 +1912,11 @@ spec:
18861912
minimum: 0
18871913
type: integer
18881914
timeout:
1889-
description: Timeout sets health check timeout in
1890-
seconds.
1915+
description: |-
1916+
Timeout sets health check timeout in seconds.
1917+
https://github.com/apache/apisix/blob/0151d9e35bba63d7c316187272d88e19db0be634/apisix/schema_def.lua#L196
1918+
maximum: 254
1919+
minimum: 1
18911920
type: integer
18921921
type: object
18931922
type: object
@@ -1950,6 +1979,8 @@ spec:
19501979
port:
19511980
description: Port is a Kubernetes Service port.
19521981
format: int32
1982+
maximum: 65535
1983+
minimum: 1
19531984
type: integer
19541985
retries:
19551986
description: |-
@@ -2976,6 +3007,9 @@ spec:
29763007
type: object
29773008
type: object
29783009
type: object
3010+
x-kubernetes-validations:
3011+
- message: exactly one of value or valueFrom must be specified
3012+
rule: has(self.value) != has(self.valueFrom)
29793013
type:
29803014
description: |-
29813015
Type specifies the type of authentication.
@@ -2986,6 +3020,10 @@ spec:
29863020
required:
29873021
- type
29883022
type: object
3023+
x-kubernetes-validations:
3024+
- message: adminKey must be specified when type is AdminKey
3025+
rule: 'self.type == ''AdminKey'' ? has(self.adminKey) :
3026+
true'
29893027
endpoints:
29903028
description: Endpoints specifies the list of control plane
29913029
endpoints.
@@ -3041,6 +3079,8 @@ spec:
30413079
items:
30423080
type: string
30433081
type: array
3082+
required:
3083+
- provider
30443084
type: object
30453085
type: object
30463086
served: true

‎charts/ingress-controller/templates/cluster_role.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ rules:
9191
- grpcroutes/status
9292
- httproutes/status
9393
- referencegrants/status
94+
- tcproutes/status
9495
verbs:
9596
- get
9697
- update
@@ -101,6 +102,7 @@ rules:
101102
- grpcroutes
102103
- httproutes
103104
- referencegrants
105+
- tcproutes
104106
verbs:
105107
- get
106108
- list

‎charts/ingress-controller/templates/webhook.yaml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,72 @@ webhooks:
202202
apiGroups: ["gateway.networking.k8s.io"]
203203
apiVersions: ["v1"]
204204
resources: ["gateways"]
205+
- name: vgrpcroute-v1.kb.io
206+
admissionReviewVersions: ["v1"]
207+
clientConfig:
208+
{{- if not .Values.webhook.certificate.provided }}
209+
caBundle: {{ b64enc $caCert }}
210+
{{- else }}
211+
caBundle: {{ .Values.webhook.certificate.caBundle }}
212+
{{- end }}
213+
service:
214+
name: {{ include "api7-ingress-controller-manager.webhook.serviceName" . }}
215+
namespace: {{ .Release.Namespace }}
216+
path: /validate-gateway-networking-k8s-io-v1-grpcroute
217+
failurePolicy: {{ .Values.webhook.failurePolicy }}
218+
{{- with .Values.webhook.timeoutSeconds }}
219+
timeoutSeconds: {{ . }}
220+
{{- end }}
221+
sideEffects: None
222+
rules:
223+
- operations: ["CREATE", "UPDATE"]
224+
apiGroups: ["gateway.networking.k8s.io"]
225+
apiVersions: ["v1"]
226+
resources: ["grpcroutes"]
227+
- name: vhttproute-v1.kb.io
228+
admissionReviewVersions: ["v1"]
229+
clientConfig:
230+
{{- if not .Values.webhook.certificate.provided }}
231+
caBundle: {{ b64enc $caCert }}
232+
{{- else }}
233+
caBundle: {{ .Values.webhook.certificate.caBundle }}
234+
{{- end }}
235+
service:
236+
name: {{ include "api7-ingress-controller-manager.webhook.serviceName" . }}
237+
namespace: {{ .Release.Namespace }}
238+
path: /validate-gateway-networking-k8s-io-v1-httproute
239+
failurePolicy: {{ .Values.webhook.failurePolicy }}
240+
{{- with .Values.webhook.timeoutSeconds }}
241+
timeoutSeconds: {{ . }}
242+
{{- end }}
243+
sideEffects: None
244+
rules:
245+
- operations: ["CREATE", "UPDATE"]
246+
apiGroups: ["gateway.networking.k8s.io"]
247+
apiVersions: ["v1"]
248+
resources: ["httproutes"]
249+
- name: vtcproute-v1alpha2.kb.io
250+
admissionReviewVersions: ["v1"]
251+
clientConfig:
252+
{{- if not .Values.webhook.certificate.provided }}
253+
caBundle: {{ b64enc $caCert }}
254+
{{- else }}
255+
caBundle: {{ .Values.webhook.certificate.caBundle }}
256+
{{- end }}
257+
service:
258+
name: {{ include "api7-ingress-controller-manager.webhook.serviceName" . }}
259+
namespace: {{ .Release.Namespace }}
260+
path: /validate-gateway-networking-k8s-io-v1alpha2-tcproute
261+
failurePolicy: {{ .Values.webhook.failurePolicy }}
262+
{{- with .Values.webhook.timeoutSeconds }}
263+
timeoutSeconds: {{ . }}
264+
{{- end }}
265+
sideEffects: None
266+
rules:
267+
- operations: ["CREATE", "UPDATE"]
268+
apiGroups: ["gateway.networking.k8s.io"]
269+
apiVersions: ["v1alpha2"]
270+
resources: ["tcproutes"]
205271

206272
---
207273
apiVersion: v1

‎charts/ingress-controller/values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ deployment:
3131
image:
3232
repository: api7/api7-ingress-controller
3333
pullPolicy: IfNotPresent
34-
tag: "2.0.8"
34+
tag: "2.0.9"
3535
# -- Set pod resource requests & limits
3636
resources: {}
3737

3838
adc:
3939
image:
4040
repository: ghcr.io/api7/adc
41-
tag: "0.21.1"
41+
tag: "0.21.2"
4242
pullPolicy: IfNotPresent
4343
resources: {}
4444
securityContext: {}

0 commit comments

Comments
 (0)