Skip to content

Commit 91c588b

Browse files
damdodamdo
committed
wip: bump capi 1.8
1 parent 337c808 commit 91c588b

16 files changed

+256
-341
lines changed

‎Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export GOPROXY
3333
export GO111MODULE=on
3434

3535
# Kubebuilder
36-
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.29.0
36+
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.30.0
3737
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?=60s
3838
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?=60s
3939

@@ -59,23 +59,23 @@ CONVERSION_VERIFIER:= $(TOOLS_BIN_DIR)/conversion-verifier
5959
# Binaries.
6060
CLUSTERCTL := $(BIN_DIR)/clusterctl
6161

62-
CONTROLLER_GEN_VER := v0.14.0
62+
CONTROLLER_GEN_VER := v0.16.3
6363
CONTROLLER_GEN_BIN := controller-gen
6464
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
6565

66-
CONVERSION_GEN_VER := v0.29.3
66+
CONVERSION_GEN_VER := v0.30.5
6767
CONVERSION_GEN_BIN := conversion-gen
6868
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
6969

7070
ENVSUBST_VER := v1.4.2
7171
ENVSUBST_BIN := envsubst
7272
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
7373

74-
GOLANGCI_LINT_VER := v1.58.2
74+
GOLANGCI_LINT_VER := v1.61.0
7575
GOLANGCI_LINT_BIN := golangci-lint
7676
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
7777

78-
KIND_VER := v0.22.0
78+
KIND_VER := v0.24.0
7979
KIND_BIN := kind
8080
KIND := $(TOOLS_BIN_DIR)/$(KIND_BIN)-$(KIND_VER)
8181

@@ -87,12 +87,12 @@ RELEASE_NOTES_VER := v0.11.0
8787
RELEASE_NOTES_BIN := release-notes
8888
RELEASE_NOTES := $(TOOLS_BIN_DIR)/$(RELEASE_NOTES_BIN)-$(RELEASE_NOTES_VER)
8989

90-
GINKGO_VER := v2.19.0
90+
GINKGO_VER := v2.20.2
9191
GINKGO_BIN := ginkgo
9292
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
9393
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
9494

95-
KUBECTL_VER := v1.29.3
95+
KUBECTL_VER := v1.30.5
9696
KUBECTL_BIN := kubectl
9797
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
9898

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

Lines changed: 1 addition & 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.3
77
name: gcpclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -151,12 +151,10 @@ spec:
151151
in "auto" mode. When set to false, the VPC network is created in
152152
"custom" mode.
153153
154-
155154
An auto mode VPC network starts with one subnet per region. Each
156155
subnet has a predetermined range as described in Auto mode VPC
157156
network IP ranges.
158157
159-
160158
Defaults to true.
161159
type: boolean
162160
hostProject:
@@ -222,7 +220,6 @@ spec:
222220
If unspecified, the purpose defaults to PRIVATE_RFC_1918.
223221
The enableFlowLogs field isn't supported with the purpose field set to INTERNAL_HTTPS_LOAD_BALANCER.
224222
225-
226223
Possible values:
227224
"INTERNAL_HTTPS_LOAD_BALANCER" - Subnet reserved for Internal
228225
HTTP(S) Load Balancing.

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

Lines changed: 1 addition & 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.3
77
name: gcpclustertemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -168,12 +168,10 @@ spec:
168168
in "auto" mode. When set to false, the VPC network is created in
169169
"custom" mode.
170170
171-
172171
An auto mode VPC network starts with one subnet per region. Each
173172
subnet has a predetermined range as described in Auto mode VPC
174173
network IP ranges.
175174
176-
177175
Defaults to true.
178176
type: boolean
179177
hostProject:
@@ -239,7 +237,6 @@ spec:
239237
If unspecified, the purpose defaults to PRIVATE_RFC_1918.
240238
The enableFlowLogs field isn't supported with the purpose field set to INTERNAL_HTTPS_LOAD_BALANCER.
241239
242-
243240
Possible values:
244241
"INTERNAL_HTTPS_LOAD_BALANCER" - Subnet reserved for Internal
245242
HTTP(S) Load Balancing.

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

