Merge pull request #4757 from vincepri/unserve-v1beta1

⚠️ Stop serving v1beta1 API types

Author: k8s-ci-robot

api/v1beta1/awscluster_types.go

@@ -222,6 +222,7 @@ type S3Bucket struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 // +kubebuilder:resource:path=awsclusters,scope=Namespaced,categories=cluster-api,shortName=awsc
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this AWSCluster belongs"
@@ -240,6 +241,7 @@ type AWSCluster struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 
 // AWSClusterList contains a list of AWSCluster.
 type AWSClusterList struct {

api/v1beta1/awsclustertemplate_types.go

@@ -28,6 +28,7 @@ type AWSClusterTemplateSpec struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 // +kubebuilder:resource:path=awsclustertemplates,scope=Namespaced,categories=cluster-api,shortName=awsct
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of AWSClusterTemplate"
 

api/v1beta1/awsidentity_types.go

@@ -70,6 +70,7 @@ type AWSRoleSpec struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 // +kubebuilder:resource:path=awsclusterstaticidentities,scope=Cluster,categories=cluster-api,shortName=awssi
 
 // AWSClusterStaticIdentity is the Schema for the awsclusterstaticidentities API
@@ -83,6 +84,7 @@ type AWSClusterStaticIdentity struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 
 // AWSClusterStaticIdentityList contains a list of AWSClusterStaticIdentity.
 type AWSClusterStaticIdentityList struct {
@@ -103,6 +105,7 @@ type AWSClusterStaticIdentitySpec struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 // +kubebuilder:resource:path=awsclusterroleidentities,scope=Cluster,categories=cluster-api,shortName=awsri
 
 // AWSClusterRoleIdentity is the Schema for the awsclusterroleidentities API
@@ -116,6 +119,7 @@ type AWSClusterRoleIdentity struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 
 // AWSClusterRoleIdentityList contains a list of AWSClusterRoleIdentity.
 type AWSClusterRoleIdentityList struct {
@@ -146,6 +150,7 @@ type AWSClusterRoleIdentitySpec struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 // +kubebuilder:resource:path=awsclustercontrolleridentities,scope=Cluster,categories=cluster-api,shortName=awsci
 
 // AWSClusterControllerIdentity is the Schema for the awsclustercontrolleridentities API
@@ -159,6 +164,7 @@ type AWSClusterControllerIdentity struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 
 // AWSClusterControllerIdentityList contains a list of AWSClusterControllerIdentity.
 type AWSClusterControllerIdentityList struct {

api/v1beta1/awsmachine_types.go

@@ -258,6 +258,7 @@ type AWSMachineStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 // +kubebuilder:resource:path=awsmachines,scope=Namespaced,categories=cluster-api,shortName=awsm
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Cluster",type="string",JSONPath=".metadata.labels.cluster\\.x-k8s\\.io/cluster-name",description="Cluster to which this AWSMachine belongs"
@@ -286,6 +287,7 @@ func (r *AWSMachine) SetConditions(conditions clusterv1.Conditions) {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 
 // AWSMachineList contains a list of Amazon EC2 machines.
 type AWSMachineList struct {

api/v1beta1/awsmachinetemplate_types.go

@@ -38,6 +38,7 @@ type AWSMachineTemplateSpec struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 // +kubebuilder:resource:path=awsmachinetemplates,scope=Namespaced,categories=cluster-api,shortName=awsmt
 
 // AWSMachineTemplate is the schema for the Amazon EC2 Machine Templates API.
@@ -50,6 +51,7 @@ type AWSMachineTemplate struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 
 // AWSMachineTemplateList contains a list of AWSMachineTemplate.
 type AWSMachineTemplateList struct {

bootstrap/eks/api/v1beta1/eksconfig_types.go

@@ -88,6 +88,7 @@ type EKSConfigStatus struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 // +kubebuilder:resource:path=eksconfigs,scope=Namespaced,categories=cluster-api,shortName=eksc
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.ready",description="Bootstrap configuration is ready"
@@ -113,6 +114,7 @@ func (r *EKSConfig) SetConditions(conditions clusterv1.Conditions) {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 
 // EKSConfigList contains a list of EKSConfig.
 type EKSConfigList struct {

bootstrap/eks/api/v1beta1/eksconfigtemplate_types.go

@@ -31,6 +31,7 @@ type EKSConfigTemplateResource struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 // +kubebuilder:resource:path=eksconfigtemplates,scope=Namespaced,categories=cluster-api,shortName=eksct
 
 // EKSConfigTemplate is the Amazon EKS Bootstrap Configuration Template API.
@@ -42,6 +43,7 @@ type EKSConfigTemplate struct {
 }
 
 // +kubebuilder:object:root=true
+// +kubebuilder:unservedversion
 
 // EKSConfigTemplateList contains a list of Amazon EKS Bootstrap Configuration Templates.
 type EKSConfigTemplateList struct {

config/crd/bases/bootstrap.cluster.x-k8s.io_eksconfigs.yaml

@@ -165,7 +165,7 @@ spec:
                 type: boolean
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources:
       status: {}

config/crd/bases/bootstrap.cluster.x-k8s.io_eksconfigtemplates.yaml

@@ -102,7 +102,7 @@ spec:
             - template
             type: object
         type: object
-    served: true
+    served: false
     storage: false
   - name: v1beta2
     schema:

config/crd/bases/controlplane.cluster.x-k8s.io_awsmanagedcontrolplanes.yaml

@@ -1861,7 +1861,7 @@ spec:
             - ready
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources:
       status: {}