Skip to content

Commit 80bd9ec

Browse files
authored
Merge pull request #4757 from vincepri/unserve-v1beta1
⚠️ Stop serving v1beta1 API types
2 parents ff8cb13 + 827ee1d commit 80bd9ec

24 files changed

+38
-13
lines changed

api/v1beta1/awscluster_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ type S3Bucket struct {
222222
}
223223

224224
// +kubebuilder:object:root=true
225+
// +kubebuilder:unservedversion
225226
// +kubebuilder:resource:path=awsclusters,scope=Namespaced,categories=cluster-api,shortName=awsc
226227
// +kubebuilder:subresource:status
227228
// +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 {
240241
}
241242

242243
// +kubebuilder:object:root=true
244+
// +kubebuilder:unservedversion
243245

244246
// AWSClusterList contains a list of AWSCluster.
245247
type AWSClusterList struct {

api/v1beta1/awsclustertemplate_types.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ type AWSClusterTemplateSpec struct {
2828
}
2929

3030
// +kubebuilder:object:root=true
31+
// +kubebuilder:unservedversion
3132
// +kubebuilder:resource:path=awsclustertemplates,scope=Namespaced,categories=cluster-api,shortName=awsct
3233
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of AWSClusterTemplate"
3334

api/v1beta1/awsidentity_types.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ type AWSRoleSpec struct {
7070
}
7171

7272
// +kubebuilder:object:root=true
73+
// +kubebuilder:unservedversion
7374
// +kubebuilder:resource:path=awsclusterstaticidentities,scope=Cluster,categories=cluster-api,shortName=awssi
7475

7576
// AWSClusterStaticIdentity is the Schema for the awsclusterstaticidentities API
@@ -83,6 +84,7 @@ type AWSClusterStaticIdentity struct {
8384
}
8485

8586
// +kubebuilder:object:root=true
87+
// +kubebuilder:unservedversion
8688

8789
// AWSClusterStaticIdentityList contains a list of AWSClusterStaticIdentity.
8890
type AWSClusterStaticIdentityList struct {
@@ -103,6 +105,7 @@ type AWSClusterStaticIdentitySpec struct {
103105
}
104106

105107
// +kubebuilder:object:root=true
108+
// +kubebuilder:unservedversion
106109
// +kubebuilder:resource:path=awsclusterroleidentities,scope=Cluster,categories=cluster-api,shortName=awsri
107110

108111
// AWSClusterRoleIdentity is the Schema for the awsclusterroleidentities API
@@ -116,6 +119,7 @@ type AWSClusterRoleIdentity struct {
116119
}
117120

118121
// +kubebuilder:object:root=true
122+
// +kubebuilder:unservedversion
119123

120124
// AWSClusterRoleIdentityList contains a list of AWSClusterRoleIdentity.
121125
type AWSClusterRoleIdentityList struct {
@@ -146,6 +150,7 @@ type AWSClusterRoleIdentitySpec struct {
146150
}
147151

148152
// +kubebuilder:object:root=true
153+
// +kubebuilder:unservedversion
149154
// +kubebuilder:resource:path=awsclustercontrolleridentities,scope=Cluster,categories=cluster-api,shortName=awsci
150155

151156
// AWSClusterControllerIdentity is the Schema for the awsclustercontrolleridentities API
@@ -159,6 +164,7 @@ type AWSClusterControllerIdentity struct {
159164
}
160165

161166
// +kubebuilder:object:root=true
167+
// +kubebuilder:unservedversion
162168

163169
// AWSClusterControllerIdentityList contains a list of AWSClusterControllerIdentity.
164170
type AWSClusterControllerIdentityList struct {

api/v1beta1/awsmachine_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ type AWSMachineStatus struct {
258258
}
259259

260260
// +kubebuilder:object:root=true
261+
// +kubebuilder:unservedversion
261262
// +kubebuilder:resource:path=awsmachines,scope=Namespaced,categories=cluster-api,shortName=awsm
262263
// +kubebuilder:subresource:status
263264
// +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) {
286287
}
287288

288289
// +kubebuilder:object:root=true
290+
// +kubebuilder:unservedversion
289291

290292
// AWSMachineList contains a list of Amazon EC2 machines.
291293
type AWSMachineList struct {

api/v1beta1/awsmachinetemplate_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ type AWSMachineTemplateSpec struct {
3838
}
3939

4040
// +kubebuilder:object:root=true
41+
// +kubebuilder:unservedversion
4142
// +kubebuilder:resource:path=awsmachinetemplates,scope=Namespaced,categories=cluster-api,shortName=awsmt
4243

4344
// AWSMachineTemplate is the schema for the Amazon EC2 Machine Templates API.
@@ -50,6 +51,7 @@ type AWSMachineTemplate struct {
5051
}
5152

5253
// +kubebuilder:object:root=true
54+
// +kubebuilder:unservedversion
5355

5456
// AWSMachineTemplateList contains a list of AWSMachineTemplate.
5557
type AWSMachineTemplateList struct {

bootstrap/eks/api/v1beta1/eksconfig_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ type EKSConfigStatus struct {
8888
}
8989

9090
// +kubebuilder:object:root=true
91+
// +kubebuilder:unservedversion
9192
// +kubebuilder:resource:path=eksconfigs,scope=Namespaced,categories=cluster-api,shortName=eksc
9293
// +kubebuilder:subresource:status
9394
// +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) {
113114
}
114115

115116
// +kubebuilder:object:root=true
117+
// +kubebuilder:unservedversion
116118

117119
// EKSConfigList contains a list of EKSConfig.
118120
type EKSConfigList struct {

bootstrap/eks/api/v1beta1/eksconfigtemplate_types.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ type EKSConfigTemplateResource struct {
3131
}
3232

3333
// +kubebuilder:object:root=true
34+
// +kubebuilder:unservedversion
3435
// +kubebuilder:resource:path=eksconfigtemplates,scope=Namespaced,categories=cluster-api,shortName=eksct
3536

3637
// EKSConfigTemplate is the Amazon EKS Bootstrap Configuration Template API.
@@ -42,6 +43,7 @@ type EKSConfigTemplate struct {
4243
}
4344

4445
// +kubebuilder:object:root=true
46+
// +kubebuilder:unservedversion
4547

4648
// EKSConfigTemplateList contains a list of Amazon EKS Bootstrap Configuration Templates.
4749
type EKSConfigTemplateList struct {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ spec:
165165
type: boolean
166166
type: object
167167
type: object
168-
served: true
168+
served: false
169169
storage: false
170170
subresources:
171171
status: {}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ spec:
102102
- template
103103
type: object
104104
type: object
105-
served: true
105+
served: false
106106
storage: false
107107
- name: v1beta2
108108
schema:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1861,7 +1861,7 @@ spec:
18611861
- ready
18621862
type: object
18631863
type: object
1864-
served: true
1864+
served: false
18651865
storage: false
18661866
subresources:
18671867
status: {}

0 commit comments

Comments
 (0)