From d4eaa8a0fc1f3adfd65535844fd9197fccaeafa4 Mon Sep 17 00:00:00 2001 From: killianmuldoon Date: Wed, 17 May 2023 18:06:22 +0100 Subject: [PATCH] Deprecate v1alpha3 and v1alpha4 in CRDs Signed-off-by: killianmuldoon --- api/v1alpha3/cluster_types.go | 1 + api/v1alpha3/machine_types.go | 1 + api/v1alpha3/machinedeployment_types.go | 1 + api/v1alpha3/machinehealthcheck_types.go | 1 + api/v1alpha3/machineset_types.go | 1 + api/v1alpha4/cluster_types.go | 1 + api/v1alpha4/clusterclass_types.go | 1 + api/v1alpha4/machine_types.go | 1 + api/v1alpha4/machinedeployment_types.go | 1 + api/v1alpha4/machinehealthcheck_types.go | 1 + api/v1alpha4/machineset_types.go | 1 + bootstrap/kubeadm/api/v1alpha3/kubeadmconfig_types.go | 1 + bootstrap/kubeadm/api/v1alpha3/kubeadmconfigtemplate_types.go | 1 + bootstrap/kubeadm/api/v1alpha4/kubeadmconfig_types.go | 1 + bootstrap/kubeadm/api/v1alpha4/kubeadmconfigtemplate_types.go | 1 + .../crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml | 4 +++- .../bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml | 4 +++- .../addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml | 4 +++- .../bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml | 4 +++- config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml | 1 + config/crd/bases/cluster.x-k8s.io_clusters.yaml | 2 ++ config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml | 2 ++ config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml | 2 ++ config/crd/bases/cluster.x-k8s.io_machinepools.yaml | 2 ++ config/crd/bases/cluster.x-k8s.io_machines.yaml | 2 ++ config/crd/bases/cluster.x-k8s.io_machinesets.yaml | 2 ++ .../kubeadm/api/v1alpha3/kubeadm_control_plane_types.go | 1 + .../kubeadm/api/v1alpha4/kubeadm_control_plane_types.go | 1 + .../kubeadm/api/v1alpha4/kubeadmcontrolplanetemplate_types.go | 1 + .../controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml | 2 ++ ...olplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml | 1 + exp/addons/api/v1alpha3/clusterresourceset_types.go | 1 + exp/addons/api/v1alpha3/clusterresourcesetbinding_types.go | 1 + exp/addons/api/v1alpha4/clusterresourceset_types.go | 1 + exp/addons/api/v1alpha4/clusterresourcesetbinding_types.go | 1 + exp/api/v1alpha3/machinepool_types.go | 1 + exp/api/v1alpha4/machinepool_types.go | 1 + .../infrastructure/docker/api/v1alpha3/dockercluster_types.go | 1 + .../infrastructure/docker/api/v1alpha3/dockermachine_types.go | 1 + .../docker/api/v1alpha3/dockermachinetemplate_types.go | 1 + .../infrastructure/docker/api/v1alpha4/dockercluster_types.go | 1 + .../docker/api/v1alpha4/dockerclustertemplate_types.go | 1 + .../infrastructure/docker/api/v1alpha4/dockermachine_types.go | 1 + .../docker/api/v1alpha4/dockermachinetemplate_types.go | 1 + .../bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml | 4 +++- ...nfrastructure.cluster.x-k8s.io_dockerclustertemplates.yaml | 1 + .../infrastructure.cluster.x-k8s.io_dockermachinepools.yaml | 4 +++- .../bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml | 4 +++- ...nfrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml | 4 +++- .../docker/exp/api/v1alpha3/dockermachinepool_types.go | 1 + .../docker/exp/api/v1alpha4/dockermachinepool_types.go | 1 + 51 files changed, 74 insertions(+), 8 deletions(-) diff --git a/api/v1alpha3/cluster_types.go b/api/v1alpha3/cluster_types.go index 259eba198ecd..66dd8458a9e6 100644 --- a/api/v1alpha3/cluster_types.go +++ b/api/v1alpha3/cluster_types.go @@ -200,6 +200,7 @@ func (v APIEndpoint) String() string { // ANCHOR_END: APIEndpoint // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=clusters,shortName=cl,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Cluster status such as Pending/Provisioning/Provisioned/Deleting/Failed" diff --git a/api/v1alpha3/machine_types.go b/api/v1alpha3/machine_types.go index 6d634181c639..9b4fa2a135f8 100644 --- a/api/v1alpha3/machine_types.go +++ b/api/v1alpha3/machine_types.go @@ -237,6 +237,7 @@ type Bootstrap struct { // ANCHOR_END: Bootstrap // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=machines,shortName=ma,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="ProviderID",type="string",JSONPath=".spec.providerID",description="Provider ID" diff --git a/api/v1alpha3/machinedeployment_types.go b/api/v1alpha3/machinedeployment_types.go index 14946ccc89a8..dfc039623120 100644 --- a/api/v1alpha3/machinedeployment_types.go +++ b/api/v1alpha3/machinedeployment_types.go @@ -241,6 +241,7 @@ func (md *MachineDeploymentStatus) GetTypedPhase() MachineDeploymentPhase { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=machinedeployments,shortName=md,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector diff --git a/api/v1alpha3/machinehealthcheck_types.go b/api/v1alpha3/machinehealthcheck_types.go index cc311bac3322..d7dc862a294e 100644 --- a/api/v1alpha3/machinehealthcheck_types.go +++ b/api/v1alpha3/machinehealthcheck_types.go @@ -114,6 +114,7 @@ type MachineHealthCheckStatus struct { // ANCHOR_END: MachineHealthCheckStatus // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=machinehealthchecks,shortName=mhc;mhcs,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="MaxUnhealthy",type="string",JSONPath=".spec.maxUnhealthy",description="Maximum number of unhealthy machines allowed" diff --git a/api/v1alpha3/machineset_types.go b/api/v1alpha3/machineset_types.go index a082a4cde41c..e1c1f2ccfd06 100644 --- a/api/v1alpha3/machineset_types.go +++ b/api/v1alpha3/machineset_types.go @@ -185,6 +185,7 @@ func (m *MachineSet) Validate() field.ErrorList { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=machinesets,shortName=ms,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector diff --git a/api/v1alpha4/cluster_types.go b/api/v1alpha4/cluster_types.go index 68fe23414f23..254b2874b1c0 100644 --- a/api/v1alpha4/cluster_types.go +++ b/api/v1alpha4/cluster_types.go @@ -276,6 +276,7 @@ func (v APIEndpoint) String() string { // ANCHOR_END: APIEndpoint // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=clusters,shortName=cl,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of Cluster" diff --git a/api/v1alpha4/clusterclass_types.go b/api/v1alpha4/clusterclass_types.go index 9a1b79625625..62720d5650b3 100644 --- a/api/v1alpha4/clusterclass_types.go +++ b/api/v1alpha4/clusterclass_types.go @@ -22,6 +22,7 @@ import ( ) // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=clusterclasses,shortName=cc,scope=Namespaced,categories=cluster-api // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of ClusterClass" diff --git a/api/v1alpha4/machine_types.go b/api/v1alpha4/machine_types.go index d84e7c3ec513..08f1abd7659d 100644 --- a/api/v1alpha4/machine_types.go +++ b/api/v1alpha4/machine_types.go @@ -234,6 +234,7 @@ type Bootstrap struct { // ANCHOR_END: Bootstrap // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=machines,shortName=ma,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".spec.clusterName",description="Cluster" diff --git a/api/v1alpha4/machinedeployment_types.go b/api/v1alpha4/machinedeployment_types.go index 6aa060b5a6cc..4c5243a0b9e5 100644 --- a/api/v1alpha4/machinedeployment_types.go +++ b/api/v1alpha4/machinedeployment_types.go @@ -270,6 +270,7 @@ func (md *MachineDeploymentStatus) GetTypedPhase() MachineDeploymentPhase { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=machinedeployments,shortName=md,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector diff --git a/api/v1alpha4/machinehealthcheck_types.go b/api/v1alpha4/machinehealthcheck_types.go index 7359dd011335..b3346f1556ab 100644 --- a/api/v1alpha4/machinehealthcheck_types.go +++ b/api/v1alpha4/machinehealthcheck_types.go @@ -125,6 +125,7 @@ type MachineHealthCheckStatus struct { // ANCHOR_END: MachineHealthCheckStatus // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=machinehealthchecks,shortName=mhc;mhcs,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".spec.clusterName",description="Cluster" diff --git a/api/v1alpha4/machineset_types.go b/api/v1alpha4/machineset_types.go index 9456fecaaa37..f53ec5e4184f 100644 --- a/api/v1alpha4/machineset_types.go +++ b/api/v1alpha4/machineset_types.go @@ -195,6 +195,7 @@ func (m *MachineSet) Validate() field.ErrorList { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=machinesets,shortName=ms,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector diff --git a/bootstrap/kubeadm/api/v1alpha3/kubeadmconfig_types.go b/bootstrap/kubeadm/api/v1alpha3/kubeadmconfig_types.go index c6af28eef861..843ca08edd47 100644 --- a/bootstrap/kubeadm/api/v1alpha3/kubeadmconfig_types.go +++ b/bootstrap/kubeadm/api/v1alpha3/kubeadmconfig_types.go @@ -132,6 +132,7 @@ type KubeadmConfigStatus struct { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=kubeadmconfigs,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status diff --git a/bootstrap/kubeadm/api/v1alpha3/kubeadmconfigtemplate_types.go b/bootstrap/kubeadm/api/v1alpha3/kubeadmconfigtemplate_types.go index f74fab8e5410..0901198edd8a 100644 --- a/bootstrap/kubeadm/api/v1alpha3/kubeadmconfigtemplate_types.go +++ b/bootstrap/kubeadm/api/v1alpha3/kubeadmconfigtemplate_types.go @@ -31,6 +31,7 @@ type KubeadmConfigTemplateResource struct { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=kubeadmconfigtemplates,scope=Namespaced,categories=cluster-api // KubeadmConfigTemplate is the Schema for the kubeadmconfigtemplates API. diff --git a/bootstrap/kubeadm/api/v1alpha4/kubeadmconfig_types.go b/bootstrap/kubeadm/api/v1alpha4/kubeadmconfig_types.go index 379d5fce467b..adaf37a86d29 100644 --- a/bootstrap/kubeadm/api/v1alpha4/kubeadmconfig_types.go +++ b/bootstrap/kubeadm/api/v1alpha4/kubeadmconfig_types.go @@ -124,6 +124,7 @@ type KubeadmConfigStatus struct { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=kubeadmconfigs,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of KubeadmConfig" diff --git a/bootstrap/kubeadm/api/v1alpha4/kubeadmconfigtemplate_types.go b/bootstrap/kubeadm/api/v1alpha4/kubeadmconfigtemplate_types.go index e07feb846931..34aada3d9917 100644 --- a/bootstrap/kubeadm/api/v1alpha4/kubeadmconfigtemplate_types.go +++ b/bootstrap/kubeadm/api/v1alpha4/kubeadmconfigtemplate_types.go @@ -31,6 +31,7 @@ type KubeadmConfigTemplateResource struct { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=kubeadmconfigtemplates,scope=Namespaced,categories=cluster-api // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of KubeadmConfigTemplate" diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml index e48ca89debd8..d4b6ce502f14 100644 --- a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml +++ b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml @@ -16,7 +16,8 @@ spec: singular: kubeadmconfig scope: Namespaced versions: - - name: v1alpha3 + - deprecated: true + name: v1alpha3 schema: openAPIV3Schema: description: "KubeadmConfig is the Schema for the kubeadmconfigs API. \n Deprecated: @@ -1010,6 +1011,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml index 77324b28e605..2899e336acbb 100644 --- a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml +++ b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml @@ -16,7 +16,8 @@ spec: singular: kubeadmconfigtemplate scope: Namespaced versions: - - name: v1alpha3 + - deprecated: true + name: v1alpha3 schema: openAPIV3Schema: description: "KubeadmConfigTemplate is the Schema for the kubeadmconfigtemplates @@ -998,6 +999,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml b/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml index da18f75bc8cb..abf3ad72703c 100644 --- a/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml +++ b/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml @@ -16,7 +16,8 @@ spec: singular: clusterresourcesetbinding scope: Namespaced versions: - - name: v1alpha3 + - deprecated: true + name: v1alpha3 schema: openAPIV3Schema: description: "ClusterResourceSetBinding lists all matching ClusterResourceSets @@ -105,6 +106,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml b/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml index f1a3be4a6bc7..14b11f862101 100644 --- a/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml +++ b/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml @@ -16,7 +16,8 @@ spec: singular: clusterresourceset scope: Namespaced versions: - - name: v1alpha3 + - deprecated: true + name: v1alpha3 schema: openAPIV3Schema: description: "ClusterResourceSet is the Schema for the clusterresourcesets @@ -178,6 +179,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml b/config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml index e4b6d5baa907..e8e4a6c5887c 100644 --- a/config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml +++ b/config/crd/bases/cluster.x-k8s.io_clusterclasses.yaml @@ -23,6 +23,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/config/crd/bases/cluster.x-k8s.io_clusters.yaml b/config/crd/bases/cluster.x-k8s.io_clusters.yaml index 1db2d4d4f093..2ede29e3c34f 100644 --- a/config/crd/bases/cluster.x-k8s.io_clusters.yaml +++ b/config/crd/bases/cluster.x-k8s.io_clusters.yaml @@ -23,6 +23,7 @@ spec: jsonPath: .status.phase name: Phase type: string + deprecated: true name: v1alpha3 schema: openAPIV3Schema: @@ -284,6 +285,7 @@ spec: jsonPath: .status.phase name: Phase type: string + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml b/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml index 2e98d380d952..fb23c2406660 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml @@ -40,6 +40,7 @@ spec: jsonPath: .status.unavailableReplicas name: Unavailable type: integer + deprecated: true name: v1alpha3 schema: openAPIV3Schema: @@ -540,6 +541,7 @@ spec: jsonPath: .status.unavailableReplicas name: Unavailable type: integer + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml b/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml index 632743826ca3..1b74e97c3ed4 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml @@ -32,6 +32,7 @@ spec: jsonPath: .status.currentHealthy name: CurrentHealthy type: integer + deprecated: true name: v1alpha3 schema: openAPIV3Schema: @@ -292,6 +293,7 @@ spec: jsonPath: .status.currentHealthy name: CurrentHealthy type: integer + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/config/crd/bases/cluster.x-k8s.io_machinepools.yaml b/config/crd/bases/cluster.x-k8s.io_machinepools.yaml index 2de194fd813c..2e9572c32387 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinepools.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinepools.yaml @@ -32,6 +32,7 @@ spec: jsonPath: .spec.template.spec.version name: Version type: string + deprecated: true name: v1alpha3 schema: openAPIV3Schema: @@ -583,6 +584,7 @@ spec: jsonPath: .spec.template.spec.version name: Version type: string + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/config/crd/bases/cluster.x-k8s.io_machines.yaml b/config/crd/bases/cluster.x-k8s.io_machines.yaml index a8033c962a77..fa5512cfb7e0 100644 --- a/config/crd/bases/cluster.x-k8s.io_machines.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machines.yaml @@ -36,6 +36,7 @@ spec: name: NodeName priority: 1 type: string + deprecated: true name: v1alpha3 schema: openAPIV3Schema: @@ -383,6 +384,7 @@ spec: name: NodeName priority: 1 type: string + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/config/crd/bases/cluster.x-k8s.io_machinesets.yaml b/config/crd/bases/cluster.x-k8s.io_machinesets.yaml index 662f82050385..02f2e875b4a6 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinesets.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinesets.yaml @@ -31,6 +31,7 @@ spec: jsonPath: .status.readyReplicas name: Ready type: integer + deprecated: true name: v1alpha3 schema: openAPIV3Schema: @@ -477,6 +478,7 @@ spec: jsonPath: .status.readyReplicas name: Ready type: integer + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_types.go b/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_types.go index 27db3b11d4dc..d278a7542a5b 100644 --- a/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_types.go +++ b/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_types.go @@ -184,6 +184,7 @@ type KubeadmControlPlaneStatus struct { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=kubeadmcontrolplanes,shortName=kcp,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector diff --git a/controlplane/kubeadm/api/v1alpha4/kubeadm_control_plane_types.go b/controlplane/kubeadm/api/v1alpha4/kubeadm_control_plane_types.go index da4e4dc01ea4..19664a4e759d 100644 --- a/controlplane/kubeadm/api/v1alpha4/kubeadm_control_plane_types.go +++ b/controlplane/kubeadm/api/v1alpha4/kubeadm_control_plane_types.go @@ -198,6 +198,7 @@ type KubeadmControlPlaneStatus struct { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=kubeadmcontrolplanes,shortName=kcp,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.selector diff --git a/controlplane/kubeadm/api/v1alpha4/kubeadmcontrolplanetemplate_types.go b/controlplane/kubeadm/api/v1alpha4/kubeadmcontrolplanetemplate_types.go index 43c5485a9486..233a7e7cc316 100644 --- a/controlplane/kubeadm/api/v1alpha4/kubeadmcontrolplanetemplate_types.go +++ b/controlplane/kubeadm/api/v1alpha4/kubeadmcontrolplanetemplate_types.go @@ -26,6 +26,7 @@ type KubeadmControlPlaneTemplateSpec struct { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=kubeadmcontrolplanetemplates,scope=Namespaced,categories=cluster-api // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of KubeadmControlPlaneTemplate" diff --git a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml index 5e10f7e9c4b8..94952c5cd7c6 100644 --- a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml +++ b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml @@ -50,6 +50,7 @@ spec: jsonPath: .status.unavailableReplicas name: Unavailable type: integer + deprecated: true name: v1alpha3 schema: openAPIV3Schema: @@ -1227,6 +1228,7 @@ spec: jsonPath: .status.unavailableReplicas name: Unavailable type: integer + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml index 016a89471458..4e182d911873 100644 --- a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml +++ b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml @@ -21,6 +21,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/exp/addons/api/v1alpha3/clusterresourceset_types.go b/exp/addons/api/v1alpha3/clusterresourceset_types.go index d2c934a27080..f415640e7fa5 100644 --- a/exp/addons/api/v1alpha3/clusterresourceset_types.go +++ b/exp/addons/api/v1alpha3/clusterresourceset_types.go @@ -111,6 +111,7 @@ func (m *ClusterResourceSet) SetConditions(conditions clusterv1alpha3.Conditions } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=clusterresourcesets,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status diff --git a/exp/addons/api/v1alpha3/clusterresourcesetbinding_types.go b/exp/addons/api/v1alpha3/clusterresourcesetbinding_types.go index 1da2dfaeeab0..5be41d5f2634 100644 --- a/exp/addons/api/v1alpha3/clusterresourcesetbinding_types.go +++ b/exp/addons/api/v1alpha3/clusterresourcesetbinding_types.go @@ -101,6 +101,7 @@ func (c *ClusterResourceSetBinding) DeleteBinding(clusterResourceSet *ClusterRes } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=clusterresourcesetbindings,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status diff --git a/exp/addons/api/v1alpha4/clusterresourceset_types.go b/exp/addons/api/v1alpha4/clusterresourceset_types.go index a59acc5de363..863adc966730 100644 --- a/exp/addons/api/v1alpha4/clusterresourceset_types.go +++ b/exp/addons/api/v1alpha4/clusterresourceset_types.go @@ -112,6 +112,7 @@ func (m *ClusterResourceSet) SetConditions(conditions clusterv1alpha4.Conditions } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=clusterresourcesets,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of ClusterResourceSet" diff --git a/exp/addons/api/v1alpha4/clusterresourcesetbinding_types.go b/exp/addons/api/v1alpha4/clusterresourcesetbinding_types.go index c7013a4487d2..44778e9db9c5 100644 --- a/exp/addons/api/v1alpha4/clusterresourcesetbinding_types.go +++ b/exp/addons/api/v1alpha4/clusterresourcesetbinding_types.go @@ -101,6 +101,7 @@ func (c *ClusterResourceSetBinding) DeleteBinding(clusterResourceSet *ClusterRes } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=clusterresourcesetbindings,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of ClusterResourceSetBinding" diff --git a/exp/api/v1alpha3/machinepool_types.go b/exp/api/v1alpha3/machinepool_types.go index b40474948821..18a3c0addf32 100644 --- a/exp/api/v1alpha3/machinepool_types.go +++ b/exp/api/v1alpha3/machinepool_types.go @@ -204,6 +204,7 @@ func (m *MachinePoolStatus) GetTypedPhase() MachinePoolPhase { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=machinepools,shortName=mp,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas diff --git a/exp/api/v1alpha4/machinepool_types.go b/exp/api/v1alpha4/machinepool_types.go index 4cd86bd78aeb..6b8c5042be0d 100644 --- a/exp/api/v1alpha4/machinepool_types.go +++ b/exp/api/v1alpha4/machinepool_types.go @@ -199,6 +199,7 @@ func (m *MachinePoolStatus) GetTypedPhase() MachinePoolPhase { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=machinepools,shortName=mp,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas diff --git a/test/infrastructure/docker/api/v1alpha3/dockercluster_types.go b/test/infrastructure/docker/api/v1alpha3/dockercluster_types.go index 528cf92fe55e..dc9b95237b37 100644 --- a/test/infrastructure/docker/api/v1alpha3/dockercluster_types.go +++ b/test/infrastructure/docker/api/v1alpha3/dockercluster_types.go @@ -71,6 +71,7 @@ type APIEndpoint struct { // +kubebuilder:resource:path=dockerclusters,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // DockerCluster is the Schema for the dockerclusters API. // diff --git a/test/infrastructure/docker/api/v1alpha3/dockermachine_types.go b/test/infrastructure/docker/api/v1alpha3/dockermachine_types.go index 5cde2c0b9201..753b06f70540 100644 --- a/test/infrastructure/docker/api/v1alpha3/dockermachine_types.go +++ b/test/infrastructure/docker/api/v1alpha3/dockermachine_types.go @@ -93,6 +93,7 @@ type DockerMachineStatus struct { // +kubebuilder:resource:path=dockermachines,scope=Namespaced,categories=cluster-api // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:subresource:status // DockerMachine is the Schema for the dockermachines API. diff --git a/test/infrastructure/docker/api/v1alpha3/dockermachinetemplate_types.go b/test/infrastructure/docker/api/v1alpha3/dockermachinetemplate_types.go index 8de0ade3efd3..4109c4429eb5 100644 --- a/test/infrastructure/docker/api/v1alpha3/dockermachinetemplate_types.go +++ b/test/infrastructure/docker/api/v1alpha3/dockermachinetemplate_types.go @@ -26,6 +26,7 @@ type DockerMachineTemplateSpec struct { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=dockermachinetemplates,scope=Namespaced,categories=cluster-api // DockerMachineTemplate is the Schema for the dockermachinetemplates API. diff --git a/test/infrastructure/docker/api/v1alpha4/dockercluster_types.go b/test/infrastructure/docker/api/v1alpha4/dockercluster_types.go index 3287266eb725..3073d0f96684 100644 --- a/test/infrastructure/docker/api/v1alpha4/dockercluster_types.go +++ b/test/infrastructure/docker/api/v1alpha4/dockercluster_types.go @@ -95,6 +95,7 @@ type APIEndpoint struct { // +kubebuilder:resource:path=dockerclusters,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerCluster" // DockerCluster is the Schema for the dockerclusters API. diff --git a/test/infrastructure/docker/api/v1alpha4/dockerclustertemplate_types.go b/test/infrastructure/docker/api/v1alpha4/dockerclustertemplate_types.go index 7e259fe5b590..b29959f49c63 100644 --- a/test/infrastructure/docker/api/v1alpha4/dockerclustertemplate_types.go +++ b/test/infrastructure/docker/api/v1alpha4/dockerclustertemplate_types.go @@ -26,6 +26,7 @@ type DockerClusterTemplateSpec struct { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerClusterTemplate" // DockerClusterTemplate is the Schema for the dockerclustertemplates API. diff --git a/test/infrastructure/docker/api/v1alpha4/dockermachine_types.go b/test/infrastructure/docker/api/v1alpha4/dockermachine_types.go index 1e3a740b0772..a96279d69855 100644 --- a/test/infrastructure/docker/api/v1alpha4/dockermachine_types.go +++ b/test/infrastructure/docker/api/v1alpha4/dockermachine_types.go @@ -93,6 +93,7 @@ type DockerMachineStatus struct { // +kubebuilder:resource:path=dockermachines,scope=Namespaced,categories=cluster-api // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerMachine" diff --git a/test/infrastructure/docker/api/v1alpha4/dockermachinetemplate_types.go b/test/infrastructure/docker/api/v1alpha4/dockermachinetemplate_types.go index f0cdb053e33a..36b225fe8ecf 100644 --- a/test/infrastructure/docker/api/v1alpha4/dockermachinetemplate_types.go +++ b/test/infrastructure/docker/api/v1alpha4/dockermachinetemplate_types.go @@ -26,6 +26,7 @@ type DockerMachineTemplateSpec struct { } // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:resource:path=dockermachinetemplates,scope=Namespaced,categories=cluster-api // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerMachineTemplate" diff --git a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml index ddf63ddba3fd..ce39bd399fda 100644 --- a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml +++ b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclusters.yaml @@ -16,7 +16,8 @@ spec: singular: dockercluster scope: Namespaced versions: - - name: v1alpha3 + - deprecated: true + name: v1alpha3 schema: openAPIV3Schema: description: "DockerCluster is the Schema for the dockerclusters API. \n Deprecated: @@ -160,6 +161,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclustertemplates.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclustertemplates.yaml index 4c898edd62b0..9037a0acf2fa 100644 --- a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclustertemplates.yaml +++ b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockerclustertemplates.yaml @@ -21,6 +21,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml index 1872fe12adf2..73599f314f54 100644 --- a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml +++ b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml @@ -16,7 +16,8 @@ spec: singular: dockermachinepool scope: Namespaced versions: - - name: v1alpha3 + - deprecated: true + name: v1alpha3 schema: openAPIV3Schema: description: "DockerMachinePool is the Schema for the dockermachinepools API. @@ -201,6 +202,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml index 493e55398b47..a227ac4b7997 100644 --- a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml +++ b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachines.yaml @@ -16,7 +16,8 @@ spec: singular: dockermachine scope: Namespaced versions: - - name: v1alpha3 + - deprecated: true + name: v1alpha3 schema: openAPIV3Schema: description: "DockerMachine is the Schema for the dockermachines API. \n Deprecated: @@ -163,6 +164,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml index f5c3d0ccb183..a66cd3c0623d 100644 --- a/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml +++ b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinetemplates.yaml @@ -16,7 +16,8 @@ spec: singular: dockermachinetemplate scope: Namespaced versions: - - name: v1alpha3 + - deprecated: true + name: v1alpha3 schema: openAPIV3Schema: description: "DockerMachineTemplate is the Schema for the dockermachinetemplates @@ -102,6 +103,7 @@ spec: jsonPath: .metadata.creationTimestamp name: Age type: date + deprecated: true name: v1alpha4 schema: openAPIV3Schema: diff --git a/test/infrastructure/docker/exp/api/v1alpha3/dockermachinepool_types.go b/test/infrastructure/docker/exp/api/v1alpha3/dockermachinepool_types.go index f6c21ec6e9fa..e04ca0766727 100644 --- a/test/infrastructure/docker/exp/api/v1alpha3/dockermachinepool_types.go +++ b/test/infrastructure/docker/exp/api/v1alpha3/dockermachinepool_types.go @@ -113,6 +113,7 @@ type DockerMachinePoolInstanceStatus struct { // +kubebuilder:resource:path=dockermachinepools,scope=Namespaced,categories=cluster-api // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:subresource:status // DockerMachinePool is the Schema for the dockermachinepools API. diff --git a/test/infrastructure/docker/exp/api/v1alpha4/dockermachinepool_types.go b/test/infrastructure/docker/exp/api/v1alpha4/dockermachinepool_types.go index 426a7d49df57..33fc201ac40d 100644 --- a/test/infrastructure/docker/exp/api/v1alpha4/dockermachinepool_types.go +++ b/test/infrastructure/docker/exp/api/v1alpha4/dockermachinepool_types.go @@ -113,6 +113,7 @@ type DockerMachinePoolInstanceStatus struct { // +kubebuilder:resource:path=dockermachinepools,scope=Namespaced,categories=cluster-api // +kubebuilder:object:root=true +// +kubebuilder:deprecatedversion // +kubebuilder:subresource:status // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of DockerMachinePool"