Skip to content

Commit 9bee35d

Browse files
sbueringersbueringer
committed
Deprecate v1alpha3 & v1alpha4
Signed-off-by: Stefan Büringer [email protected]
1 parent 46c3438 commit 9bee35d

File tree

65 files changed

+235
-48
lines changed

Some content is hidden

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

65 files changed

+235
-48
lines changed

‎.golangci.yml

+12-1
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,21 @@ issues:
219219
# changes in PRs and avoid nitpicking.
220220
exclude-use-default: false
221221
exclude-rules:
222-
# Specific exclude rules for deprecated fields that are still part of the codebase. These should be removed as the referenced deprecated item is removed from the project.
222+
# Specific exclude rules for deprecated fields that are still part of the codebase. These
223+
# should be removed as the referenced deprecated item is removed from the project.
223224
- linters:
224225
- staticcheck
225226
text: "SA1019: (bootstrapv1.ClusterStatus|scope.Config.Spec.UseExperimentalRetryJoin|DockerMachine.Spec.Bootstrapped|machineStatus.Bootstrapped) is deprecated"
227+
# Specific exclude rules for deprecated packages that are still part of the codebase. These
228+
# should be removed as the referenced deprecated packages are removed from the project.
229+
- linters:
230+
- staticcheck
231+
text: "SA1019: .* is deprecated: This package will be removed in one of the next releases."
232+
# Specific exclude rules for deprecated types that are still part of the codebase. These
233+
# should be removed as the referenced deprecated types are removed from the project.
234+
- linters:
235+
- staticcheck
236+
text: "SA1019: (clusterv1alpha3.*|clusterv1alpha4.*) is deprecated: This type will be removed in one of the next releases."
226237
- linters:
227238
- revive
228239
text: "exported: exported method .*\\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported"

‎api/v1alpha3/doc.go

+2
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ limitations under the License.
1616

1717
// Package v1alpha3 contains the v1alpha3 API implementation.
1818
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/api/v1beta1
19+
//
20+
// Deprecated: This package will be removed in one of the next releases.
1921
package v1alpha3

