Skip to content

Commit be9da2d

Browse files
authored
Merge pull request #770 from cprivitere/cluster-api-1dot7
🌱 chore: Bump to cluster api 1.7
2 parents 033afae + 70ee4ef commit be9da2d

12 files changed

+488
-821
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
run:
22
timeout: 10m
3-
go: "1.20"
3+
go: "1.21"
44
build-tags:
55
- tools
66
- e2e

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ endif
6969
## Binaries.
7070

7171
# Sync to controller-tools version in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/hack/tools/go.mod
72-
CONTROLLER_GEN_VER := v0.13.0
72+
CONTROLLER_GEN_VER := v0.14.0
7373
CONTROLLER_GEN_BIN := controller-gen
7474
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
7575

7676
# Sync to k8s.io/* versions in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/go.mod
77-
CONVERSION_GEN_VER := v0.28.4
77+
CONVERSION_GEN_VER := v0.29.3
7878
CONVERSION_GEN_BIN := conversion-gen
7979
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
8080

@@ -95,7 +95,7 @@ KUSTOMIZE_BIN := kustomize
9595
KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
9696

9797
# Sync to github.com/onsi/ginkgo verison in https://github.com/kubernetes-sigs/cluster-api/blob/v{VERSION}/go.mod
98-
GINKGO_VER := v2.13.1
98+
GINKGO_VER := v2.17.1
9999
GINKGO_BIN := ginkgo
100100
GINKGO := $(abspath $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER))
101101
GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo

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

Lines changed: 34 additions & 28 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.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: packetclusters.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -33,14 +33,19 @@ spec:
3333
description: PacketCluster is the Schema for the packetclusters API.
3434
properties:
3535
apiVersion:
36-
description: 'APIVersion defines the versioned schema of this representation
37-
of an object. Servers should convert recognized schemas to the latest
38-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
36+
description: |-
37+
APIVersion defines the versioned schema of this representation of an object.
38+
Servers should convert recognized schemas to the latest internal value, and
39+
may reject unrecognized values.
40+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3941
type: string
4042
kind:
41-
description: 'Kind is a string value representing the REST resource this
42-
object represents. Servers may infer this from the endpoint the client
43-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
43+
description: |-
44+
Kind is a string value representing the REST resource this object represents.
45+
Servers may infer this from the endpoint the client submits requests to.
46+
Cannot be updated.
47+
In CamelCase.
48+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4449
type: string
4550
metadata:
4651
type: object
@@ -74,8 +79,9 @@ spec:
7479
type: string
7580
vipManager:
7681
default: CPEM
77-
description: VIPManager represents whether this cluster uses CPEM
78-
or kube-vip to manage its vip for the api server IP
82+
description: |-
83+
VIPManager represents whether this cluster uses CPEM or kube-vip to
84+
manage its vip for the api server IP
7985
enum:
8086
- CPEM
8187
- KUBE_VIP
@@ -94,37 +100,37 @@ spec:
94100
operational state.
95101
properties:
96102
lastTransitionTime:
97-
description: Last time the condition transitioned from one status
98-
to another. This should be when the underlying condition changed.
99-
If that is not known, then using the time when the API field
100-
changed is acceptable.
103+
description: |-
104+
Last time the condition transitioned from one status to another.
105+
This should be when the underlying condition changed. If that is not known, then using the time when
106+
the API field changed is acceptable.
101107
format: date-time
102108
type: string
103109
message:
104-
description: A human readable message indicating details about
105-
the transition. This field may be empty.
110+
description: |-
111+
A human readable message indicating details about the transition.
112+
This field may be empty.
106113
type: string
107114
reason:
108-
description: The reason for the condition's last transition
109-
in CamelCase. The specific API may choose whether or not this
110-
field is considered a guaranteed API. This field may not be
111-
empty.
115+
description: |-
116+
The reason for the condition's last transition in CamelCase.
117+
The specific API may choose whether or not this field is considered a guaranteed API.
118+
This field may not be empty.
112119
type: string
113120
severity:
114-
description: Severity provides an explicit classification of
115-
Reason code, so the users or machines can immediately understand
116-
the current situation and act accordingly. The Severity field
117-
MUST be set only when Status=False.
121+
description: |-
122+
Severity provides an explicit classification of Reason code, so the users or machines can immediately
123+
understand the current situation and act accordingly.
124+
The Severity field MUST be set only when Status=False.
118125
type: string
119126
status:
120127
description: Status of the condition, one of True, False, Unknown.
121128
type: string
122129
type:
123-
description: Type of condition in CamelCase or in foo.example.com/CamelCase.
124-
Many .condition.type values are consistent across resources
125-
like Available, but because arbitrary conditions can be useful
126-
(see .node.status.conditions), the ability to deconflict is
127-
important.
130+
description: |-
131+
Type of condition in CamelCase or in foo.example.com/CamelCase.
132+
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
133+
can be useful (see .node.status.conditions), the ability to deconflict is important.
128134
type: string
129135
required:
130136
- lastTransitionTime

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

