Skip to content

Commit 698b6a7

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

File tree

9 files changed

+279
-150
lines changed

9 files changed

+279
-150
lines changed

‎Makefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ include Makefile.local
3232
# Image URL to use all building/pushing image targets
3333
IMG ?= ghcr.io/tv2-oss/bifrost-gateway-controller:latest
3434
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
35-
ENVTEST_K8S_VERSION = 1.25.0
35+
ENVTEST_K8S_VERSION = 1.30.0
3636

3737
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
3838
ifeq (,$(shell go env GOBIN))
@@ -197,7 +197,8 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
197197

198198
## Tool Versions
199199
KUSTOMIZE_VERSION ?= v4.5.5
200-
CONTROLLER_TOOLS_VERSION ?= v0.9.2
200+
CONTROLLER_TOOLS_VERSION ?= v0.14.0
201+
ENVTEST_VERSION ?= release-0.19
201202

202203
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
203204
.PHONY: kustomize
@@ -213,7 +214,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
213214
.PHONY: envtest
214215
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
215216
$(ENVTEST): $(LOCALBIN)
216-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
217+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@$(ENVTEST_VERSION)
217218

218219
.PHONY: lint
219220
lint:

‎apis/gateway.tv2.dk/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 54 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.9.2
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: gatewayclassblueprints.gateway.tv2.dk
98
spec:
109
group: gateway.tv2.dk
@@ -22,14 +21,19 @@ spec:
2221
a specific GatewayClass.
2322
properties:
2423
apiVersion:
25-
description: 'APIVersion defines the versioned schema of this representation
26-
of an object. Servers should convert recognized schemas to the latest
27-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
description: |-
25+
APIVersion defines the versioned schema of this representation of an object.
26+
Servers should convert recognized schemas to the latest internal value, and
27+
may reject unrecognized values.
28+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2829
type: string
2930
kind:
30-
description: 'Kind is a string value representing the REST resource this
31-
object represents. Servers may infer this from the endpoint the client
32-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
31+
description: |-
32+
Kind is a string value representing the REST resource this object represents.
33+
Servers may infer this from the endpoint the client submits requests to.
34+
Cannot be updated.
35+
In CamelCase.
36+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
3337
type: string
3438
metadata:
3539
type: object
@@ -63,12 +67,16 @@ spec:
6367
description: Template for hardcoded values
6468
properties:
6569
default:
66-
description: Defaults have precedence from GatewayConfig (highest)
67-
through GatewayClassConfig to GatewayClassBlueprint (lowest)
70+
description: |-
71+
Defaults have precedence from GatewayConfig (highest)
72+
through GatewayClassConfig to GatewayClassBlueprint
73+
(lowest)
6874
x-kubernetes-preserve-unknown-fields: true
6975
override:
70-
description: Overrides have precedence from GatewayClassBlueprint
71-
(highest) through GatewayClassConfig to GatewayConfig (lowest)
76+
description: |-
77+
Overrides have precedence from GatewayClassBlueprint
78+
(highest) through GatewayClassConfig to GatewayConfig
79+
(lowest)
7280
x-kubernetes-preserve-unknown-fields: true
7381
type: object
7482
type: object
@@ -81,47 +89,48 @@ spec:
8189
reason: Pending
8290
status: Unknown
8391
type: Accepted
84-
description: Conditions is the current status from the controller
85-
for this GatewayClassParameter. Updates follow the same specification
86-
as conditions for GatewayClass.
92+
description: |-
93+
Conditions is the current status from the controller for
94+
this GatewayClassParameter. Updates follow the same
95+
specification as conditions for GatewayClass.
8796
items:
8897
description: "Condition contains details for one aspect of the current
89-
state of this API Resource. --- This struct is intended for direct
90-
use as an array at the field path .status.conditions. For example,
91-
\n type FooStatus struct{ // Represents the observations of a
92-
foo's current state. // Known .status.conditions.type are: \"Available\",
93-
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
94-
// +listType=map // +listMapKey=type Conditions []metav1.Condition
95-
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
96-
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
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}"
97107
properties:
98108
lastTransitionTime:
99-
description: lastTransitionTime is the last time the condition
100-
transitioned from one status to another. This should be when
101-
the underlying condition changed. If that is not known, then
102-
using the time when the API field changed is acceptable.
109+
description: |-
110+
lastTransitionTime is the last time the condition transitioned from one status to another.
111+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
103112
format: date-time
104113
type: string
105114
message:
106-
description: message is a human readable message indicating
107-
details about the transition. This may be an empty string.
115+
description: |-
116+
message is a human readable message indicating details about the transition.
117+
This may be an empty string.
108118
maxLength: 32768
109119
type: string
110120
observedGeneration:
111-
description: observedGeneration represents the .metadata.generation
112-
that the condition was set based upon. For instance, if .metadata.generation
113-
is currently 12, but the .status.conditions[x].observedGeneration
114-
is 9, the condition is out of date with respect to the current
115-
state of the instance.
121+
description: |-
122+
observedGeneration represents the .metadata.generation that the condition was set based upon.
123+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
124+
with respect to the current state of the instance.
116125
format: int64
117126
minimum: 0
118127
type: integer
119128
reason:
120-
description: reason contains a programmatic identifier indicating
121-
the reason for the condition's last transition. Producers
122-
of specific condition types may define expected values and
123-
meanings for this field, and whether the values are considered
124-
a guaranteed API. The value should be a CamelCase string.
129+
description: |-
130+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
131+
Producers of specific condition types may define expected values and meanings for this field,
132+
and whether the values are considered a guaranteed API.
133+
The value should be a CamelCase string.
125134
This field may not be empty.
126135
maxLength: 1024
127136
minLength: 1
@@ -135,11 +144,12 @@ spec:
135144
- Unknown
136145
type: string
137146
type:
138-
description: type of condition in CamelCase or in foo.example.com/CamelCase.
139-
--- Many .condition.type values are consistent across resources
140-
like Available, but because arbitrary conditions can be useful
141-
(see .node.status.conditions), the ability to deconflict is
142-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
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)
143153
maxLength: 316
144154
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])$
145155
type: string

0 commit comments

Comments
 (0)