Lines changed: 5 additions & 5 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.3
77
name: gcpmachines.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -112,6 +112,8 @@ spec:
112112
maxLength: 160
113113
pattern: projects\/[-_[A-Za-z0-9]+\/locations\/[-_[A-Za-z0-9]+\/keyRings\/[-_[A-Za-z0-9]+\/cryptoKeys\/[-_[A-Za-z0-9]+
114114
type: string
115+
required:
116+
- kmsKeyName
115117
type: object
116118
suppliedKey:
117119
description: SuppliedKey provides the key used to create
@@ -336,6 +338,8 @@ spec:
336338
maxLength: 160
337339
pattern: projects\/[-_[A-Za-z0-9]+\/locations\/[-_[A-Za-z0-9]+\/keyRings\/[-_[A-Za-z0-9]+\/cryptoKeys\/[-_[A-Za-z0-9]+
338340
type: string
341+
required:
342+
- kmsKeyName
339343
type: object
340344
suppliedKey:
341345
description: SuppliedKey provides the key used to create or manage
@@ -451,7 +455,6 @@ spec:
451455
reconciling the Machine and will contain a more verbose string suitable
452456
for logging and human consumption.
453457
454-
455458
This field should not be set for transitive errors that a controller
456459
faces that are expected to be fixed automatically over
457460
time (like service outages), but instead indicate that something is
@@ -461,7 +464,6 @@ spec:
461464
spec, values that are unsupported by the controller, or the
462465
responsible controller itself being critically misconfigured.
463466
464-
465467
Any transient errors that occur during the reconciliation of Machines
466468
can be added as events to the Machine object and/or logged in the
467469
controller's output.
@@ -472,7 +474,6 @@ spec:
472474
reconciling the Machine and will contain a succinct value suitable
473475
for machine interpretation.
474476
475-
476477
This field should not be set for transitive errors that a controller
477478
faces that are expected to be fixed automatically over
478479
time (like service outages), but instead indicate that something is
@@ -482,7 +483,6 @@ spec:
482483
spec, values that are unsupported by the controller, or the
483484
responsible controller itself being critically misconfigured.
484485
485-
486486
Any transient errors that occur during the reconciliation of Machines
487487
can be added as events to the Machine object and/or logged in the
488488
controller's output.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmachinetemplates.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.3
77
name: gcpmachinetemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -125,6 +125,8 @@ spec:
125125
maxLength: 160
126126
pattern: projects\/[-_[A-Za-z0-9]+\/locations\/[-_[A-Za-z0-9]+\/keyRings\/[-_[A-Za-z0-9]+\/cryptoKeys\/[-_[A-Za-z0-9]+
127127
type: string
128+
required:
129+
- kmsKeyName
128130
type: object
129131
suppliedKey:
130132
description: SuppliedKey provides the key used to
@@ -352,6 +354,8 @@ spec:
352354
maxLength: 160
353355
pattern: projects\/[-_[A-Za-z0-9]+\/locations\/[-_[A-Za-z0-9]+\/keyRings\/[-_[A-Za-z0-9]+\/cryptoKeys\/[-_[A-Za-z0-9]+
354356
type: string
357+
required:
358+
- kmsKeyName
355359
type: object
356360
suppliedKey:
357361
description: SuppliedKey provides the key used to create

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

Lines changed: 1 addition & 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.3
77
name: gcpmanagedclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -147,12 +147,10 @@ spec:
147147
in "auto" mode. When set to false, the VPC network is created in
148148
"custom" mode.
149149
150-
151150
An auto mode VPC network starts with one subnet per region. Each
152151
subnet has a predetermined range as described in Auto mode VPC
153152
network IP ranges.
154153
155-
156154
Defaults to true.
157155
type: boolean
158156
hostProject:
@@ -218,7 +216,6 @@ spec:
218216
If unspecified, the purpose defaults to PRIVATE_RFC_1918.
219217
The enableFlowLogs field isn't supported with the purpose field set to INTERNAL_HTTPS_LOAD_BALANCER.
220218
221-
222219
Possible values:
223220
"INTERNAL_HTTPS_LOAD_BALANCER" - Subnet reserved for Internal
224221
HTTP(S) Load Balancing.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedcontrolplanes.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.3
77
name: gcpmanagedcontrolplanes.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

‎config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmanagedmachinepools.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.3
77
name: gcpmanagedmachinepools.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

‎config/rbac/role.yaml‎

Lines changed: 7 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,8 @@ rules:
4444
resources:
4545
- clusters
4646
- clusters/status
47-
verbs:
48-
- get
49-
- list
50-
- watch
51-
- apiGroups:
52-
- cluster.x-k8s.io
53-
resources:
5447
- machinepools
5548
- machinepools/status
56-
verbs:
57-
- get
58-
- list
59-
- watch
60-
- apiGroups:
61-
- cluster.x-k8s.io
62-
resources:
6349
- machines
6450
- machines/status
6551
verbs:
@@ -70,72 +56,10 @@ rules:
7056
- infrastructure.cluster.x-k8s.io
7157
resources:
7258
- gcpclusters
73-
verbs:
74-
- create
75-
- delete
76-
- get
77-
- list
78-
- patch
79-
- update
80-
- watch
81-
- apiGroups:
82-
- infrastructure.cluster.x-k8s.io
83-
resources:
84-
- gcpclusters/status
85-
verbs:
86-
- get
87-
- patch
88-
- update
89-
- apiGroups:
90-
- infrastructure.cluster.x-k8s.io
91-
resources:
9259
- gcpmachines
93-
verbs:
94-
- create
95-
- delete
96-
- get
97-
- list
98-
- patch
99-
- update
100-
- watch
101-
- apiGroups:
102-
- infrastructure.cluster.x-k8s.io
103-
resources:
104-
- gcpmachines/status
105-
verbs:
106-
- get
107-
- patch
108-
- update
109-
- apiGroups:
110-
- infrastructure.cluster.x-k8s.io
111-
resources:
11260
- gcpmanagedclusters
113-
verbs:
114-
- create
115-
- delete
116-
- get
117-
- list
118-
- patch
119-
- update
120-
- watch
121-
- apiGroups:
122-
- infrastructure.cluster.x-k8s.io
123-
resources:
124-
- gcpmanagedclusters/finalizers
125-
verbs:
126-
- update
127-
- apiGroups:
128-
- infrastructure.cluster.x-k8s.io
129-
resources:
130-
- gcpmanagedclusters/status
131-
verbs:
132-
- get
133-
- patch
134-
- update
135-
- apiGroups:
136-
- infrastructure.cluster.x-k8s.io
137-
resources:
13861
- gcpmanagedcontrolplanes
62+
- gcpmanagedmachinepools
13963
verbs:
14064
- create
14165
- delete
@@ -147,40 +71,20 @@ rules:
14771
- apiGroups:
14872
- infrastructure.cluster.x-k8s.io
14973
resources:
150-
- gcpmanagedcontrolplanes/finalizers
151-
verbs:
152-
- update
153-
- apiGroups:
154-
- infrastructure.cluster.x-k8s.io
155-
resources:
74+
- gcpclusters/status
75+
- gcpmachines/status
76+
- gcpmanagedclusters/status
15677
- gcpmanagedcontrolplanes/status
78+
- gcpmanagedmachinepools/status
15779
verbs:
15880
- get
15981
- patch
16082
- update
16183
- apiGroups:
16284
- infrastructure.cluster.x-k8s.io
16385
resources:
164-
- gcpmanagedmachinepools
165-
verbs:
166-
- create
167-
- delete
168-
- get
169-
- list
170-
- patch
171-
- update
172-
- watch
173-
- apiGroups:
174-
- infrastructure.cluster.x-k8s.io
175-
resources:
86+
- gcpmanagedclusters/finalizers
87+
- gcpmanagedcontrolplanes/finalizers
17688
- gcpmanagedmachinepools/finalizers
17789
verbs:
17890
- update
179-
- apiGroups:
180-
- infrastructure.cluster.x-k8s.io
181-
resources:
182-
- gcpmanagedmachinepools/status
183-
verbs:
184-
- get
185-
- patch
186-
- update

0 commit comments

Comments
 (0)