Skip to content

Commit ae37c82

Browse files
michaelvlmichaelvl
committed
update dependencies, rerun controller-gen
1 parent 698b6a7 commit ae37c82

File tree

8 files changed

+71
-134
lines changed

8 files changed

+71
-134
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
197197

198198
## Tool Versions
199199
KUSTOMIZE_VERSION ?= v4.5.5
200-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
200+
CONTROLLER_TOOLS_VERSION ?= v0.17.0
201201
ENVTEST_VERSION ?= release-0.19
202202

203203
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"

‎config/crd/bases/gateway.tv2.dk_gatewayclassblueprints.yaml‎

Lines changed: 4 additions & 17 deletions
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
name: gatewayclassblueprints.gateway.tv2.dk
88
spec:
99
group: gateway.tv2.dk
@@ -94,16 +94,8 @@ spec:
9494
this GatewayClassParameter. Updates follow the same
9595
specification as conditions for GatewayClass.
9696
items:
97-
description: "Condition contains details for one aspect of the current
98-
state of this API Resource.\n---\nThis struct is intended for
99-
direct use as an array at the field path .status.conditions. For
100-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
101-
observations of a foo's current state.\n\t // Known .status.conditions.type
102-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
103-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
104-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
105-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
106-
\ // other fields\n\t}"
97+
description: Condition contains details for one aspect of the current
98+
state of this API Resource.
10799
properties:
108100
lastTransitionTime:
109101
description: |-
@@ -144,12 +136,7 @@ spec:
144136
- Unknown
145137
type: string
146138
type:
147-
description: |-
148-
type of condition in CamelCase or in foo.example.com/CamelCase.
149-
---
150-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
151-
useful (see .node.status.conditions), the ability to deconflict is important.
152-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
139+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
153140
maxLength: 316
154141
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
155142
type: string

‎config/crd/bases/gateway.tv2.dk_gatewayclassconfigs.yaml‎

Lines changed: 4 additions & 17 deletions
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
name: gatewayclassconfigs.gateway.tv2.dk
88
spec:
99
group: gateway.tv2.dk
@@ -95,16 +95,8 @@ spec:
9595
properties:
9696
conditions:
9797
items:
98-
description: "Condition contains details for one aspect of the current
99-
state of this API Resource.\n---\nThis struct is intended for
100-
direct use as an array at the field path .status.conditions. For
101-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
102-
observations of a foo's current state.\n\t // Known .status.conditions.type
103-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
104-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
105-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
106-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
107-
\ // other fields\n\t}"
98+
description: Condition contains details for one aspect of the current
99+
state of this API Resource.
108100
properties:
109101
lastTransitionTime:
110102
description: |-
@@ -145,12 +137,7 @@ spec:
145137
- Unknown
146138
type: string
147139
type:
148-
description: |-
149-
type of condition in CamelCase or in foo.example.com/CamelCase.
150-
---
151-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
152-
useful (see .node.status.conditions), the ability to deconflict is important.
153-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
140+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
154141
maxLength: 316
155142
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
156143
type: string

‎config/crd/bases/gateway.tv2.dk_gatewayconfigs.yaml‎

Lines changed: 4 additions & 17 deletions
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
name: gatewayconfigs.gateway.tv2.dk
88
spec:
99
group: gateway.tv2.dk
@@ -95,16 +95,8 @@ spec:
9595
properties:
9696
conditions:
9797
items:
98-
description: "Condition contains details for one aspect of the current
99-
state of this API Resource.\n---\nThis struct is intended for
100-
direct use as an array at the field path .status.conditions. For
101-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
102-
observations of a foo's current state.\n\t // Known .status.conditions.type
103-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
104-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
105-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
106-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
107-
\ // other fields\n\t}"
98+
description: Condition contains details for one aspect of the current
99+
state of this API Resource.
108100
properties:
109101
lastTransitionTime:
110102
description: |-
@@ -145,12 +137,7 @@ spec:
145137
- Unknown
146138
type: string
147139
type:
148-
description: |-
149-
type of condition in CamelCase or in foo.example.com/CamelCase.
150-
---
151-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
152-
useful (see .node.status.conditions), the ability to deconflict is important.
153-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
140+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
154141
maxLength: 316
155142
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
156143
type: string

‎config/rbac/role.yaml‎

