Skip to content

Commit e440c4e

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8687 from killianmuldoon/pr-deprecate-v1alpha3-v1alpha4
🌱 Deprecate v1alpha3 and v1alpha4 in CRDs
2 parents 32687b1 + 072cb19 commit e440c4e

File tree

51 files changed

+74
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+74
-8
lines changed

‎api/v1alpha3/cluster_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ func (v APIEndpoint) String() string {
200200
// ANCHOR_END: APIEndpoint
201201

202202
// +kubebuilder:object:root=true
203+
// +kubebuilder:deprecatedversion
203204
// +kubebuilder:resource:path=clusters,shortName=cl,scope=Namespaced,categories=cluster-api
204205
// +kubebuilder:subresource:status
205206
// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Cluster status such as Pending/Provisioning/Provisioned/Deleting/Failed"

‎api/v1alpha3/machine_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ type Bootstrap struct {
237237
// ANCHOR_END: Bootstrap
238238

239239
// +kubebuilder:object:root=true
240+
// +kubebuilder:deprecatedversion
240241
// +kubebuilder:resource:path=machines,shortName=ma,scope=Namespaced,categories=cluster-api
241242
// +kubebuilder:subresource:status
242243
// +kubebuilder:printcolumn:name="ProviderID",type="string",JSONPath=".spec.providerID",description="Provider ID"

‎api/v1alpha3/machinedeployment_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ func (md *MachineDeploymentStatus) GetTypedPhase() MachineDeploymentPhase {
241241
}
242242

243243
// +kubebuilder:object:root=true
244+
// +kubebuilder:deprecatedversion
244245
// +kubebuilder:resource:path=machinedeployments,shortName=md,scope=Namespaced,categories=cluster-api
245246
// +kubebuilder:subresource:status
246247
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector

‎api/v1alpha3/machinehealthcheck_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ type MachineHealthCheckStatus struct {
114114
// ANCHOR_END: MachineHealthCheckStatus
115115

116116
// +kubebuilder:object:root=true
117+
// +kubebuilder:deprecatedversion
117118
// +kubebuilder:resource:path=machinehealthchecks,shortName=mhc;mhcs,scope=Namespaced,categories=cluster-api
118119
// +kubebuilder:subresource:status
119120
// +kubebuilder:printcolumn:name="MaxUnhealthy",type="string",JSONPath=".spec.maxUnhealthy",description="Maximum number of unhealthy machines allowed"

‎api/v1alpha3/machineset_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ func (m *MachineSet) Validate() field.ErrorList {
185185
}
186186

187187
// +kubebuilder:object:root=true
188+
// +kubebuilder:deprecatedversion
188189
// +kubebuilder:resource:path=machinesets,shortName=ms,scope=Namespaced,categories=cluster-api
189190
// +kubebuilder:subresource:status
190191
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector

‎api/v1alpha4/cluster_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ func (v APIEndpoint) String() string {
276276
// ANCHOR_END: APIEndpoint
277277

278278
// +kubebuilder:object:root=true
279+
// +kubebuilder:deprecatedversion
279280
// +kubebuilder:resource:path=clusters,shortName=cl,scope=Namespaced,categories=cluster-api
280281
// +kubebuilder:subresource:status
281282
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of Cluster"

‎api/v1alpha4/clusterclass_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
)
2323

2424
// +kubebuilder:object:root=true
25+
// +kubebuilder:deprecatedversion
2526
// +kubebuilder:resource:path=clusterclasses,shortName=cc,scope=Namespaced,categories=cluster-api
2627
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of ClusterClass"
2728

‎api/v1alpha4/machine_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ type Bootstrap struct {
234234
// ANCHOR_END: Bootstrap
235235

236236
// +kubebuilder:object:root=true
237+
// +kubebuilder:deprecatedversion
237238
// +kubebuilder:resource:path=machines,shortName=ma,scope=Namespaced,categories=cluster-api
238239
// +kubebuilder:subresource:status
239240
// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".spec.clusterName",description="Cluster"

‎api/v1alpha4/machinedeployment_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ func (md *MachineDeploymentStatus) GetTypedPhase() MachineDeploymentPhase {
270270
}
271271

272272
// +kubebuilder:object:root=true
273+
// +kubebuilder:deprecatedversion
273274
// +kubebuilder:resource:path=machinedeployments,shortName=md,scope=Namespaced,categories=cluster-api
274275
// +kubebuilder:subresource:status
275276
// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector

‎api/v1alpha4/machinehealthcheck_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ type MachineHealthCheckStatus struct {
125125
// ANCHOR_END: MachineHealthCheckStatus
126126

127127
// +kubebuilder:object:root=true
128+
// +kubebuilder:deprecatedversion
128129
// +kubebuilder:resource:path=machinehealthchecks,shortName=mhc;mhcs,scope=Namespaced,categories=cluster-api
129130
// +kubebuilder:subresource:status
130131
// +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".spec.clusterName",description="Cluster"

0 commit comments

Comments
 (0)