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/api/v1alpha3/webhook_test.go b/api/v1alpha3/webhook_test.go index 11b229c6c925..e0a71f5560f0 100644 --- a/api/v1alpha3/webhook_test.go +++ b/api/v1alpha3/webhook_test.go @@ -30,6 +30,8 @@ import ( ) func TestClusterConversion(t *testing.T) { + t.Skipf("v1alpha3 is no longer served see: https://cluster-api.sigs.k8s.io/contributing#removal-of-v1alpha3--v1alpha4-apiversions") + g := NewWithT(t) ns, err := env.CreateNamespace(ctx, fmt.Sprintf("conversion-webhook-%s", util.RandomString(5))) g.Expect(err).ToNot(HaveOccurred()) @@ -48,6 +50,7 @@ func TestClusterConversion(t *testing.T) { } func TestMachineSetConversion(t *testing.T) { + t.Skipf("v1alpha3 is no longer served see: https://cluster-api.sigs.k8s.io/contributing#removal-of-v1alpha3--v1alpha4-apiversions") g := NewWithT(t) ns, err := env.CreateNamespace(ctx, fmt.Sprintf("conversion-webhook-%s", util.RandomString(5))) g.Expect(err).ToNot(HaveOccurred()) @@ -75,6 +78,7 @@ func TestMachineSetConversion(t *testing.T) { } func TestMachineDeploymentConversion(t *testing.T) { + t.Skipf("v1alpha3 is no longer served see: https://cluster-api.sigs.k8s.io/contributing#removal-of-v1alpha3--v1alpha4-apiversions") g := NewWithT(t) ns, err := env.CreateNamespace(ctx, fmt.Sprintf("conversion-webhook-%s", util.RandomString(5))) g.Expect(err).ToNot(HaveOccurred()) 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/api/v1alpha3/webhook_test.go b/bootstrap/kubeadm/api/v1alpha3/webhook_test.go index 62eba4b589b9..f85fc209499f 100644 --- a/bootstrap/kubeadm/api/v1alpha3/webhook_test.go +++ b/bootstrap/kubeadm/api/v1alpha3/webhook_test.go @@ -30,6 +30,7 @@ import ( ) func TestKubeadmConfigConversion(t *testing.T) { + t.Skipf("v1alpha3 is no longer served see: https://cluster-api.sigs.k8s.io/contributing#removal-of-v1alpha3--v1alpha4-apiversions") g := NewWithT(t) ns, err := env.CreateNamespace(ctx, fmt.Sprintf("conversion-webhook-%s", util.RandomString(5))) g.Expect(err).ToNot(HaveOccurred()) @@ -49,6 +50,7 @@ func TestKubeadmConfigConversion(t *testing.T) { } func TestKubeadmConfigTemplateConversion(t *testing.T) { + t.Skipf("v1alpha3 is no longer served see: https://cluster-api.sigs.k8s.io/contributing#removal-of-v1alpha3--v1alpha4-apiversions") g := NewWithT(t) ns, err := env.CreateNamespace(ctx, fmt.Sprintf("conversion-webhook-%s", util.RandomString(5))) g.Expect(err).ToNot(HaveOccurred()) 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 191ad1bb7c32..16e3cc52b0c6 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 @@ -1001,7 +1001,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 01a531dcb1eb..49c357fe32c0 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 @@ -991,7 +991,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/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml b/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml index 33c5e8eb75e8..4d08b8318e6f 100644 --- a/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml +++ b/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml @@ -96,7 +96,7 @@ spec: type: array type: object type: object - served: true + served: false storage: false subresources: status: {} 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 b092aa0a4910..a3881fbca0c9 100644 --- a/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml +++ b/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesets.yaml @@ -169,7 +169,7 @@ spec: type: integer type: object type: object - served: true + served: false storage: false subresources: status: {} diff --git a/config/crd/bases/cluster.x-k8s.io_clusters.yaml b/config/crd/bases/cluster.x-k8s.io_clusters.yaml index 91c3fd7c807e..a11d2febcc77 100644 --- a/config/crd/bases/cluster.x-k8s.io_clusters.yaml +++ b/config/crd/bases/cluster.x-k8s.io_clusters.yaml @@ -271,7 +271,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 d38e2c0f7eed..c0a044f57fd3 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinedeployments.yaml @@ -502,7 +502,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 cd8841db1593..59237054fcf9 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinehealthchecks.yaml @@ -267,7 +267,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_machinepools.yaml b/config/crd/bases/cluster.x-k8s.io_machinepools.yaml index 2db7898a3cb5..5a83e4661d1c 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinepools.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinepools.yaml @@ -558,7 +558,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_machines.yaml b/config/crd/bases/cluster.x-k8s.io_machines.yaml index c5eb83fc2b1a..5ec456a75bac 100644 --- a/config/crd/bases/cluster.x-k8s.io_machines.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machines.yaml @@ -353,7 +353,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 1e1227cad14a..1deb6dddb789 100644 --- a/config/crd/bases/cluster.x-k8s.io_machinesets.yaml +++ b/config/crd/bases/cluster.x-k8s.io_machinesets.yaml @@ -448,7 +448,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/api/v1alpha3/webhook_test.go b/controlplane/kubeadm/api/v1alpha3/webhook_test.go index ceee2b38ebe2..daf20eb35df3 100644 --- a/controlplane/kubeadm/api/v1alpha3/webhook_test.go +++ b/controlplane/kubeadm/api/v1alpha3/webhook_test.go @@ -32,6 +32,7 @@ import ( ) func TestKubeadmControlPlaneConversion(t *testing.T) { + t.Skipf("v1alpha3 is no longer served see: https://cluster-api.sigs.k8s.io/contributing#removal-of-v1alpha3--v1alpha4-apiversions") g := NewWithT(t) ns, err := env.CreateNamespace(ctx, fmt.Sprintf("conversion-webhook-%s", util.RandomString(5))) 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 d692fe9951fb..a8cdcc6ab9a0 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 @@ -1183,7 +1183,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 154fab8457d0..ba6c97038884 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 @@ -17,11 +17,11 @@ maintainers of providers and consumers of our Go API. ### Deprecation -- +- API version `v1alpha3` is not served anymore from v1.5 (users can enable it manually in case they are lagging behind with deprecation cycles). Important: `v1alpha3` will be removed in 1.6. ### Removals -- +- API version`v1alpha4` is deprecated and CAPI will stop serving this version in v1.6. ### API Changes diff --git a/exp/addons/api/v1alpha3/clusterresourceset_types.go b/exp/addons/api/v1alpha3/clusterresourceset_types.go index d2c934a27080..771096687441 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:unservedversion // +kubebuilder:resource:path=clusterresourcesets,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status @@ -126,6 +127,7 @@ type ClusterResourceSet struct { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // ClusterResourceSetList contains a list of ClusterResourceSet. // diff --git a/exp/addons/api/v1alpha3/clusterresourcesetbinding_types.go b/exp/addons/api/v1alpha3/clusterresourcesetbinding_types.go index 1da2dfaeeab0..1e0ccfae86c1 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:unservedversion // +kubebuilder:resource:path=clusterresourcesetbindings,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status @@ -124,6 +125,7 @@ type ClusterResourceSetBindingSpec struct { // ANCHOR_END: ClusterResourceSetBindingSpec // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // ClusterResourceSetBindingList contains a list of ClusterResourceSetBinding. // diff --git a/exp/addons/api/v1alpha3/webhook_test.go b/exp/addons/api/v1alpha3/webhook_test.go index a2e26f7799a6..ea02ebd84f57 100644 --- a/exp/addons/api/v1alpha3/webhook_test.go +++ b/exp/addons/api/v1alpha3/webhook_test.go @@ -29,6 +29,7 @@ import ( ) func TestClusterResourceSetConversion(t *testing.T) { + t.Skipf("v1alpha3 is no longer served see: https://cluster-api.sigs.k8s.io/contributing#removal-of-v1alpha3--v1alpha4-apiversions") g := NewWithT(t) ns, err := env.CreateNamespace(ctx, fmt.Sprintf("conversion-webhook-%s", util.RandomString(5))) g.Expect(err).ToNot(HaveOccurred()) @@ -62,6 +63,7 @@ func TestClusterResourceSetConversion(t *testing.T) { } func TestClusterResourceSetBindingConversion(t *testing.T) { + t.Skipf("v1alpha3 is no longer served see: https://cluster-api.sigs.k8s.io/contributing#removal-of-v1alpha3--v1alpha4-apiversions") g := NewWithT(t) ns, err := env.CreateNamespace(ctx, fmt.Sprintf("conversion-webhook-%s", util.RandomString(5))) g.Expect(err).ToNot(HaveOccurred()) diff --git a/exp/api/v1alpha3/machinepool_types.go b/exp/api/v1alpha3/machinepool_types.go index b40474948821..c6192876b9ba 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:unservedversion // +kubebuilder:resource:path=machinepools,shortName=mp,scope=Namespaced,categories=cluster-api // +kubebuilder:subresource:status // +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas @@ -234,6 +235,7 @@ func (m *MachinePool) SetConditions(conditions clusterv1alpha3.Conditions) { } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // MachinePoolList contains a list of MachinePool. // diff --git a/exp/api/v1alpha3/webhook_test.go b/exp/api/v1alpha3/webhook_test.go index d57f29f9a6df..f6525ebd067c 100644 --- a/exp/api/v1alpha3/webhook_test.go +++ b/exp/api/v1alpha3/webhook_test.go @@ -33,6 +33,7 @@ import ( ) func TestMachinePoolConversion(t *testing.T) { + t.Skipf("v1alpha3 is no longer served see: https://cluster-api.sigs.k8s.io/contributing#removal-of-v1alpha3--v1alpha4-apiversions") // NOTE: MachinePool feature flag is disabled by default, thus preventing to create or update MachinePool. // Enabling the feature flag temporarily for this test. defer utilfeature.SetFeatureGateDuringTest(t, feature.Gates, feature.MachinePool, true)() 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 40ede1e9beb9..4f1d62f86249 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 @@ -151,7 +151,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_dockermachinepools.yaml b/test/infrastructure/docker/config/crd/bases/infrastructure.cluster.x-k8s.io_dockermachinepools.yaml index 803e3f643776..f5a01642066d 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 @@ -192,7 +192,7 @@ spec: type: integer 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 fd6e74867836..59a3030bb0d8 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 @@ -154,7 +154,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 5b5ca8dd2b66..aa84be920883 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 @@ -95,7 +95,7 @@ spec: - template type: object type: object - served: true + served: false storage: false - additionalPrinterColumns: - description: Time duration since creation of DockerMachineTemplate diff --git a/test/infrastructure/docker/exp/api/v1alpha3/dockermachinepool_types.go b/test/infrastructure/docker/exp/api/v1alpha3/dockermachinepool_types.go index f6c21ec6e9fa..e9ccc7ed5a0c 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:unservedversion // +kubebuilder:subresource:status // DockerMachinePool is the Schema for the dockermachinepools API. @@ -137,6 +138,7 @@ func (c *DockerMachinePool) SetConditions(conditions clusterv1alpha3.Conditions) } // +kubebuilder:object:root=true +// +kubebuilder:unservedversion // DockerMachinePoolList contains a list of DockerMachinePool. //