Skip to content

Commit 982d67e

Browse files
Amulyam24Amulyam24
authored
Update cluster-api to v1.10.0-beta.1 (#2295)
1 parent 353b235 commit 982d67e

23 files changed

+467
-515
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ RELEASE_DIR := out
6363
OUTPUT_TYPE ?= type=registry
6464

6565
# Go
66-
GO_VERSION ?=1.23.7
66+
GO_VERSION ?=1.23.8
6767
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
6868

6969
# kind
@@ -81,7 +81,7 @@ PULL_POLICY ?= Always
8181
# Set build time variables including version details
8282
LDFLAGS := $(shell ./hack/version.sh)
8383

84-
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.30.0
84+
KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.32.0
8585

8686
# main controller
8787
CORE_IMAGE_NAME ?= cluster-api-ibmcloud-controller
@@ -235,7 +235,7 @@ GINKGO_NOCOLOR ?= false
235235
GINKGO_TIMEOUT ?= 2h
236236
E2E_FLAVOR ?= powervs-md-remediation
237237
JUNIT_FILE ?= junit.e2e_suite.1.xml
238-
GINKGO_ARGS ?= -v --trace --tags=e2e --timeout=$(GINKGO_TIMEOUT) --focus=$(GINKGO_FOCUS) --nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) --output-dir="$(ARTIFACTS)" --junit-report="$(JUNIT_FILE)"
238+
GINKGO_ARGS ?= -v --trace --tags=e2e --timeout=$(GINKGO_TIMEOUT) --focus="$(GINKGO_FOCUS)" --nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) --output-dir="$(ARTIFACTS)" --junit-report="$(JUNIT_FILE)"
239239
ARTIFACTS ?= $(REPO_ROOT)/_artifacts
240240
SKIP_CLEANUP ?= false
241241
SKIP_CREATE_MGMT_CLUSTER ?= false

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

Lines changed: 17 additions & 8 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.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
name: ibmpowervsclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -67,10 +67,11 @@ spec:
6767
communicate with the control plane.
6868
properties:
6969
host:
70-
description: The hostname on which the API server is serving.
70+
description: host is the hostname on which the API server is serving.
71+
maxLength: 512
7172
type: string
7273
port:
73-
description: The port on which the API server is serving.
74+
description: port is the port on which the API server is serving.
7475
format: int32
7576
type: integer
7677
required:
@@ -174,10 +175,11 @@ spec:
174175
communicate with the control plane.
175176
properties:
176177
host:
177-
description: The hostname on which the API server is serving.
178+
description: host is the hostname on which the API server is serving.
179+
maxLength: 512
178180
type: string
179181
port:
180-
description: The port on which the API server is serving.
182+
description: port is the port on which the API server is serving.
181183
format: int32
182184
type: integer
183185
required:
@@ -962,27 +964,32 @@ spec:
962964
properties:
963965
lastTransitionTime:
964966
description: |-
965-
Last time the condition transitioned from one status to another.
967+
lastTransitionTime is the last time the condition transitioned from one status to another.
966968
This should be when the underlying condition changed. If that is not known, then using the time when
967969
the API field changed is acceptable.
968970
format: date-time
969971
type: string
970972
message:
971973
description: |-
972-
A human readable message indicating details about the transition.
974+
message is a human readable message indicating details about the transition.
973975
This field may be empty.
976+
maxLength: 10240
977+
minLength: 1
974978
type: string
975979
reason:
976980
description: |-
977-
The reason for the condition's last transition in CamelCase.
981+
reason is the reason for the condition's last transition in CamelCase.
978982
The specific API may choose whether or not this field is considered a guaranteed API.
979983
This field may be empty.
984+
maxLength: 256
985+
minLength: 1
980986
type: string
981987
severity:
982988
description: |-
983989
severity provides an explicit classification of Reason code, so the users or machines can immediately
984990
understand the current situation and act accordingly.
985991
The Severity field MUST be set only when Status=False.
992+
maxLength: 32
986993
type: string
987994
status:
988995
description: status of the condition, one of True, False, Unknown.
@@ -992,6 +999,8 @@ spec:
992999
type of condition in CamelCase or in foo.example.com/CamelCase.
9931000
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
9941001
can be useful (see .node.status.conditions), the ability to deconflict is important.
1002+
maxLength: 256
1003+
minLength: 1
9951004
type: string
9961005
required:
9971006
- lastTransitionTime

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

