Skip to content

Commit 407933c

Browse files
Update generation deps:
controller-gen, kind, and kubectl. Signed-off-by: Jacob Weinstock <[email protected]>
1 parent af07485 commit 407933c

5 files changed

+20
-47
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ BIN_DIR := $(abspath $(ROOT_DIR)/bin)
4949
GO_INSTALL = ./scripts/go_install.sh
5050

5151
# Binaries.
52-
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14
52+
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.16.2
5353

5454
GOLANGCI_LINT_VER := v1.61.0
5555
GOLANGCI_LINT_BIN := golangci-lint
@@ -58,11 +58,11 @@ GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
5858
KUSTOMIZE_BIN := kustomize
5959
KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)
6060

61-
KUBECTL_VER := v1.28.2
61+
KUBECTL_VER := v1.31.0
6262
KUBECTL_BIN := kubectl
6363
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
6464

65-
KIND_VER := v0.20.0
65+
KIND_VER := v0.24.0
6666
KIND_BIN := kind
6767
KIND := $(TOOLS_BIN_DIR)/$(KIND_BIN)-$(KIND_VER)
6868

config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellclusters.yaml

Lines changed: 1 addition & 2 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.16.2
77
name: tinkerbellclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -54,7 +54,6 @@ spec:
5454
description: |-
5555
ControlPlaneEndpoint is a required field by ClusterAPI v1beta1.
5656
57-
5857
See https://cluster-api.sigs.k8s.io/developer/architecture/controllers/cluster.html
5958
for more details.
6059
properties:

config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachines.yaml

Lines changed: 14 additions & 4 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.16.2
77
name: tinkerbellmachines.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -249,15 +249,26 @@ spec:
249249
addresses:
250250
description: Addresses contains the Tinkerbell device associated addresses.
251251
items:
252-
$ref: '#/definitions/k8s.io~1api~1core~1v1~0NodeAddress'
252+
description: NodeAddress contains information for the node's address.
253+
properties:
254+
address:
255+
description: The node address.
256+
type: string
257+
type:
258+
description: Node address type, one of Hostname, ExternalIP
259+
or InternalIP.
260+
type: string
261+
required:
262+
- address
263+
- type
264+
type: object
253265
type: array
254266
errorMessage:
255267
description: |-
256268
ErrorMessage will be set in the event that there is a terminal problem
257269
reconciling the Machine and will contain a more verbose string suitable
258270
for logging and human consumption.
259271
260-
261272
This field should not be set for transitive errors that a controller
262273
faces that are expected to be fixed automatically over
263274
time (like service outages), but instead indicate that something is
@@ -267,7 +278,6 @@ spec:
267278
spec, values that are unsupported by the controller, or the
268279
responsible controller itself being critically misconfigured.
269280
270-
271281
Any transient errors that occur during the reconciliation of Machines
272282
can be added as events to the Machine object and/or logged in the
273283
controller's output.

config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachinetemplates.yaml

Lines changed: 1 addition & 1 deletion
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.16.2
77
name: tinkerbellmachinetemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

config/rbac/role.yaml

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ rules:
2626
resources:
2727
- clusters
2828
- clusters/status
29-
verbs:
30-
- get
31-
- list
32-
- watch
33-
- apiGroups:
34-
- cluster.x-k8s.io
35-
resources:
3629
- machines
3730
- machines/status
3831
verbs:
@@ -43,25 +36,6 @@ rules:
4336
- infrastructure.cluster.x-k8s.io
4437
resources:
4538
- tinkerbellclusters
46-
verbs:
47-
- create
48-
- delete
49-
- get
50-
- list
51-
- patch
52-
- update
53-
- watch
54-
- apiGroups:
55-
- infrastructure.cluster.x-k8s.io
56-
resources:
57-
- tinkerbellclusters/status
58-
verbs:
59-
- get
60-
- patch
61-
- update
62-
- apiGroups:
63-
- infrastructure.cluster.x-k8s.io
64-
resources:
6539
- tinkerbellmachines
6640
verbs:
6741
- create
@@ -74,6 +48,7 @@ rules:
7448
- apiGroups:
7549
- infrastructure.cluster.x-k8s.io
7650
resources:
51+
- tinkerbellclusters/status
7752
- tinkerbellmachines/status
7853
verbs:
7954
- get
@@ -95,17 +70,6 @@ rules:
9570
resources:
9671
- templates
9772
- templates/status
98-
verbs:
99-
- create
100-
- delete
101-
- get
102-
- list
103-
- patch
104-
- update
105-
- watch
106-
- apiGroups:
107-
- tinkerbell.org
108-
resources:
10973
- workflows
11074
- workflows/status
11175
verbs:

0 commit comments

Comments
 (0)