Skip to content

Commit 92d7af0

Browse files
jacobweinstockjacobweinstock
authored
Merge pull request #399 from jacobweinstock/update-deps
Update deps: ## Description <!--- Please describe what this PR is going to change --> ## Why is this needed <!--- Link to issue you have raised --> Fixes: # ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## How are existing users impacted? What migration steps/scripts do we need? <!--- Fixes a bug, unblocks installation, removes a component of the stack etc --> <!--- Requires a DB migration script, etc. --> ## Checklist: I have: - [ ] updated the documentation and/or roadmap (if required) - [ ] added unit or e2e tests - [ ] provided instructions on how to upgrade
2 parents cba0fc1 + 2346963 commit 92d7af0

7 files changed

+90
-142
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: 5 additions & 3 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
@@ -108,11 +108,13 @@ spec:
108108
items:
109109
type: string
110110
type: array
111+
x-kubernetes-list-type: atomic
111112
required:
112113
- key
113114
- operator
114115
type: object
115116
type: array
117+
x-kubernetes-list-type: atomic
116118
matchLabels:
117119
additionalProperties:
118120
type: string
@@ -176,11 +178,13 @@ spec:
176178
items:
177179
type: string
178180
type: array
181+
x-kubernetes-list-type: atomic
179182
required:
180183
- key
181184
- operator
182185
type: object
183186
type: array
187+
x-kubernetes-list-type: atomic
184188
matchLabels:
185189
additionalProperties:
186190
type: string
@@ -265,7 +269,6 @@ spec:
265269
reconciling the Machine and will contain a more verbose string suitable
266270
for logging and human consumption.
267271
268-
269272
This field should not be set for transitive errors that a controller
270273
faces that are expected to be fixed automatically over
271274
time (like service outages), but instead indicate that something is
@@ -275,7 +278,6 @@ spec:
275278
spec, values that are unsupported by the controller, or the
276279
responsible controller itself being critically misconfigured.
277280
278-
279281
Any transient errors that occur during the reconciliation of Machines
280282
can be added as events to the Machine object and/or logged in the
281283
controller's output.

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

Lines changed: 5 additions & 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
@@ -98,11 +98,13 @@ spec:
9898
items:
9999
type: string
100100
type: array
101+
x-kubernetes-list-type: atomic
101102
required:
102103
- key
103104
- operator
104105
type: object
105106
type: array
107+
x-kubernetes-list-type: atomic
106108
matchLabels:
107109
additionalProperties:
108110
type: string
@@ -168,11 +170,13 @@ spec:
168170
items:
169171
type: string
170172
type: array
173+
x-kubernetes-list-type: atomic
171174
required:
172175
- key
173176
- operator
174177
type: object
175178
type: array
179+
x-kubernetes-list-type: atomic
176180
matchLabels:
177181
additionalProperties:
178182
type: string

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

‎go.mod

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,28 @@ require (
1515
github.com/spf13/pflag v1.0.5
1616
github.com/tinkerbell/rufio v0.3.3
1717
github.com/tinkerbell/tink v0.10.0
18-
k8s.io/api v0.29.3
19-
k8s.io/apimachinery v0.29.3
20-
k8s.io/client-go v0.29.3
21-
k8s.io/component-base v0.29.3
22-
k8s.io/klog/v2 v2.110.1
23-
k8s.io/utils v0.0.0-20231127182322-b307cd553661
18+
k8s.io/api v0.31.0
19+
k8s.io/apimachinery v0.31.0
20+
k8s.io/client-go v0.31.0
21+
k8s.io/component-base v0.31.0
22+
k8s.io/klog/v2 v2.130.1
23+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2424
sigs.k8s.io/cluster-api v1.6.3
25-
sigs.k8s.io/controller-runtime v0.17.0
25+
sigs.k8s.io/controller-runtime v0.19.0
2626
sigs.k8s.io/kustomize/kustomize/v5 v5.4.3
2727
sigs.k8s.io/yaml v1.4.0
2828
)
2929

3030
require (
3131
github.com/beorn7/perks v1.0.1 // indirect
3232
github.com/blang/semver/v4 v4.0.0 // indirect
33-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
33+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3434
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3535
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3636
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
37-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
37+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
3838
github.com/fsnotify/fsnotify v1.7.0 // indirect
39+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3940
github.com/go-errors/errors v1.5.1 // indirect
4041
github.com/go-openapi/jsonpointer v0.20.1 // indirect
4142
github.com/go-openapi/jsonreference v0.20.3 // indirect
@@ -55,40 +56,39 @@ require (
5556
github.com/mailru/easyjson v0.7.7 // indirect
5657
github.com/mattn/go-colorable v0.1.13 // indirect
5758
github.com/mattn/go-isatty v0.0.20 // indirect
58-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
5959
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6060
github.com/modern-go/reflect2 v1.0.2 // indirect
6161
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
6262
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6363
github.com/nxadm/tail v1.4.11 // indirect
6464
github.com/pkg/errors v0.9.1 // indirect
65-
github.com/prometheus/client_golang v1.18.0 // indirect
66-
github.com/prometheus/client_model v0.5.0 // indirect
67-
github.com/prometheus/common v0.45.0 // indirect
68-
github.com/prometheus/procfs v0.12.0 // indirect
65+
github.com/prometheus/client_golang v1.19.1 // indirect
66+
github.com/prometheus/client_model v0.6.1 // indirect
67+
github.com/prometheus/common v0.55.0 // indirect
68+
github.com/prometheus/procfs v0.15.1 // indirect
6969
github.com/sergi/go-diff v1.2.0 // indirect
70-
github.com/spf13/cobra v1.8.0 // indirect
70+
github.com/spf13/cobra v1.8.1 // indirect
71+
github.com/x448/float16 v0.8.4 // indirect
7172
github.com/xlab/treeprint v1.2.0 // indirect
7273
go.starlark.net v0.0.0-20231121155337-90ade8b19d09 // indirect
7374
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
7475
golang.org/x/net v0.28.0 // indirect
75-
golang.org/x/oauth2 v0.15.0 // indirect
76+
golang.org/x/oauth2 v0.21.0 // indirect
7677
golang.org/x/sys v0.24.0 // indirect
7778
golang.org/x/term v0.23.0 // indirect
7879
golang.org/x/text v0.17.0 // indirect
7980
golang.org/x/time v0.5.0 // indirect
8081
golang.org/x/tools v0.24.0 // indirect
8182
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
82-
google.golang.org/appengine v1.6.8 // indirect
83-
google.golang.org/protobuf v1.34.1 // indirect
83+
google.golang.org/protobuf v1.34.2 // indirect
8484
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8585
gopkg.in/inf.v0 v0.9.1 // indirect
8686
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8787
gopkg.in/yaml.v2 v2.4.0 // indirect
8888
gopkg.in/yaml.v3 v3.0.1 // indirect
89-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
89+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
9090
k8s.io/cluster-bootstrap v0.29.0 // indirect
91-
k8s.io/kube-openapi v0.0.0-20231214164306-ab13479f8bf8 // indirect
91+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
9292
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9393
sigs.k8s.io/kustomize/api v0.17.3 // indirect
9494
sigs.k8s.io/kustomize/cmd/config v0.14.2 // indirect

0 commit comments

Comments
 (0)