Lines changed: 13 additions & 7 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.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
name: ibmpowervsclustertemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -72,7 +72,7 @@ spec:
7272
additionalProperties:
7373
type: string
7474
description: |-
75-
Map of string keys and values that can be used to organize and categorize
75+
labels is a map of string keys and values that can be used to organize and categorize
7676
(scope and select) objects. May match selectors of replication controllers
7777
and services.
7878
More info: http://kubernetes.io/docs/user-guide/labels
@@ -87,10 +87,13 @@ spec:
8787
used to communicate with the control plane.
8888
properties:
8989
host:
90-
description: The hostname on which the API server is serving.
90+
description: host is the hostname on which the API server
91+
is serving.
92+
maxLength: 512
9193
type: string
9294
port:
93-
description: The port on which the API server is serving.
95+
description: port is the port on which the API server
96+
is serving.
9497
format: int32
9598
type: integer
9699
required:
@@ -189,7 +192,7 @@ spec:
189192
additionalProperties:
190193
type: string
191194
description: |-
192-
Map of string keys and values that can be used to organize and categorize
195+
labels is a map of string keys and values that can be used to organize and categorize
193196
(scope and select) objects. May match selectors of replication controllers
194197
and services.
195198
More info: http://kubernetes.io/docs/user-guide/labels
@@ -204,10 +207,13 @@ spec:
204207
used to communicate with the control plane.
205208
properties:
206209
host:
207-
description: The hostname on which the API server is serving.
210+
description: host is the hostname on which the API server
211+
is serving.
212+
maxLength: 512
208213
type: string
209214
port:
210-
description: The port on which the API server is serving.
215+
description: port is the port on which the API server
216+
is serving.
211217
format: int32
212218
type: integer
213219
required:

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

Lines changed: 21 additions & 7 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.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
name: ibmpowervsimages.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -100,27 +100,32 @@ spec:
100100
properties:
101101
lastTransitionTime:
102102
description: |-
103-
Last time the condition transitioned from one status to another.
103+
lastTransitionTime is the last time the condition transitioned from one status to another.
104104
This should be when the underlying condition changed. If that is not known, then using the time when
105105
the API field changed is acceptable.
106106
format: date-time
107107
type: string
108108
message:
109109
description: |-
110-
A human readable message indicating details about the transition.
110+
message is a human readable message indicating details about the transition.
111111
This field may be empty.
112+
maxLength: 10240
113+
minLength: 1
112114
type: string
113115
reason:
114116
description: |-
115-
The reason for the condition's last transition in CamelCase.
117+
reason is the reason for the condition's last transition in CamelCase.
116118
The specific API may choose whether or not this field is considered a guaranteed API.
117119
This field may be empty.
120+
maxLength: 256
121+
minLength: 1
118122
type: string
119123
severity:
120124
description: |-
121125
severity provides an explicit classification of Reason code, so the users or machines can immediately
122126
understand the current situation and act accordingly.
123127
The Severity field MUST be set only when Status=False.
128+
maxLength: 32
124129
type: string
125130
status:
126131
description: status of the condition, one of True, False, Unknown.
@@ -130,6 +135,8 @@ spec:
130135
type of condition in CamelCase or in foo.example.com/CamelCase.
131136
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
132137
can be useful (see .node.status.conditions), the ability to deconflict is important.
138+
maxLength: 256
139+
minLength: 1
133140
type: string
134141
required:
135142
- lastTransitionTime
@@ -267,27 +274,32 @@ spec:
267274
properties:
268275
lastTransitionTime:
269276
description: |-
270-
Last time the condition transitioned from one status to another.
277+
lastTransitionTime is the last time the condition transitioned from one status to another.
271278
This should be when the underlying condition changed. If that is not known, then using the time when
272279
the API field changed is acceptable.
273280
format: date-time
274281
type: string
275282
message:
276283
description: |-
277-
A human readable message indicating details about the transition.
284+
message is a human readable message indicating details about the transition.
278285
This field may be empty.
286+
maxLength: 10240
287+
minLength: 1
279288
type: string
280289
reason:
281290
description: |-
282-
The reason for the condition's last transition in CamelCase.
291+
reason is the reason for the condition's last transition in CamelCase.
283292
The specific API may choose whether or not this field is considered a guaranteed API.
284293
This field may be empty.
294+
maxLength: 256
295+
minLength: 1
285296
type: string
286297
severity:
287298
description: |-
288299
severity provides an explicit classification of Reason code, so the users or machines can immediately
289300
understand the current situation and act accordingly.
290301
The Severity field MUST be set only when Status=False.
302+
maxLength: 32
291303
type: string
292304
status:
293305
description: status of the condition, one of True, False, Unknown.
@@ -297,6 +309,8 @@ spec:
297309
type of condition in CamelCase or in foo.example.com/CamelCase.
298310
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
299311
can be useful (see .node.status.conditions), the ability to deconflict is important.
312+
maxLength: 256
313+
minLength: 1
300314
type: string
301315
required:
302316
- lastTransitionTime

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