Lines changed: 65 additions & 51 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.13.0
6+
controller-gen.kubebuilder.io/version: v0.14.0
77
name: packetmachines.infrastructure.cluster.x-k8s.io
88
spec:
99
group: infrastructure.cluster.x-k8s.io
@@ -45,14 +45,19 @@ spec:
4545
description: PacketMachine is the Schema for the packetmachines API.
4646
properties:
4747
apiVersion:
48-
description: 'APIVersion defines the versioned schema of this representation
49-
of an object. Servers should convert recognized schemas to the latest
50-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
48+
description: |-
49+
APIVersion defines the versioned schema of this representation of an object.
50+
Servers should convert recognized schemas to the latest internal value, and
51+
may reject unrecognized values.
52+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
5153
type: string
5254
kind:
53-
description: 'Kind is a string value representing the REST resource this
54-
object represents. Servers may infer this from the endpoint the client
55-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
55+
description: |-
56+
Kind is a string value representing the REST resource this object represents.
57+
Servers may infer this from the endpoint the client submits requests to.
58+
Cannot be updated.
59+
In CamelCase.
60+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
5661
type: string
5762
metadata:
5863
type: object
@@ -64,24 +69,26 @@ spec:
6469
device.
6570
type: string
6671
facility:
67-
description: Facility represents the Packet facility for this machine.
72+
description: |-
73+
Facility represents the Packet facility for this machine.
6874
Override from the PacketCluster spec.
6975
type: string
7076
hardwareReservationID:
71-
description: HardwareReservationID is the unique device hardware reservation
72-
ID, a comma separated list of hardware reservation IDs, or `next-available`
73-
to automatically let the Packet api determine one.
77+
description: |-
78+
HardwareReservationID is the unique device hardware reservation ID, a comma separated list of
79+
hardware reservation IDs, or `next-available` to automatically let the Packet api determine one.
7480
type: string
7581
ipxeURL:
76-
description: IPXEUrl can be used to set the pxe boot url when using
77-
custom OSes with this provider. Note that OS should also be set
78-
to "custom_ipxe" if using this value.
82+
description: |-
83+
IPXEUrl can be used to set the pxe boot url when using custom OSes with this provider.
84+
Note that OS should also be set to "custom_ipxe" if using this value.
7985
type: string
8086
machineType:
8187
type: string
8288
metro:
83-
description: Metro represents the Packet metro for this machine Override
84-
from the PacketCluster spec.
89+
description: |-
90+
Metro represents the Packet metro for this machine
91+
Override from the PacketCluster spec.
8592
type: string
8693
os:
8794
type: string
@@ -130,37 +137,37 @@ spec:
130137
operational state.
131138
properties:
132139
lastTransitionTime:
133-
description: Last time the condition transitioned from one status
134-
to another. This should be when the underlying condition changed.
135-
If that is not known, then using the time when the API field
136-
changed is acceptable.
140+
description: |-
141+
Last time the condition transitioned from one status to another.
142+
This should be when the underlying condition changed. If that is not known, then using the time when
143+
the API field changed is acceptable.
137144
format: date-time
138145
type: string
139146
message:
140-
description: A human readable message indicating details about
141-
the transition. This field may be empty.
147+
description: |-
148+
A human readable message indicating details about the transition.
149+
This field may be empty.
142150
type: string
143151
reason:
144-
description: The reason for the condition's last transition
145-
in CamelCase. The specific API may choose whether or not this
146-
field is considered a guaranteed API. This field may not be
147-
empty.
152+
description: |-
153+
The reason for the condition's last transition in CamelCase.
154+
The specific API may choose whether or not this field is considered a guaranteed API.
155+
This field may not be empty.
148156
type: string
149157
severity:
150-
description: Severity provides an explicit classification of
151-
Reason code, so the users or machines can immediately understand
152-
the current situation and act accordingly. The Severity field
153-
MUST be set only when Status=False.
158+
description: |-
159+
Severity provides an explicit classification of Reason code, so the users or machines can immediately
160+
understand the current situation and act accordingly.
161+
The Severity field MUST be set only when Status=False.
154162
type: string
155163
status:
156164
description: Status of the condition, one of True, False, Unknown.
157165
type: string
158166
type:
159-
description: Type of condition in CamelCase or in foo.example.com/CamelCase.
160-
Many .condition.type values are consistent across resources
161-
like Available, but because arbitrary conditions can be useful
162-
(see .node.status.conditions), the ability to deconflict is
163-
important.
167+
description: |-
168+
Type of condition in CamelCase or in foo.example.com/CamelCase.
169+
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
170+
can be useful (see .node.status.conditions), the ability to deconflict is important.
164171
type: string
165172
required:
166173
- lastTransitionTime
@@ -169,24 +176,31 @@ spec:
169176
type: object
170177
type: array
171178
failureMessage:
172-
description: "FailureMessage will be set in the event that there is
173-
a terminal problem reconciling the Machine and will contain a more
174-
verbose string suitable for logging and human consumption. \n This
175-
field should not be set for transitive errors that a controller
176-
faces that are expected to be fixed automatically over time (like
177-
service outages), but instead indicate that something is fundamentally
178-
wrong with the Machine's spec or the configuration of the controller,
179-
and that manual intervention is required. Examples of terminal errors
180-
would be invalid combinations of settings in the spec, values that
181-
are unsupported by the controller, or the responsible controller
182-
itself being critically misconfigured. \n Any transient errors that
183-
occur during the reconciliation of Machines can be added as events
184-
to the Machine object and/or logged in the controller's output."
179+
description: |-
180+
FailureMessage will be set in the event that there is a terminal problem
181+
reconciling the Machine and will contain a more verbose string suitable
182+
for logging and human consumption.
183+
184+
185+
This field should not be set for transitive errors that a controller
186+
faces that are expected to be fixed automatically over
187+
time (like service outages), but instead indicate that something is
188+
fundamentally wrong with the Machine's spec or the configuration of
189+
the controller, and that manual intervention is required. Examples
190+
of terminal errors would be invalid combinations of settings in the
191+
spec, values that are unsupported by the controller, or the
192+
responsible controller itself being critically misconfigured.
193+
194+
195+
Any transient errors that occur during the reconciliation of Machines
196+
can be added as events to the Machine object and/or logged in the
197+
controller's output.
185198
type: string
186199
failureReason:
187-
description: Any transient errors that occur during the reconciliation
188-
of Machines can be added as events to the Machine object and/or
189-
logged in the controller's output.
200+
description: |-
201+
Any transient errors that occur during the reconciliation of Machines
202+
can be added as events to the Machine object and/or logged in the
203+
controller's output.
190204
type: string
191205
instanceStatus:
192206
description: InstanceStatus is the status of the Packet device instance

0 commit comments

Comments
 (0)