Skip to content

Commit

Permalink
BUILD/MINOR: ci: align crd generation with new kubebuilder
Browse files Browse the repository at this point in the history
  • Loading branch information
@oktalz
oktalz committed Jan 10, 2025
1 parent 1488a03 commit 0574902
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 78 deletions.
1 change: 1 addition & 0 deletions .aspell.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ allowed:
- unix
- parallelize
- maxconn
- kubebuilder
22 changes: 1 addition & 21 deletions crs/definition/ingress.v1.haproxy.org_backends.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.17.0
haproxy.org/client-native: v5.1.16-0.20241206145631-acb903fd9ec2
name: backends.ingress.v1.haproxy.org
spec:
Expand Down Expand Up @@ -44,21 +44,17 @@ spec:
description: |-
Acls ACL Lines Array
HAProxy ACL lines array (corresponds to acl directives)
swagger:model acls
items:
description: |-
ACL ACL Lines
The use of Access Control Lists (ACL) provides a flexible solution to perform
content switching and generally to take decisions based on content extracted
from the request, the response or any environmental status.
swagger:model acl
properties:
acl_name:
Expand Down Expand Up @@ -93,11 +89,9 @@ spec:
description: |-
Backend Backend
HAProxy backend configuration
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"}
swagger:model backend
properties:
abortonclose:
Expand Down Expand Up @@ -291,7 +285,6 @@ spec:
description: |-
Attr attr
swagger:model Attr
properties:
value:
Expand All @@ -308,7 +301,6 @@ spec:
description: |-
Domain domain
swagger:model Domain
properties:
value:
Expand Down Expand Up @@ -993,7 +985,6 @@ spec:
description: |-
Errorfile errorfile
swagger:model errorfile
properties:
code:
Expand Down Expand Up @@ -1031,7 +1022,6 @@ spec:
description: |-
Errorfiles errorfiles
swagger:model errorfiles
properties:
codes:
Expand Down Expand Up @@ -1166,7 +1156,6 @@ spec:
description: |-
ForcePersist force persist
swagger:model ForcePersist
properties:
cond:
Expand Down Expand Up @@ -1324,7 +1313,6 @@ spec:
description: |-
ReturnHeader return header
swagger:model ReturnHeader
properties:
fmt:
Expand Down Expand Up @@ -1644,7 +1632,6 @@ spec:
description: |-
IgnorePersist ignore persist
swagger:model IgnorePersist
properties:
cond:
Expand Down Expand Up @@ -1986,7 +1973,6 @@ spec:
description: |-
StatsAuth stats auth
swagger:model stats_auth
properties:
passwd:
Expand Down Expand Up @@ -2016,7 +2002,6 @@ spec:
description: |-
StatsHTTPRequest stats http request
swagger:model stats_http_request
properties:
cond:
Expand Down Expand Up @@ -2181,20 +2166,16 @@ spec:
description: |-
HTTPRequestRules HTTP Request Rules Array
HAProxy HTTP request rules array (corresponds to http-request directives)
swagger:model http_request_rules
items:
description: |-
HTTPRequestRule HTTP Request Rule
HAProxy HTTP request rule configuration (corresponds to http-request directives)
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"}
swagger:model http_request_rule
properties:
acl_file:
Expand Down Expand Up @@ -2461,7 +2442,6 @@ spec:
description: |-
ReturnHeader return header
swagger:model ReturnHeader
properties:
fmt:
Expand Down
11 changes: 1 addition & 10 deletions crs/definition/ingress.v1.haproxy.org_defaults.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.17.0
haproxy.org/client-native: v5.1.16-0.20241206145631-acb903fd9ec2
name: defaults.ingress.v1.haproxy.org
spec:
Expand Down Expand Up @@ -44,10 +44,8 @@ spec:
description: |-
Defaults Defaults
# HAProxy defaults configuration
swagger:model defaults
properties:
abortonclose:
Expand Down Expand Up @@ -291,7 +289,6 @@ spec:
description: |-
Attr attr
swagger:model Attr
properties:
value:
Expand All @@ -308,7 +305,6 @@ spec:
description: |-
Domain domain
swagger:model Domain
properties:
value:
Expand Down Expand Up @@ -1020,7 +1016,6 @@ spec:
description: |-
Errorfile errorfile
swagger:model errorfile
properties:
code:
Expand Down Expand Up @@ -1061,7 +1056,6 @@ spec:
description: |-
Errorfiles errorfiles
swagger:model errorfiles
properties:
codes:
Expand Down Expand Up @@ -1313,7 +1307,6 @@ spec:
description: |-
ReturnHeader return header
swagger:model ReturnHeader
properties:
fmt:
Expand Down Expand Up @@ -1948,7 +1941,6 @@ spec:
description: |-
StatsAuth stats auth
swagger:model stats_auth
properties:
passwd:
Expand Down Expand Up @@ -1978,7 +1970,6 @@ spec:
description: |-
StatsHTTPRequest stats http request
swagger:model stats_http_request
properties:
cond:
Expand Down
19 changes: 1 addition & 18 deletions crs/definition/ingress.v1.haproxy.org_globals.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.17.0
haproxy.org/client-native: v5.1.16-0.20241206145631-acb903fd9ec2
name: globals.ingress.v1.haproxy.org
spec:
Expand Down Expand Up @@ -44,10 +44,8 @@ spec:
description: |-
Global Global
# HAProxy global configuration
swagger:model global
properties:
anonkey:
Expand Down Expand Up @@ -84,7 +82,6 @@ spec:
description: |-
CPUMap CPU map
swagger:model CPUMap
properties:
cpu_set:
Expand Down Expand Up @@ -201,7 +198,6 @@ spec:
description: |-
H1CaseAdjust h1 case adjust
swagger:model H1CaseAdjust
properties:
from:
Expand Down Expand Up @@ -328,7 +324,6 @@ spec:
description: |-
LuaLoad lua load
swagger:model LuaLoad
properties:
file:
Expand All @@ -348,7 +343,6 @@ spec:
description: |-
LuaPrependPath lua prepend path
swagger:model LuaPrependPath
properties:
path:
Expand Down Expand Up @@ -478,7 +472,6 @@ spec:
description: |-
PresetEnv preset env
swagger:model PresetEnv
properties:
name:
Expand Down Expand Up @@ -517,7 +510,6 @@ spec:
description: |-
RuntimeAPI runtime API
swagger:model RuntimeAPI
properties:
accept_netscaler_cip:
Expand Down Expand Up @@ -836,7 +828,6 @@ spec:
description: |-
SetVar set var
swagger:model SetVar
properties:
expr:
Expand All @@ -860,7 +851,6 @@ spec:
description: |-
SetVarFmt set var fmt
swagger:model SetVarFmt
properties:
format:
Expand Down Expand Up @@ -890,7 +880,6 @@ spec:
description: |-
SetEnv set env
swagger:model SetEnv
properties:
name:
Expand Down Expand Up @@ -957,7 +946,6 @@ spec:
description: |-
SslEngine ssl engine
swagger:model SslEngine
properties:
algorithms:
Expand Down Expand Up @@ -1020,7 +1008,6 @@ spec:
description: |-
ThreadGroup thread group
swagger:model ThreadGroup
properties:
group:
Expand Down Expand Up @@ -1496,19 +1483,15 @@ spec:
description: |-
LogTargets Log Target Array
HAProxy log target array (corresponds to log directives)
swagger:model log_targets
items:
description: |-
LogTarget Log Target
Per-instance logging of events and traffic.
swagger:model log_target
properties:
address:
Expand Down
Loading

0 comments on commit 0574902

Please sign in to comment.