Lines changed: 21 additions & 7 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.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
name: ibmpowervsmachines.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -188,27 +188,32 @@ spec:
188188
properties:
189189
lastTransitionTime:
190190
description: |-
191-
Last time the condition transitioned from one status to another.
191+
lastTransitionTime is the last time the condition transitioned from one status to another.
192192
This should be when the underlying condition changed. If that is not known, then using the time when
193193
the API field changed is acceptable.
194194
format: date-time
195195
type: string
196196
message:
197197
description: |-
198-
A human readable message indicating details about the transition.
198+
message is a human readable message indicating details about the transition.
199199
This field may be empty.
200+
maxLength: 10240
201+
minLength: 1
200202
type: string
201203
reason:
202204
description: |-
203-
The reason for the condition's last transition in CamelCase.
205+
reason is the reason for the condition's last transition in CamelCase.
204206
The specific API may choose whether or not this field is considered a guaranteed API.
205207
This field may be empty.
208+
maxLength: 256
209+
minLength: 1
206210
type: string
207211
severity:
208212
description: |-
209213
severity provides an explicit classification of Reason code, so the users or machines can immediately
210214
understand the current situation and act accordingly.
211215
The Severity field MUST be set only when Status=False.
216+
maxLength: 32
212217
type: string
213218
status:
214219
description: status of the condition, one of True, False, Unknown.
@@ -218,6 +223,8 @@ spec:
218223
type of condition in CamelCase or in foo.example.com/CamelCase.
219224
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
220225
can be useful (see .node.status.conditions), the ability to deconflict is important.
226+
maxLength: 256
227+
minLength: 1
221228
type: string
222229
required:
223230
- lastTransitionTime
@@ -538,27 +545,32 @@ spec:
538545
properties:
539546
lastTransitionTime:
540547
description: |-
541-
Last time the condition transitioned from one status to another.
548+
lastTransitionTime is the last time the condition transitioned from one status to another.
542549
This should be when the underlying condition changed. If that is not known, then using the time when
543550
the API field changed is acceptable.
544551
format: date-time
545552
type: string
546553
message:
547554
description: |-
548-
A human readable message indicating details about the transition.
555+
message is a human readable message indicating details about the transition.
549556
This field may be empty.
557+
maxLength: 10240
558+
minLength: 1
550559
type: string
551560
reason:
552561
description: |-
553-
The reason for the condition's last transition in CamelCase.
562+
reason is the reason for the condition's last transition in CamelCase.
554563
The specific API may choose whether or not this field is considered a guaranteed API.
555564
This field may be empty.
565+
maxLength: 256
566+
minLength: 1
556567
type: string
557568
severity:
558569
description: |-
559570
severity provides an explicit classification of Reason code, so the users or machines can immediately
560571
understand the current situation and act accordingly.
561572
The Severity field MUST be set only when Status=False.
573+
maxLength: 32
562574
type: string
563575
status:
564576
description: status of the condition, one of True, False, Unknown.
@@ -568,6 +580,8 @@ spec:
568580
type of condition in CamelCase or in foo.example.com/CamelCase.
569581
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
570582
can be useful (see .node.status.conditions), the ability to deconflict is important.
583+
maxLength: 256
584+
minLength: 1
571585
type: string
572586
required:
573587
- lastTransitionTime

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachinetemplates.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.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
name: ibmpowervsmachinetemplates.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io

0 commit comments

Comments
 (0)