Skip to content

Commit 0e61c24

Browse files
oktalzoktalz
committed
BUILD/MINOR: ci: align crd generation with new kubebuilder
1 parent 3ab6796 commit 0e61c24

5 files changed

+5
-78
lines changed

‎.aspell.yml

+1
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ allowed:
3333
- unix
3434
- parallelize
3535
- maxconn
36+
- kubebuilder

‎crs/definition/ingress.v1.haproxy.org_backends.yaml

+1-21
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
haproxy.org/client-native: v5.1.15-0.20241106115115-75c12953fe1f
88
name: backends.ingress.v1.haproxy.org
99
spec:
@@ -44,21 +44,17 @@ spec:
4444
description: |-
4545
Acls ACL Lines Array
4646
47-
4847
HAProxy ACL lines array (corresponds to acl directives)
4948
50-
5149
swagger:model acls
5250
items:
5351
description: |-
5452
ACL ACL Lines
5553
56-
5754
The use of Access Control Lists (ACL) provides a flexible solution to perform
5855
content switching and generally to take decisions based on content extracted
5956
from the request, the response or any environmental status.
6057
61-
6258
swagger:model acl
6359
properties:
6460
acl_name:
@@ -93,11 +89,9 @@ spec:
9389
description: |-
9490
Backend Backend
9591
96-
9792
HAProxy backend configuration
9893
Example: {"adv_check":"httpchk","balance":{"algorithm":"roundrobin"},"forwardfor":{"enabled":"enabled"},"httpchk_params":{"method":"GET","uri":"/check","version":"HTTP/1.1"},"mode":"http","name":"test_backend"}
9994
100-
10195
swagger:model backend
10296
properties:
10397
abortonclose:
@@ -291,7 +285,6 @@ spec:
291285
description: |-
292286
Attr attr
293287
294-
295288
swagger:model Attr
296289
properties:
297290
value:
@@ -308,7 +301,6 @@ spec:
308301
description: |-
309302
Domain domain
310303
311-
312304
swagger:model Domain
313305
properties:
314306
value:
@@ -993,7 +985,6 @@ spec:
993985
description: |-
994986
Errorfile errorfile
995987
996-
997988
swagger:model errorfile
998989
properties:
999990
code:
@@ -1031,7 +1022,6 @@ spec:
10311022
description: |-
10321023
Errorfiles errorfiles
10331024
1034-
10351025
swagger:model errorfiles
10361026
properties:
10371027
codes:
@@ -1166,7 +1156,6 @@ spec:
11661156
description: |-
11671157
ForcePersist force persist
11681158
1169-
11701159
swagger:model ForcePersist
11711160
properties:
11721161
cond:
@@ -1324,7 +1313,6 @@ spec:
13241313
description: |-
13251314
ReturnHeader return header
13261315
1327-
13281316
swagger:model ReturnHeader
13291317
properties:
13301318
fmt:
@@ -1644,7 +1632,6 @@ spec:
16441632
description: |-
16451633
IgnorePersist ignore persist
16461634
1647-
16481635
swagger:model IgnorePersist
16491636
properties:
16501637
cond:
@@ -1986,7 +1973,6 @@ spec:
19861973
description: |-
19871974
StatsAuth stats auth
19881975
1989-
19901976
swagger:model stats_auth
19911977
properties:
19921978
passwd:
@@ -2016,7 +2002,6 @@ spec:
20162002
description: |-
20172003
StatsHTTPRequest stats http request
20182004
2019-
20202005
swagger:model stats_http_request
20212006
properties:
20222007
cond:
@@ -2181,20 +2166,16 @@ spec:
21812166
description: |-
21822167
HTTPRequestRules HTTP Request Rules Array
21832168
2184-
21852169
HAProxy HTTP request rules array (corresponds to http-request directives)
21862170
2187-
21882171
swagger:model http_request_rules
21892172
items:
21902173
description: |-
21912174
HTTPRequestRule HTTP Request Rule
21922175
2193-
21942176
HAProxy HTTP request rule configuration (corresponds to http-request directives)
21952177
Example: {"cond":"unless","cond_test":"{ src 192.168.0.0/16 }","hdr_format":"%T","hdr_name":"X-Haproxy-Current-Date","index":0,"type":"add-header"}
21962178
2197-
21982179
swagger:model http_request_rule
21992180
properties:
22002181
acl_file:
@@ -2461,7 +2442,6 @@ spec:
24612442
description: |-
24622443
ReturnHeader return header
24632444
2464-
24652445
swagger:model ReturnHeader
24662446
properties:
24672447
fmt:

‎crs/definition/ingress.v1.haproxy.org_defaults.yaml

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
haproxy.org/client-native: v5.1.15-0.20241106115115-75c12953fe1f
88
name: defaults.ingress.v1.haproxy.org
99
spec:
@@ -44,10 +44,8 @@ spec:
4444
description: |-
4545
Defaults Defaults
4646
47-
4847
# HAProxy defaults configuration
4948
50-
5149
swagger:model defaults
5250
properties:
5351
abortonclose:
@@ -291,7 +289,6 @@ spec:
291289
description: |-
292290
Attr attr
293291
294-
295292
swagger:model Attr
296293
properties:
297294
value:
@@ -308,7 +305,6 @@ spec:
308305
description: |-
309306
Domain domain
310307
311-
312308
swagger:model Domain
313309
properties:
314310
value:
@@ -1020,7 +1016,6 @@ spec:
10201016
description: |-
10211017
Errorfile errorfile
10221018
1023-
10241019
swagger:model errorfile
10251020
properties:
10261021
code:
@@ -1061,7 +1056,6 @@ spec:
10611056
description: |-
10621057
Errorfiles errorfiles
10631058
1064-
10651059
swagger:model errorfiles
10661060
properties:
10671061
codes:
@@ -1313,7 +1307,6 @@ spec:
13131307
description: |-
13141308
ReturnHeader return header
13151309
1316-
13171310
swagger:model ReturnHeader
13181311
properties:
13191312
fmt:
@@ -1948,7 +1941,6 @@ spec:
19481941
description: |-
19491942
StatsAuth stats auth
19501943
1951-
19521944
swagger:model stats_auth
19531945
properties:
19541946
passwd:
@@ -1978,7 +1970,6 @@ spec:
19781970
description: |-
19791971
StatsHTTPRequest stats http request
19801972
1981-
19821973
swagger:model stats_http_request
19831974
properties:
19841975
cond:

‎crs/definition/ingress.v1.haproxy.org_globals.yaml

+1-18
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
haproxy.org/client-native: v5.1.15-0.20241106115115-75c12953fe1f
88
name: globals.ingress.v1.haproxy.org
99
spec:
@@ -44,10 +44,8 @@ spec:
4444
description: |-
4545
Global Global
4646
47-
4847
# HAProxy global configuration
4948
50-
5149
swagger:model global
5250
properties:
5351
anonkey:
@@ -84,7 +82,6 @@ spec:
8482
description: |-
8583
CPUMap CPU map
8684
87-
8885
swagger:model CPUMap
8986
properties:
9087
cpu_set:
@@ -201,7 +198,6 @@ spec:
201198
description: |-
202199
H1CaseAdjust h1 case adjust
203200
204-
205201
swagger:model H1CaseAdjust
206202
properties:
207203
from:
@@ -328,7 +324,6 @@ spec:
328324
description: |-
329325
LuaLoad lua load
330326
331-
332327
swagger:model LuaLoad
333328
properties:
334329
file:
@@ -348,7 +343,6 @@ spec:
348343
description: |-
349344
LuaPrependPath lua prepend path
350345
351-
352346
swagger:model LuaPrependPath
353347
properties:
354348
path:
@@ -478,7 +472,6 @@ spec:
478472
description: |-
479473
PresetEnv preset env
480474
481-
482475
swagger:model PresetEnv
483476
properties:
484477
name:
@@ -517,7 +510,6 @@ spec:
517510
description: |-
518511
RuntimeAPI runtime API
519512
520-
521513
swagger:model RuntimeAPI
522514
properties:
523515
accept_netscaler_cip:
@@ -836,7 +828,6 @@ spec:
836828
description: |-
837829
SetVar set var
838830
839-
840831
swagger:model SetVar
841832
properties:
842833
expr:
@@ -860,7 +851,6 @@ spec:
860851
description: |-
861852
SetVarFmt set var fmt
862853
863-
864854
swagger:model SetVarFmt
865855
properties:
866856
format:
@@ -890,7 +880,6 @@ spec:
890880
description: |-
891881
SetEnv set env
892882
893-
894883
swagger:model SetEnv
895884
properties:
896885
name:
@@ -957,7 +946,6 @@ spec:
957946
description: |-
958947
SslEngine ssl engine
959948
960-
961949
swagger:model SslEngine
962950
properties:
963951
algorithms:
@@ -1020,7 +1008,6 @@ spec:
10201008
description: |-
10211009
ThreadGroup thread group
10221010
1023-
10241011
swagger:model ThreadGroup
10251012
properties:
10261013
group:
@@ -1496,19 +1483,15 @@ spec:
14961483
description: |-
14971484
LogTargets Log Target Array
14981485
1499-
15001486
HAProxy log target array (corresponds to log directives)
15011487
1502-
15031488
swagger:model log_targets
15041489
items:
15051490
description: |-
15061491
LogTarget Log Target
15071492
1508-
15091493
Per-instance logging of events and traffic.
15101494
1511-
15121495
swagger:model log_target
15131496
properties:
15141497
address:

0 commit comments

Comments
 (0)