Skip to content

Commit 069bd0a

Browse files
oktalzoktalz
committed
BUILD/MINOR: remove controller-gen annotation from CRDs
1 parent 03a41fb commit 069bd0a

File tree

8 files changed

+59
-129
lines changed

8 files changed

+59
-129
lines changed

‎crs/code-generator.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,5 @@ go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERS
9393
# Controller-gen version
9494
echo "Controller-gen: " ${CONTROLLER_GEN_VERSION}
9595
controller-gen crd paths=./crs/api/ingress/... output:crd:dir=./crs/definition
96+
# remove code-gen annotation (dependabot fails)
97+
find ${CR_DIR}/definition -type f -name '*.yaml' -exec sed -i '/controller-gen.kubebuilder.io\/version/d' {} +

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
76
haproxy.org/client-native: v5.1.4
87
name: backends.ingress.v1.haproxy.org
98
spec:
@@ -44,21 +43,17 @@ spec:
4443
description: |-
4544
Acls ACL Lines Array
4645
47-
4846
HAProxy ACL lines array (corresponds to acl directives)
4947
50-
5148
swagger:model acls
5249
items:
5350
description: |-
5451
ACL ACL Lines
5552
56-
5753
The use of Access Control Lists (ACL) provides a flexible solution to perform
5854
content switching and generally to take decisions based on content extracted
5955
from the request, the response or any environmental status.
6056
61-
6257
swagger:model acl
6358
properties:
6459
acl_name:
@@ -94,11 +89,9 @@ spec:
9489
description: |-
9590
Backend Backend
9691
97-
9892
HAProxy backend configuration
9993
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"}
10094
101-
10295
swagger:model backend
10396
properties:
10497
abortonclose:
@@ -292,7 +285,6 @@ spec:
292285
description: |-
293286
Attr attr
294287
295-
296288
swagger:model Attr
297289
properties:
298290
value:
@@ -309,7 +301,6 @@ spec:
309301
description: |-
310302
Domain domain
311303
312-
313304
swagger:model Domain
314305
properties:
315306
value:
@@ -994,7 +985,6 @@ spec:
994985
description: |-
995986
Errorfile errorfile
996987
997-
998988
swagger:model errorfile
999989
properties:
1000990
code:
@@ -1032,7 +1022,6 @@ spec:
10321022
description: |-
10331023
Errorfiles errorfiles
10341024
1035-
10361025
swagger:model errorfiles
10371026
properties:
10381027
codes:
@@ -1293,7 +1282,6 @@ spec:
12931282
description: |-
12941283
ReturnHeader return header
12951284
1296-
12971285
swagger:model ReturnHeader
12981286
properties:
12991287
fmt:
@@ -1928,7 +1916,6 @@ spec:
19281916
description: |-
19291917
StatsAuth stats auth
19301918
1931-
19321919
swagger:model stats_auth
19331920
properties:
19341921
passwd:
@@ -1958,7 +1945,6 @@ spec:
19581945
description: |-
19591946
StatsHTTPRequest stats http request
19601947
1961-
19621948
swagger:model stats_http_request
19631949
properties:
19641950
cond:
@@ -2123,20 +2109,16 @@ spec:
21232109
description: |-
21242110
HTTPRequestRules HTTP Request Rules Array
21252111
2126-
21272112
HAProxy HTTP request rules array (corresponds to http-request directives)
21282113
2129-
21302114
swagger:model http_request_rules
21312115
items:
21322116
description: |-
21332117
HTTPRequestRule HTTP Request Rule
21342118
2135-
21362119
HAProxy HTTP request rule configuration (corresponds to http-request directives)
21372120
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"}
21382121
2139-
21402122
swagger:model http_request_rule
21412123
properties:
21422124
acl_file:
@@ -2403,7 +2385,6 @@ spec:
24032385
description: |-
24042386
ReturnHeader return header
24052387
2406-
24072388
swagger:model ReturnHeader
24082389
properties:
24092390
fmt:

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
76
haproxy.org/client-native: v5.1.4
87
name: defaults.ingress.v1.haproxy.org
98
spec:
@@ -44,10 +43,8 @@ spec:
4443
description: |-
4544
Defaults Defaults
4645
47-
4846
# HAProxy defaults configuration
4947
50-
5148
swagger:model defaults
5249
properties:
5350
abortonclose:
@@ -291,7 +288,6 @@ spec:
291288
description: |-
292289
Attr attr
293290
294-
295291
swagger:model Attr
296292
properties:
297293
value:
@@ -308,7 +304,6 @@ spec:
308304
description: |-
309305
Domain domain
310306
311-
312307
swagger:model Domain
313308
properties:
314309
value:
@@ -1020,7 +1015,6 @@ spec:
10201015
description: |-
10211016
Errorfile errorfile
10221017
1023-
10241018
swagger:model errorfile
10251019
properties:
10261020
code:
@@ -1061,7 +1055,6 @@ spec:
10611055
description: |-
10621056
Errorfiles errorfiles
10631057
1064-
10651058
swagger:model errorfiles
10661059
properties:
10671060
codes:
@@ -1309,7 +1302,6 @@ spec:
13091302
description: |-
13101303
ReturnHeader return header
13111304
1312-
13131305
swagger:model ReturnHeader
13141306
properties:
13151307
fmt:
@@ -1945,7 +1937,6 @@ spec:
19451937
description: |-
19461938
StatsAuth stats auth
19471939
1948-
19491940
swagger:model stats_auth
19501941
properties:
19511942
passwd:
@@ -1975,7 +1966,6 @@ spec:
19751966
description: |-
19761967
StatsHTTPRequest stats http request
19771968
1978-
19791969
swagger:model stats_http_request
19801970
properties:
19811971
cond:

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
76
haproxy.org/client-native: v5.1.4
87
name: globals.ingress.v1.haproxy.org
98
spec:
@@ -44,10 +43,8 @@ spec:
4443
description: |-
4544
Global Global
4645
47-
4846
# HAProxy global configuration
4947
50-
5148
swagger:model global
5249
properties:
5350
anonkey:
@@ -84,7 +81,6 @@ spec:
8481
description: |-
8582
CPUMap CPU map
8683
87-
8884
swagger:model CPUMap
8985
properties:
9086
cpu_set:
@@ -198,7 +194,6 @@ spec:
198194
description: |-
199195
H1CaseAdjust h1 case adjust
200196
201-
202197
swagger:model H1CaseAdjust
203198
properties:
204199
from:
@@ -322,7 +317,6 @@ spec:
322317
description: |-
323318
LuaLoad lua load
324319
325-
326320
swagger:model LuaLoad
327321
properties:
328322
file:
@@ -342,7 +336,6 @@ spec:
342336
description: |-
343337
LuaPrependPath lua prepend path
344338
345-
346339
swagger:model LuaPrependPath
347340
properties:
348341
path:
@@ -472,7 +465,6 @@ spec:
472465
description: |-
473466
PresetEnv preset env
474467
475-
476468
swagger:model PresetEnv
477469
properties:
478470
name:
@@ -511,7 +503,6 @@ spec:
511503
description: |-
512504
RuntimeAPI runtime API
513505
514-
515506
swagger:model RuntimeAPI
516507
properties:
517508
accept_netscaler_cip:
@@ -830,7 +821,6 @@ spec:
830821
description: |-
831822
SetVar set var
832823
833-
834824
swagger:model SetVar
835825
properties:
836826
expr:
@@ -854,7 +844,6 @@ spec:
854844
description: |-
855845
SetVarFmt set var fmt
856846
857-
858847
swagger:model SetVarFmt
859848
properties:
860849
format:
@@ -884,7 +873,6 @@ spec:
884873
description: |-
885874
SetEnv set env
886875
887-
888876
swagger:model SetEnv
889877
properties:
890878
name:
@@ -951,7 +939,6 @@ spec:
951939
description: |-
952940
SslEngine ssl engine
953941
954-
955942
swagger:model SslEngine
956943
properties:
957944
algorithms:
@@ -1014,7 +1001,6 @@ spec:
10141001
description: |-
10151002
ThreadGroup thread group
10161003
1017-
10181004
swagger:model ThreadGroup
10191005
properties:
10201006
group:
@@ -1490,19 +1476,15 @@ spec:
14901476
description: |-
14911477
LogTargets Log Target Array
14921478
1493-
14941479
HAProxy log target array (corresponds to log directives)
14951480
1496-
14971481
swagger:model log_targets
14981482
items:
14991483
description: |-
15001484
LogTarget Log Target
15011485
1502-
15031486
Per-instance logging of events and traffic.
15041487
1505-
15061488
swagger:model log_target
15071489
properties:
15081490
address:

0 commit comments

Comments
 (0)