Skip to content

Commit 56dca4e

Browse files
authored
Merge pull request #313 from kubernetes-sigs/dependabot/go_modules/sigs.k8s.io/cluster-api-1.9.4
🌱 Bump sigs.k8s.io/cluster-api from 1.8.5 to 1.9.4
2 parents 423d068 + 6eeb88c commit 56dca4e

File tree

8 files changed

+153
-198
lines changed

8 files changed

+153
-198
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
ARG ARCH
1616

1717
# Build the manager binary
18-
FROM golang:1.22 as builder
18+
FROM golang:1.23 as builder
1919

2020
WORKDIR /workspace
2121
# Copy the Go Modules manifests

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
219219
CONTROLLER_GEN = $(HACK_BIN)/controller-gen
220220
.PHONY: controller-gen
221221
controller-gen: ## Download controller-gen locally if necessary.
222-
env GOBIN=$(HACK_BIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0
222+
env GOBIN=$(HACK_BIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2
223223

224224
KUSTOMIZE = $(HACK_BIN)/kustomize
225225
.PHONY: kustomize

config/crd/bases/ipam.cluster.x-k8s.io_globalinclusterippools.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.15.0
6+
controller-gen.kubebuilder.io/version: v0.17.2
77
name: globalinclusterippools.ipam.cluster.x-k8s.io
88
spec:
99
group: ipam.cluster.x-k8s.io

config/crd/bases/ipam.cluster.x-k8s.io_inclusterippools.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.15.0
6+
controller-gen.kubebuilder.io/version: v0.17.2
77
name: inclusterippools.ipam.cluster.x-k8s.io
88
spec:
99
group: ipam.cluster.x-k8s.io

config/rbac/role.yaml

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,8 @@ rules:
1616
- ipam.cluster.x-k8s.io
1717
resources:
1818
- globalinclusterippools
19-
verbs:
20-
- create
21-
- delete
22-
- get
23-
- list
24-
- patch
25-
- update
26-
- watch
27-
- apiGroups:
28-
- ipam.cluster.x-k8s.io
29-
resources:
30-
- globalinclusterippools/finalizers
31-
verbs:
32-
- update
33-
- apiGroups:
34-
- ipam.cluster.x-k8s.io
35-
resources:
36-
- globalinclusterippools/status
37-
verbs:
38-
- get
39-
- patch
40-
- update
41-
- apiGroups:
42-
- ipam.cluster.x-k8s.io
43-
resources:
4419
- inclusterippools
20+
- ipaddresses
4521
verbs:
4622
- create
4723
- delete
@@ -53,37 +29,17 @@ rules:
5329
- apiGroups:
5430
- ipam.cluster.x-k8s.io
5531
resources:
32+
- globalinclusterippools/finalizers
5633
- inclusterippools/finalizers
57-
verbs:
58-
- update
59-
- apiGroups:
60-
- ipam.cluster.x-k8s.io
61-
resources:
62-
- inclusterippools/status
63-
verbs:
64-
- get
65-
- patch
66-
- update
67-
- apiGroups:
68-
- ipam.cluster.x-k8s.io
69-
resources:
70-
- ipaddressclaims
71-
verbs:
72-
- get
73-
- list
74-
- patch
75-
- update
76-
- watch
77-
- apiGroups:
78-
- ipam.cluster.x-k8s.io
79-
resources:
8034
- ipaddressclaims/finalizers
8135
- ipaddresses/finalizers
8236
verbs:
8337
- update
8438
- apiGroups:
8539
- ipam.cluster.x-k8s.io
8640
resources:
41+
- globalinclusterippools/status
42+
- inclusterippools/status
8743
- ipaddressclaims/status
8844
- ipaddresses/status
8945
verbs:
@@ -93,10 +49,8 @@ rules:
9349
- apiGroups:
9450
- ipam.cluster.x-k8s.io
9551
resources:
96-
- ipaddresses
52+
- ipaddressclaims
9753
verbs:
98-
- create
99-
- delete
10054
- get
10155
- list
10256
- patch

go.mod

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,73 @@
11
module sigs.k8s.io/cluster-api-ipam-provider-in-cluster
22

3-
go 1.22.0
4-
5-
toolchain go1.22.2
3+
go 1.23.6
64

75
require (
86
github.com/onsi/ginkgo/v2 v2.22.2
97
github.com/onsi/gomega v1.36.2
108
github.com/pkg/errors v0.9.1
119
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
12-
k8s.io/api v0.30.3
13-
k8s.io/apimachinery v0.30.3
14-
k8s.io/client-go v0.30.3
15-
k8s.io/klog/v2 v2.120.1
16-
k8s.io/utils v0.0.0-20240423183400-0849a56e8f22
17-
sigs.k8s.io/cluster-api v1.8.5
18-
sigs.k8s.io/controller-runtime v0.18.5
10+
k8s.io/api v0.32.2
11+
k8s.io/apimachinery v0.32.2
12+
k8s.io/client-go v0.32.2
13+
k8s.io/klog/v2 v2.130.1
14+
k8s.io/utils v0.0.0-20241210054802-24370beab758
15+
sigs.k8s.io/cluster-api v1.9.4
16+
sigs.k8s.io/controller-runtime v0.20.2
1917
)
2018

2119
require (
22-
github.com/Masterminds/semver/v3 v3.2.1 // indirect
2320
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2421
github.com/beorn7/perks v1.0.1 // indirect
2522
github.com/blang/semver/v4 v4.0.0 // indirect
26-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
23+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2724
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2825
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
29-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
30-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
26+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3127
github.com/fsnotify/fsnotify v1.7.0 // indirect
28+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3229
github.com/go-logr/logr v1.4.2 // indirect
33-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
30+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3431
github.com/go-openapi/jsonreference v0.20.4 // indirect
35-
github.com/go-openapi/swag v0.22.7 // indirect
32+
github.com/go-openapi/swag v0.23.0 // indirect
3633
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
37-
github.com/gobuffalo/flect v1.0.2 // indirect
34+
github.com/gobuffalo/flect v1.0.3 // indirect
3835
github.com/gogo/protobuf v1.3.2 // indirect
39-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4036
github.com/golang/protobuf v1.5.4 // indirect
41-
github.com/google/cel-go v0.18.2 // indirect
37+
github.com/google/btree v1.1.3 // indirect
4238
github.com/google/gnostic-models v0.6.8 // indirect
4339
github.com/google/go-cmp v0.6.0 // indirect
4440
github.com/google/gofuzz v1.2.0 // indirect
4541
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
4642
github.com/google/uuid v1.6.0 // indirect
47-
github.com/huandu/xstrings v1.4.0 // indirect
48-
github.com/imdario/mergo v0.3.16 // indirect
4943
github.com/josharian/intern v1.0.0 // indirect
5044
github.com/json-iterator/go v1.1.12 // indirect
5145
github.com/mailru/easyjson v0.7.7 // indirect
52-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
5346
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5447
github.com/modern-go/reflect2 v1.0.2 // indirect
5548
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
56-
github.com/prometheus/client_golang v1.18.0 // indirect
57-
github.com/prometheus/client_model v0.6.0 // indirect
58-
github.com/prometheus/common v0.45.0 // indirect
59-
github.com/prometheus/procfs v0.12.0 // indirect
49+
github.com/prometheus/client_golang v1.19.1 // indirect
50+
github.com/prometheus/client_model v0.6.1 // indirect
51+
github.com/prometheus/common v0.55.0 // indirect
52+
github.com/prometheus/procfs v0.15.1 // indirect
6053
github.com/spf13/pflag v1.0.5 // indirect
61-
github.com/stoewer/go-strcase v1.3.0 // indirect
62-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
54+
github.com/x448/float16 v0.8.4 // indirect
6355
golang.org/x/net v0.33.0 // indirect
64-
golang.org/x/oauth2 v0.21.0 // indirect
56+
golang.org/x/oauth2 v0.24.0 // indirect
57+
golang.org/x/sync v0.10.0 // indirect
6558
golang.org/x/sys v0.28.0 // indirect
6659
golang.org/x/term v0.27.0 // indirect
6760
golang.org/x/text v0.21.0 // indirect
68-
golang.org/x/time v0.5.0 // indirect
61+
golang.org/x/time v0.7.0 // indirect
6962
golang.org/x/tools v0.28.0 // indirect
7063
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7164
google.golang.org/protobuf v1.36.1 // indirect
65+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7266
gopkg.in/inf.v0 v0.9.1 // indirect
73-
gopkg.in/yaml.v2 v2.4.0 // indirect
7467
gopkg.in/yaml.v3 v3.0.1 // indirect
75-
k8s.io/apiextensions-apiserver v0.30.3 // indirect
76-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
77-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
78-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
68+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
69+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
70+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
71+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
7972
sigs.k8s.io/yaml v1.4.0 // indirect
8073
)

0 commit comments

Comments
 (0)