Lines changed: 8 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -16,45 +16,24 @@ rules:
1616
- gateway.networking.k8s.io
1717
resources:
1818
- gatewayclasses/finalizers
19-
verbs:
20-
- update
21-
- apiGroups:
22-
- gateway.networking.k8s.io
23-
resources:
24-
- gatewayclasses/status
25-
verbs:
26-
- get
27-
- patch
28-
- update
29-
- apiGroups:
30-
- gateway.networking.k8s.io
31-
resources:
32-
- gateways
33-
verbs:
34-
- create
35-
- delete
36-
- get
37-
- list
38-
- patch
39-
- update
40-
- watch
41-
- apiGroups:
42-
- gateway.networking.k8s.io
43-
resources:
4419
- gateways/finalizers
20+
- httproutes/finalizers
4521
verbs:
4622
- update
4723
- apiGroups:
4824
- gateway.networking.k8s.io
4925
resources:
26+
- gatewayclasses/status
5027
- gateways/status
28+
- httproutes/status
5129
verbs:
5230
- get
5331
- patch
5432
- update
5533
- apiGroups:
5634
- gateway.networking.k8s.io
5735
resources:
36+
- gateways
5837
- httproutes
5938
verbs:
6039
- create
@@ -64,67 +43,11 @@ rules:
6443
- patch
6544
- update
6645
- watch
67-
- apiGroups:
68-
- gateway.networking.k8s.io
69-
resources:
70-
- httproutes/finalizers
71-
verbs:
72-
- update
73-
- apiGroups:
74-
- gateway.networking.k8s.io
75-
resources:
76-
- httproutes/status
77-
verbs:
78-
- get
79-
- patch
80-
- update
8146
- apiGroups:
8247
- gateway.tv2.dk
8348
resources:
8449
- gatewayclassblueprints
85-
verbs:
86-
- get
87-
- list
88-
- watch
89-
- apiGroups:
90-
- gateway.tv2.dk
91-
resources:
92-
- gatewayclassblueprints/finalizers
93-
verbs:
94-
- update
95-
- apiGroups:
96-
- gateway.tv2.dk
97-
resources:
98-
- gatewayclassblueprints/status
99-
verbs:
100-
- get
101-
- patch
102-
- update
103-
- apiGroups:
104-
- gateway.tv2.dk
105-
resources:
10650
- gatewayclassconfigs
107-
verbs:
108-
- get
109-
- list
110-
- watch
111-
- apiGroups:
112-
- gateway.tv2.dk
113-
resources:
114-
- gatewayclassconfigs/finalizers
115-
verbs:
116-
- update
117-
- apiGroups:
118-
- gateway.tv2.dk
119-
resources:
120-
- gatewayclassconfigs/status
121-
verbs:
122-
- get
123-
- patch
124-
- update
125-
- apiGroups:
126-
- gateway.tv2.dk
127-
resources:
12851
- gatewayconfigs
12952
verbs:
13053
- get
@@ -133,12 +56,16 @@ rules:
13356
- apiGroups:
13457
- gateway.tv2.dk
13558
resources:
59+
- gatewayclassblueprints/finalizers
60+
- gatewayclassconfigs/finalizers
13661
- gatewayconfigs/finalizers
13762
verbs:
13863
- update
13964
- apiGroups:
14065
- gateway.tv2.dk
14166
resources:
67+
- gatewayclassblueprints/status
68+
- gatewayclassconfigs/status
14269
- gatewayconfigs/status
14370
verbs:
14471
- get

‎devbox.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"packages": [
44
"gnumake@4.4.1",
55
"go@1.23.4",
6+
"goreleaser@2.5.0",
67
"kind@0.24.0",
78
"kubebuilder@4.3.1",
89
"kubectl@1.25.3",

‎devbox.lock‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,54 @@
141141
}
142142
}
143143
},
144+
"goreleaser@2.5.0": {
145+
"last_modified": "2024-12-23T21:10:33Z",
146+
"resolved": "github:NixOS/nixpkgs/de1864217bfa9b5845f465e771e0ecb48b30e02d#goreleaser",
147+
"source": "devbox-search",
148+
"version": "2.5.0",
149+
"systems": {
150+
"aarch64-darwin": {
151+
"outputs": [
152+
{
153+
"name": "out",
154+
"path": "/nix/store/hzjvqmncvdparwa3z982wa4w61l5amp2-goreleaser-2.5.0",
155+
"default": true
156+
}
157+
],
158+
"store_path": "/nix/store/hzjvqmncvdparwa3z982wa4w61l5amp2-goreleaser-2.5.0"
159+
},
160+
"aarch64-linux": {
161+
"outputs": [
162+
{
163+
"name": "out",
164+
"path": "/nix/store/ajbqv2sy1fd7rl1vwb5l5p2vg6jh7xj8-goreleaser-2.5.0",
165+
"default": true
166+
}
167+
],
168+
"store_path": "/nix/store/ajbqv2sy1fd7rl1vwb5l5p2vg6jh7xj8-goreleaser-2.5.0"
169+
},
170+
"x86_64-darwin": {
171+
"outputs": [
172+
{
173+
"name": "out",
174+
"path": "/nix/store/q990b110bj4sqlszzlz7l2yplm7h2pl8-goreleaser-2.5.0",
175+
"default": true
176+
}
177+
],
178+
"store_path": "/nix/store/q990b110bj4sqlszzlz7l2yplm7h2pl8-goreleaser-2.5.0"
179+
},
180+
"x86_64-linux": {
181+
"outputs": [
182+
{
183+
"name": "out",
184+
"path": "/nix/store/l2c2ksqwkmdrjri613jq4z13d8z68ja9-goreleaser-2.5.0",
185+
"default": true
186+
}
187+
],
188+
"store_path": "/nix/store/l2c2ksqwkmdrjri613jq4z13d8z68ja9-goreleaser-2.5.0"
189+
}
190+
}
191+
},
144192
"kind@0.24.0": {
145193
"last_modified": "2024-12-03T12:40:06Z",
146194
"resolved": "github:NixOS/nixpkgs/566e53c2ad750c84f6d31f9ccb9d00f823165550#kind",

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/tv2-oss/bifrost-gateway-controller
22

3-
go 1.19
3+
go 1.23
44

55
require (
66
github.com/Masterminds/sprig/v3 v3.2.3

0 commit comments

Comments
 (0)