diff --git a/api/v1alpha3/cluster_types.go b/api/v1alpha3/cluster_types.go index 259eba198ecd..3563ba1cf694 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:unservedversion // +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" @@ -224,6 +225,7 @@ func (c *Cluster) SetConditions(conditions Conditions) { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // ClusterList contains a list of Cluster. type ClusterList struct { diff --git a/api/v1alpha3/doc.go b/api/v1alpha3/doc.go index 6f187ea21760..ec357438aec7 100644 --- a/api/v1alpha3/doc.go +++ b/api/v1alpha3/doc.go @@ -18,4 +18,5 @@ limitations under the License. // +k8s:conversion-gen=sigs.k8s.io/cluster-api/api/v1beta1 // // Deprecated: This package will be removed in one of the next releases. +// +kubebuilder:unservedversion package v1alpha3 diff --git a/api/v1alpha3/machine_types.go b/api/v1alpha3/machine_types.go index 6d634181c639..3f6efeda3c0f 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:unservedversion // +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" @@ -266,6 +267,7 @@ func (m *Machine) SetConditions(conditions Conditions) { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // MachineList contains a list of Machine. // diff --git a/api/v1alpha3/machinedeployment_types.go b/api/v1alpha3/machinedeployment_types.go index 14946ccc89a8..1cac18c1ea50 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:unservedversion // +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 @@ -262,6 +263,7 @@ type MachineDeployment struct { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // MachineDeploymentList contains a list of MachineDeployment. // diff --git a/api/v1alpha3/machinehealthcheck_types.go b/api/v1alpha3/machinehealthcheck_types.go index cc311bac3322..b7edfed62160 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:unservedversion // +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" @@ -145,6 +146,7 @@ func (m *MachineHealthCheck) SetConditions(conditions Conditions) { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // MachineHealthCheckList contains a list of MachineHealthCheck. // diff --git a/api/v1alpha3/machineset_types.go b/api/v1alpha3/machineset_types.go index a082a4cde41c..5af39a8a99e2 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:unservedversion // +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 @@ -204,6 +205,7 @@ type MachineSet struct { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // MachineSetList contains a list of MachineSet. // diff --git a/bootstrap/kubeadm/api/v1alpha3/kubeadmconfig_types.go b/bootstrap/kubeadm/api/v1alpha3/kubeadmconfig_types.go index c6af28eef861..363a1be8d02f 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:unservedversion // +kubebuilder:resource:path=kubeadmconfigs,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status @@ -157,6 +158,7 @@ func (c *KubeadmConfig) SetConditions(conditions clusterv1alpha3.Conditions) { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // KubeadmConfigList contains a list of KubeadmConfig. // diff --git a/bootstrap/kubeadm/api/v1alpha3/kubeadmconfigtemplate_types.go b/bootstrap/kubeadm/api/v1alpha3/kubeadmconfigtemplate_types.go index f74fab8e5410..724bac0df4e9 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:unservedversion // +kubebuilder:resource:path=kubeadmconfigtemplates,scope=Namespaced,categories=cluster-api // KubeadmConfigTemplate is the Schema for the kubeadmconfigtemplates API. @@ -44,6 +45,7 @@ type KubeadmConfigTemplate struct { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // KubeadmConfigTemplateList contains a list 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 f88b1bd00a26..d865ca937024 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 @@ -1002,7 +1002,7 @@ spec: type: boolean type: object type: object - served: true + served: false storage: false subresources: status: {} 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 abad81720568..ca95ed45f34a 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 @@ -992,7 +992,7 @@ spec: - template type: object type: object - served: true + served: false storage: false - additionalPrinterColumns: - description: Time duration since creation of KubeadmConfigTemplate diff --git a/config/crd/bases/cluster.x-k8s.io_clusters.yaml b/config/crd/bases/cluster.x-k8s.io_clusters.yaml index 4874c59b3cd5..72434b82ed67 100644 --- a/config/crd/bases/cluster.x-k8s.io_clusters.yaml +++ b/config/crd/bases/cluster.x-k8s.io_clusters.yaml @@ -272,7 +272,7 @@ spec: type: string type: object type: object - served: true + served: false storage: false subresources: status: {} diff --git a/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml b/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml index 745aff949158..a37ebd76568c 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml @@ -503,7 +503,7 @@ spec: type: integer type: object type: object - served: true + served: false storage: false subresources: scale: diff --git a/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml b/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml index 6405395a3bcb..3e659c99a668 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml @@ -268,7 +268,7 @@ spec: type: array type: object type: object - served: true + served: false storage: false subresources: status: {} diff --git a/config/crd/bases/cluster.x-k8s.io_machines.yaml b/config/crd/bases/cluster.x-k8s.io_machines.yaml index 10ff7ad3d820..994eca184ba6 100644 --- a/config/crd/bases/cluster.x-k8s.io_machines.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machines.yaml @@ -354,7 +354,7 @@ spec: type: string type: object type: object - served: true + served: false storage: false subresources: status: {} diff --git a/config/crd/bases/cluster.x-k8s.io_machinesets.yaml b/config/crd/bases/cluster.x-k8s.io_machinesets.yaml index fb8ee2fd691e..c31ef825852f 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinesets.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinesets.yaml @@ -449,7 +449,7 @@ spec: type: string type: object type: object - served: true + served: false storage: false subresources: scale: diff --git a/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_types.go b/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_types.go index 27db3b11d4dc..4c9505a3d3a0 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:unservedversion // +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 @@ -217,6 +218,7 @@ func (in *KubeadmControlPlane) SetConditions(conditions clusterv1alpha3.Conditio } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // KubeadmControlPlaneList contains a list of KubeadmControlPlane. // 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 e0fb72a10f18..74e8482b2f88 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 @@ -1184,7 +1184,7 @@ spec: type: integer type: object type: object - served: true + served: false storage: false subresources: scale: diff --git a/docs/book/src/developer/providers/migrations/v1.4-to-v1.5.md b/docs/book/src/developer/providers/migrations/v1.4-to-v1.5.md index fd0d8e014c58..b7569f74cc45 100644 --- a/docs/book/src/developer/providers/migrations/v1.4-to-v1.5.md +++ b/docs/book/src/developer/providers/migrations/v1.4-to-v1.5.md @@ -16,12 +16,14 @@ maintainers of providers and consumers of our Go API. ## Changes by Kind ### Deprecation +- +- API version`v1alpha4` is deprecated and will be removed in v1.6. -- ### Removals -- +- API version `v1alpha3` is removed from v1.5. + ### API Changes diff --git a/test/infrastructure/docker/api/v1alpha3/dockercluster_types.go b/test/infrastructure/docker/api/v1alpha3/dockercluster_types.go index 528cf92fe55e..a6a1487ccf47 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:unservedversion // DockerCluster is the Schema for the dockerclusters API. // @@ -94,6 +95,7 @@ func (c *DockerCluster) SetConditions(conditions clusterv1alpha3.Conditions) { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // DockerClusterList contains a list of DockerCluster. // diff --git a/test/infrastructure/docker/api/v1alpha3/dockermachine_types.go b/test/infrastructure/docker/api/v1alpha3/dockermachine_types.go index 5cde2c0b9201..8bd73d058a6b 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:unservedversion // +kubebuilder:subresource:status // DockerMachine is the Schema for the dockermachines API. @@ -117,6 +118,7 @@ func (c *DockerMachine) SetConditions(conditions clusterv1alpha3.Conditions) { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // DockerMachineList contains a list of DockerMachine. // diff --git a/test/infrastructure/docker/api/v1alpha3/dockermachinetemplate_types.go b/test/infrastructure/docker/api/v1alpha3/dockermachinetemplate_types.go index 8de0ade3efd3..bc1824fbc0a3 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:unservedversion // +kubebuilder:resource:path=dockermachinetemplates,scope=Namespaced,categories=cluster-api // DockerMachineTemplate is the Schema for the dockermachinetemplates API. @@ -39,6 +40,7 @@ type DockerMachineTemplate struct { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // DockerMachineTemplateList contains a list 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 e7205f66b500..91eb26a735e8 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 @@ -152,7 +152,7 @@ spec: - ready type: object type: object - served: true + served: false storage: false subresources: status: {} 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 58bb2c449c88..e5e0656b4f7e 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 @@ -155,7 +155,7 @@ spec: type: boolean type: object type: object - served: true + served: false storage: false subresources: status: {} 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 7d2f36e390dd..39f780146045 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 @@ -96,7 +96,7 @@ spec: - template type: object type: object - served: true + served: false storage: false - additionalPrinterColumns: - description: Time duration since creation of DockerMachineTemplate