‎api/v1alpha3/machine_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ type Bootstrap struct {
245245
// +kubebuilder:printcolumn:name="NodeName",type="string",JSONPath=".status.nodeRef.name",description="Node name associated with this machine",priority=1
246246

247247
// Machine is the Schema for the machines API.
248+
//
249+
// Deprecated: This type will be removed in one of the next releases.
248250
type Machine struct {
249251
metav1.TypeMeta `json:",inline"`
250252
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -266,6 +268,8 @@ func (m *Machine) SetConditions(conditions Conditions) {
266268
// +kubebuilder:object:root=true
267269

268270
// MachineList contains a list of Machine.
271+
//
272+
// Deprecated: This type will be removed in one of the next releases.
269273
type MachineList struct {
270274
metav1.TypeMeta `json:",inline"`
271275
metav1.ListMeta `json:"metadata,omitempty"`

‎api/v1alpha3/machinedeployment_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ func (md *MachineDeploymentStatus) GetTypedPhase() MachineDeploymentPhase {
251251
// +kubebuilder:printcolumn:name="Unavailable",type=integer,JSONPath=".status.unavailableReplicas",description="Total number of unavailable machines targeted by this MachineDeployment"
252252

253253
// MachineDeployment is the Schema for the machinedeployments API.
254+
//
255+
// Deprecated: This type will be removed in one of the next releases.
254256
type MachineDeployment struct {
255257
metav1.TypeMeta `json:",inline"`
256258
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -262,6 +264,8 @@ type MachineDeployment struct {
262264
// +kubebuilder:object:root=true
263265

264266
// MachineDeploymentList contains a list of MachineDeployment.
267+
//
268+
// Deprecated: This type will be removed in one of the next releases.
265269
type MachineDeploymentList struct {
266270
metav1.TypeMeta `json:",inline"`
267271
metav1.ListMeta `json:"metadata,omitempty"`

‎api/v1alpha3/machinehealthcheck_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ type MachineHealthCheckStatus struct {
121121
// +kubebuilder:printcolumn:name="CurrentHealthy",type="integer",JSONPath=".status.currentHealthy",description="Current observed healthy machines"
122122

123123
// MachineHealthCheck is the Schema for the machinehealthchecks API.
124+
//
125+
// Deprecated: This type will be removed in one of the next releases.
124126
type MachineHealthCheck struct {
125127
metav1.TypeMeta `json:",inline"`
126128
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -145,6 +147,8 @@ func (m *MachineHealthCheck) SetConditions(conditions Conditions) {
145147
// +kubebuilder:object:root=true
146148

147149
// MachineHealthCheckList contains a list of MachineHealthCheck.
150+
//
151+
// Deprecated: This type will be removed in one of the next releases.
148152
type MachineHealthCheckList struct {
149153
metav1.TypeMeta `json:",inline"`
150154
metav1.ListMeta `json:"metadata,omitempty"`

‎api/v1alpha3/machineset_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ func (m *MachineSet) Validate() field.ErrorList {
193193
// +kubebuilder:printcolumn:name="Ready",type="integer",JSONPath=".status.readyReplicas",description="Total number of ready machines targeted by this machineset."
194194

195195
// MachineSet is the Schema for the machinesets API.
196+
//
197+
// Deprecated: This type will be removed in one of the next releases.
196198
type MachineSet struct {
197199
metav1.TypeMeta `json:",inline"`
198200
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -204,6 +206,8 @@ type MachineSet struct {
204206
// +kubebuilder:object:root=true
205207

206208
// MachineSetList contains a list of MachineSet.
209+
//
210+
// Deprecated: This type will be removed in one of the next releases.
207211
type MachineSetList struct {
208212
metav1.TypeMeta `json:",inline"`
209213
metav1.ListMeta `json:"metadata,omitempty"`

‎api/v1alpha4/cluster_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,8 @@ func (v APIEndpoint) String() string {
282282
// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Cluster status such as Pending/Provisioning/Provisioned/Deleting/Failed"
283283

284284
// Cluster is the Schema for the clusters API.
285+
//
286+
// Deprecated: This type will be removed in one of the next releases.
285287
type Cluster struct {
286288
metav1.TypeMeta `json:",inline"`
287289
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -387,6 +389,8 @@ func (f ClusterIPFamily) String() string {
387389
// +kubebuilder:object:root=true
388390

389391
// ClusterList contains a list of Cluster.
392+
//
393+
// Deprecated: This type will be removed in one of the next releases.
390394
type ClusterList struct {
391395
metav1.TypeMeta `json:",inline"`
392396
metav1.ListMeta `json:"metadata,omitempty"`

‎api/v1alpha4/clusterclass_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ import (
2626
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of ClusterClass"
2727

2828
// ClusterClass is a template which can be used to create managed topologies.
29+
//
30+
// Deprecated: This type will be removed in one of the next releases.
2931
type ClusterClass struct {
3032
metav1.TypeMeta `json:",inline"`
3133
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -121,6 +123,8 @@ type LocalObjectTemplate struct {
121123
// +kubebuilder:object:root=true
122124

123125
// ClusterClassList contains a list of Cluster.
126+
//
127+
// Deprecated: This type will be removed in one of the next releases.
124128
type ClusterClassList struct {
125129
metav1.TypeMeta `json:",inline"`
126130
metav1.ListMeta `json:"metadata,omitempty"`

‎api/v1alpha4/doc.go

+2
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ limitations under the License.
1616

1717
// Package v1alpha4 contains the v1alpha4 API implementation.
1818
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/api/v1beta1
19+
//
20+
// Deprecated: This package will be removed in one of the next releases.
1921
package v1alpha4

‎api/v1alpha4/machine_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ type Bootstrap struct {
244244
// +kubebuilder:printcolumn:name="NodeName",type="string",JSONPath=".status.nodeRef.name",description="Node name associated with this machine",priority=1
245245

246246
// Machine is the Schema for the machines API.
247+
//
248+
// Deprecated: This type will be removed in one of the next releases.
247249
type Machine struct {
248250
metav1.TypeMeta `json:",inline"`
249251
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -265,6 +267,8 @@ func (m *Machine) SetConditions(conditions Conditions) {
265267
// +kubebuilder:object:root=true
266268

267269
// MachineList contains a list of Machine.
270+
//
271+
// Deprecated: This type will be removed in one of the next releases.
268272
type MachineList struct {
269273
metav1.TypeMeta `json:",inline"`
270274
metav1.ListMeta `json:"metadata,omitempty"`

‎api/v1alpha4/machinedeployment_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,8 @@ func (md *MachineDeploymentStatus) GetTypedPhase() MachineDeploymentPhase {
282282
// +kubebuilder:printcolumn:name="Unavailable",type=integer,JSONPath=".status.unavailableReplicas",description="Total number of unavailable machines targeted by this MachineDeployment"
283283

284284
// MachineDeployment is the Schema for the machinedeployments API.
285+
//
286+
// Deprecated: This type will be removed in one of the next releases.
285287
type MachineDeployment struct {
286288
metav1.TypeMeta `json:",inline"`
287289
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -293,6 +295,8 @@ type MachineDeployment struct {
293295
// +kubebuilder:object:root=true
294296

295297
// MachineDeploymentList contains a list of MachineDeployment.
298+
//
299+
// Deprecated: This type will be removed in one of the next releases.
296300
type MachineDeploymentList struct {
297301
metav1.TypeMeta `json:",inline"`
298302
metav1.ListMeta `json:"metadata,omitempty"`

‎api/v1alpha4/machinehealthcheck_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ type MachineHealthCheckStatus struct {
134134
// +kubebuilder:printcolumn:name="CurrentHealthy",type="integer",JSONPath=".status.currentHealthy",description="Current observed healthy machines"
135135

136136
// MachineHealthCheck is the Schema for the machinehealthchecks API.
137+
//
138+
// Deprecated: This type will be removed in one of the next releases.
137139
type MachineHealthCheck struct {
138140
metav1.TypeMeta `json:",inline"`
139141
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -158,6 +160,8 @@ func (m *MachineHealthCheck) SetConditions(conditions Conditions) {
158160
// +kubebuilder:object:root=true
159161

160162
// MachineHealthCheckList contains a list of MachineHealthCheck.
163+
//
164+
// Deprecated: This type will be removed in one of the next releases.
161165
type MachineHealthCheckList struct {
162166
metav1.TypeMeta `json:",inline"`
163167
metav1.ListMeta `json:"metadata,omitempty"`

‎api/v1alpha4/machineset_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ func (m *MachineSet) Validate() field.ErrorList {
205205
// +kubebuilder:printcolumn:name="Ready",type="integer",JSONPath=".status.readyReplicas",description="Total number of ready machines targeted by this machineset."
206206

207207
// MachineSet is the Schema for the machinesets API.
208+
//
209+
// Deprecated: This type will be removed in one of the next releases.
208210
type MachineSet struct {
209211
metav1.TypeMeta `json:",inline"`
210212
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -216,6 +218,8 @@ type MachineSet struct {
216218
// +kubebuilder:object:root=true
217219

218220
// MachineSetList contains a list of MachineSet.
221+
//
222+
// Deprecated: This type will be removed in one of the next releases.
219223
type MachineSetList struct {
220224
metav1.TypeMeta `json:",inline"`
221225
metav1.ListMeta `json:"metadata,omitempty"`

‎bootstrap/kubeadm/api/v1alpha3/doc.go

+2
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ limitations under the License.
1616

1717
// Package v1alpha3 contains the v1alpha3 API implementation.
1818
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
19+
//
20+
// Deprecated: This package will be removed in one of the next releases.
1921
package v1alpha3

‎bootstrap/kubeadm/api/v1alpha3/kubeadmconfig_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ type KubeadmConfigStatus struct {
136136
// +kubebuilder:subresource:status
137137

138138
// KubeadmConfig is the Schema for the kubeadmconfigs API.
139+
//
140+
// Deprecated: This type will be removed in one of the next releases.
139141
type KubeadmConfig struct {
140142
metav1.TypeMeta `json:",inline"`
141143
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -157,6 +159,8 @@ func (c *KubeadmConfig) SetConditions(conditions clusterv1alpha3.Conditions) {
157159
// +kubebuilder:object:root=true
158160

159161
// KubeadmConfigList contains a list of KubeadmConfig.
162+
//
163+
// Deprecated: This type will be removed in one of the next releases.
160164
type KubeadmConfigList struct {
161165
metav1.TypeMeta `json:",inline"`
162166
metav1.ListMeta `json:"metadata,omitempty"`

‎bootstrap/kubeadm/api/v1alpha3/kubeadmconfigtemplate_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ type KubeadmConfigTemplateResource struct {
3434
// +kubebuilder:resource:path=kubeadmconfigtemplates,scope=Namespaced,categories=cluster-api
3535

3636
// KubeadmConfigTemplate is the Schema for the kubeadmconfigtemplates API.
37+
//
38+
// Deprecated: This type will be removed in one of the next releases.
3739
type KubeadmConfigTemplate struct {
3840
metav1.TypeMeta `json:",inline"`
3941
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -44,6 +46,8 @@ type KubeadmConfigTemplate struct {
4446
// +kubebuilder:object:root=true
4547

4648
// KubeadmConfigTemplateList contains a list of KubeadmConfigTemplate.
49+
//
50+
// Deprecated: This type will be removed in one of the next releases.
4751
type KubeadmConfigTemplateList struct {
4852
metav1.TypeMeta `json:",inline"`
4953
metav1.ListMeta `json:"metadata,omitempty"`

‎bootstrap/kubeadm/api/v1alpha4/doc.go

+2
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ limitations under the License.
1616

1717
// Package v1alpha4 contains the v1alpha4 API implementation.
1818
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1
19+
//
20+
// Deprecated: This package will be removed in one of the next releases.
1921
package v1alpha4

‎bootstrap/kubeadm/api/v1alpha4/kubeadmconfig_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ type KubeadmConfigStatus struct {
129129
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of KubeadmConfig"
130130

131131
// KubeadmConfig is the Schema for the kubeadmconfigs API.
132+
//
133+
// Deprecated: This type will be removed in one of the next releases.
132134
type KubeadmConfig struct {
133135
metav1.TypeMeta `json:",inline"`
134136
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -150,6 +152,8 @@ func (c *KubeadmConfig) SetConditions(conditions clusterv1alpha4.Conditions) {
150152
// +kubebuilder:object:root=true
151153

152154
// KubeadmConfigList contains a list of KubeadmConfig.
155+
//
156+
// Deprecated: This type will be removed in one of the next releases.
153157
type KubeadmConfigList struct {
154158
metav1.TypeMeta `json:",inline"`
155159
metav1.ListMeta `json:"metadata,omitempty"`

‎bootstrap/kubeadm/api/v1alpha4/kubeadmconfigtemplate_types.go

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ type KubeadmConfigTemplateResource struct {
3535
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of KubeadmConfigTemplate"
3636

3737
// KubeadmConfigTemplate is the Schema for the kubeadmconfigtemplates API.
38+
//
39+
// Deprecated: This type will be removed in one of the next releases.
3840
type KubeadmConfigTemplate struct {
3941
metav1.TypeMeta `json:",inline"`
4042
metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -45,6 +47,8 @@ type KubeadmConfigTemplate struct {
4547
// +kubebuilder:object:root=true
4648

4749
// KubeadmConfigTemplateList contains a list of KubeadmConfigTemplate.
50+
//
51+
// Deprecated: This type will be removed in one of the next releases.
4852
type KubeadmConfigTemplateList struct {
4953
metav1.TypeMeta `json:",inline"`
5054
metav1.ListMeta `json:"metadata,omitempty"`

‎bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml

+6-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)