Skip to content

Commit 0339524

Browse files
oktalzoktalz
committed
BUILD/MINOR: remove controller-gen annotation from CRDs
1 parent e5f2247 commit 0339524

7 files changed

+81
-111
lines changed

‎crs/code-generator.sh

+2
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,5 @@ go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERS
9292
# Controller-gen version
9393
echo "Controller-gen: " ${CONTROLLER_GEN_VERSION}
9494
controller-gen crd paths=./crs/api/ingress/... output:crd:dir=./crs/definition
95+
# remove code-gen annotation (dependabot fails)
96+
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

-10
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,11 +43,9 @@ spec:
4443
description: |-
4544
Backend Backend
4645
47-
4846
HAProxy backend configuration
4947
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"}
5048
51-
5249
swagger:model backend
5350
properties:
5451
abortonclose:
@@ -242,7 +239,6 @@ spec:
242239
description: |-
243240
Attr attr
244241
245-
246242
swagger:model Attr
247243
properties:
248244
value:
@@ -259,7 +255,6 @@ spec:
259255
description: |-
260256
Domain domain
261257
262-
263258
swagger:model Domain
264259
properties:
265260
value:
@@ -944,7 +939,6 @@ spec:
944939
description: |-
945940
Errorfile errorfile
946941
947-
948942
swagger:model errorfile
949943
properties:
950944
code:
@@ -982,7 +976,6 @@ spec:
982976
description: |-
983977
Errorfiles errorfiles
984978
985-
986979
swagger:model errorfiles
987980
properties:
988981
codes:
@@ -1243,7 +1236,6 @@ spec:
12431236
description: |-
12441237
ReturnHeader return header
12451238
1246-
12471239
swagger:model ReturnHeader
12481240
properties:
12491241
fmt:
@@ -1878,7 +1870,6 @@ spec:
18781870
description: |-
18791871
StatsAuth stats auth
18801872
1881-
18821873
swagger:model stats_auth
18831874
properties:
18841875
passwd:
@@ -1908,7 +1899,6 @@ spec:
19081899
description: |-
19091900
StatsHTTPRequest stats http request
19101901
1911-
19121902
swagger:model stats_http_request
19131903
properties:
19141904
cond:

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

-10
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

-18
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:

‎go.mod

+21-22
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ require (
1313
github.com/haproxytech/config-parser/v5 v5.1.1
1414
github.com/jessevdk/go-flags v1.4.0
1515
github.com/pires/go-proxyproto v0.7.0
16-
github.com/prometheus/client_golang v1.18.0
16+
github.com/prometheus/client_golang v1.19.1
1717
github.com/stretchr/testify v1.9.0
1818
github.com/valyala/fasthttp v1.50.0
1919
go.uber.org/automaxprocs v1.5.3
2020
gopkg.in/yaml.v3 v3.0.1
21-
k8s.io/api v0.29.1
22-
k8s.io/apiextensions-apiserver v0.29.1
23-
k8s.io/apimachinery v0.29.1
24-
k8s.io/client-go v0.29.1
21+
k8s.io/api v0.32.0
22+
k8s.io/apiextensions-apiserver v0.32.0
23+
k8s.io/apimachinery v0.32.0
24+
k8s.io/client-go v0.32.0
2525
sigs.k8s.io/controller-runtime v0.16.2
26-
sigs.k8s.io/controller-tools v0.14.0
26+
sigs.k8s.io/controller-tools v0.17.1
2727
sigs.k8s.io/gateway-api v0.5.0
2828
sigs.k8s.io/yaml v1.4.0
2929
)
@@ -32,12 +32,12 @@ require (
3232
github.com/andybalholm/brotli v1.0.5 // indirect
3333
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3434
github.com/beorn7/perks v1.0.1 // indirect
35-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
36-
github.com/davecgh/go-spew v1.1.1 // indirect
35+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
36+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3737
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
38-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
3938
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
40-
github.com/go-logr/logr v1.4.1 // indirect
39+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
40+
github.com/go-logr/logr v1.4.2 // indirect
4141
github.com/go-openapi/analysis v0.22.2 // indirect
4242
github.com/go-openapi/errors v0.21.0 // indirect
4343
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -55,7 +55,6 @@ require (
5555
github.com/google/gofuzz v1.2.0 // indirect
5656
github.com/google/uuid v1.6.0 // indirect
5757
github.com/haproxytech/go-logger v1.1.0 // indirect
58-
github.com/imdario/mergo v0.3.16 // indirect
5958
github.com/josharian/intern v1.0.0 // indirect
6059
github.com/json-iterator/go v1.1.12 // indirect
6160
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
@@ -67,28 +66,28 @@ require (
6766
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6867
github.com/oklog/ulid v1.3.1 // indirect
6968
github.com/pkg/errors v0.9.1 // indirect
70-
github.com/pmezard/go-difflib v1.0.0 // indirect
71-
github.com/prometheus/client_model v0.5.0 // indirect
72-
github.com/prometheus/common v0.46.0 // indirect
73-
github.com/prometheus/procfs v0.12.0 // indirect
69+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
70+
github.com/prometheus/client_model v0.6.1 // indirect
71+
github.com/prometheus/common v0.55.0 // indirect
72+
github.com/prometheus/procfs v0.15.1 // indirect
7473
github.com/savsgio/gotils v0.0.0-20230208104028-c358bd845dee // indirect
7574
github.com/spf13/pflag v1.0.5 // indirect
7675
github.com/valyala/bytebufferpool v1.0.0 // indirect
76+
github.com/x448/float16 v0.8.4 // indirect
7777
go.mongodb.org/mongo-driver v1.13.1 // indirect
78-
go.uber.org/zap v1.26.0 // indirect
7978
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
8079
golang.org/x/net v0.34.0 // indirect
8180
golang.org/x/oauth2 v0.25.0 // indirect
8281
golang.org/x/sys v0.29.0 // indirect
8382
golang.org/x/term v0.28.0 // indirect
8483
golang.org/x/text v0.21.0 // indirect
8584
golang.org/x/time v0.9.0 // indirect
86-
google.golang.org/protobuf v1.34.2 // indirect
85+
google.golang.org/protobuf v1.35.1 // indirect
86+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8787
gopkg.in/inf.v0 v0.9.1 // indirect
88-
gopkg.in/yaml.v2 v2.4.0 // indirect
8988
k8s.io/klog/v2 v2.130.1 // indirect
90-
k8s.io/kube-openapi v0.0.0-20240726031636-6f6746feab9c // indirect
91-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
92-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
93-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
89+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
90+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
91+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
92+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
9493
)

0 commit comments

Comments
 (0)