Skip to content

Commit

Permalink
DRA: bump API v1alpha2 -> v1alpha3
Browse files Browse the repository at this point in the history
This is in preparation for revamping the resource.k8s.io completely. Because
there will be no support for transitioning from v1alpha2 to v1alpha3, the
roundtrip test data for that API in 1.29 and 1.30 gets removed.

Repeating the version in the import name of the API packages is not really
required. It was done for a while to support simpler grepping for usage of
alpha APIs, but there are better ways for that now. So during this transition,
"resourceapi" gets used instead of "resourcev1alpha3" and the version gets
dropped from informer and lister imports. The advantage is that the next bump
to v1beta1 will affect fewer source code lines.

Only source code where the version really matters (like API registration)
retains the versioned import.
  • Loading branch information
pohly authored and hungnguyen243 committed Aug 16, 2024
1 parent 2090b32 commit 672a674
Show file tree
Hide file tree
Showing 269 changed files with 5,226 additions and 6,934 deletions.
14 changes: 7 additions & 7 deletions api/api-rules/violation_exceptions.list
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ API rule violation: names_match,k8s.io/api/core/v1,VolumeSource,CephFS
API rule violation: names_match,k8s.io/api/core/v1,VolumeSource,StorageOS
API rule violation: names_match,k8s.io/api/networking/v1alpha1,ServiceCIDRSpec,CIDRs
API rule violation: names_match,k8s.io/api/networking/v1beta1,ServiceCIDRSpec,CIDRs
API rule violation: names_match,k8s.io/api/resource/v1alpha2,NamedResourcesAttributeValue,BoolValue
API rule violation: names_match,k8s.io/api/resource/v1alpha2,NamedResourcesAttributeValue,IntSliceValue
API rule violation: names_match,k8s.io/api/resource/v1alpha2,NamedResourcesAttributeValue,IntValue
API rule violation: names_match,k8s.io/api/resource/v1alpha2,NamedResourcesAttributeValue,QuantityValue
API rule violation: names_match,k8s.io/api/resource/v1alpha2,NamedResourcesAttributeValue,StringSliceValue
API rule violation: names_match,k8s.io/api/resource/v1alpha2,NamedResourcesAttributeValue,StringValue
API rule violation: names_match,k8s.io/api/resource/v1alpha2,NamedResourcesAttributeValue,VersionValue
API rule violation: names_match,k8s.io/api/resource/v1alpha3,NamedResourcesAttributeValue,BoolValue
API rule violation: names_match,k8s.io/api/resource/v1alpha3,NamedResourcesAttributeValue,IntSliceValue
API rule violation: names_match,k8s.io/api/resource/v1alpha3,NamedResourcesAttributeValue,IntValue
API rule violation: names_match,k8s.io/api/resource/v1alpha3,NamedResourcesAttributeValue,QuantityValue
API rule violation: names_match,k8s.io/api/resource/v1alpha3,NamedResourcesAttributeValue,StringSliceValue
API rule violation: names_match,k8s.io/api/resource/v1alpha3,NamedResourcesAttributeValue,StringValue
API rule violation: names_match,k8s.io/api/resource/v1alpha3,NamedResourcesAttributeValue,VersionValue
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Ref
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,Schema
API rule violation: names_match,k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1,JSONSchemaProps,XEmbeddedResource
Expand Down
2 changes: 1 addition & 1 deletion api/discovery/aggregated_v2.json
Original file line number Diff line number Diff line change
Expand Up @@ -2062,7 +2062,7 @@
]
}
],
"version": "v1alpha2"
"version": "v1alpha3"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion api/discovery/aggregated_v2beta1.json
Original file line number Diff line number Diff line change
Expand Up @@ -2062,7 +2062,7 @@
]
}
],
"version": "v1alpha2"
"version": "v1alpha3"
}
]
},
Expand Down
8 changes: 4 additions & 4 deletions api/discovery/apis.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,13 +300,13 @@
{
"name": "resource.k8s.io",
"preferredVersion": {
"groupVersion": "resource.k8s.io/v1alpha2",
"version": "v1alpha2"
"groupVersion": "resource.k8s.io/v1alpha3",
"version": "v1alpha3"
},
"versions": [
{
"groupVersion": "resource.k8s.io/v1alpha2",
"version": "v1alpha2"
"groupVersion": "resource.k8s.io/v1alpha3",
"version": "v1alpha3"
}
]
},
Expand Down
8 changes: 4 additions & 4 deletions api/discovery/apis__resource.k8s.io.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"kind": "APIGroup",
"name": "resource.k8s.io",
"preferredVersion": {
"groupVersion": "resource.k8s.io/v1alpha2",
"version": "v1alpha2"
"groupVersion": "resource.k8s.io/v1alpha3",
"version": "v1alpha3"
},
"versions": [
{
"groupVersion": "resource.k8s.io/v1alpha2",
"version": "v1alpha2"
"groupVersion": "resource.k8s.io/v1alpha3",
"version": "v1alpha3"
}
]
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"apiVersion": "v1",
"groupVersion": "resource.k8s.io/v1alpha2",
"groupVersion": "resource.k8s.io/v1alpha3",
"kind": "APIResourceList",
"resources": [
{
"kind": "PodSchedulingContext",
"name": "podschedulingcontexts",
"namespaced": true,
"singularName": "podschedulingcontext",
"storageVersionHash": "qtdNX2rnDEA=",
"storageVersionHash": "SkSsa067T7g=",
"verbs": [
"create",
"delete",
Expand Down Expand Up @@ -36,7 +36,7 @@
"name": "resourceclaimparameters",
"namespaced": true,
"singularName": "resourceclaimparameters",
"storageVersionHash": "DWM408h+ZHE=",
"storageVersionHash": "42WVd9cucrU=",
"verbs": [
"create",
"delete",
Expand All @@ -53,7 +53,7 @@
"name": "resourceclaims",
"namespaced": true,
"singularName": "resourceclaim",
"storageVersionHash": "sMQbgChfibk=",
"storageVersionHash": "ozQSw6/HyJ4=",
"verbs": [
"create",
"delete",
Expand Down Expand Up @@ -81,7 +81,7 @@
"name": "resourceclaimtemplates",
"namespaced": true,
"singularName": "resourceclaimtemplate",
"storageVersionHash": "1o2b66bFoGM=",
"storageVersionHash": "lbw3G0J+kqQ=",
"verbs": [
"create",
"delete",
Expand All @@ -98,7 +98,7 @@
"name": "resourceclasses",
"namespaced": false,
"singularName": "resourceclass",
"storageVersionHash": "wkt0Tpte++U=",
"storageVersionHash": "gv35DluSP3c=",
"verbs": [
"create",
"delete",
Expand All @@ -115,7 +115,7 @@
"name": "resourceclassparameters",
"namespaced": true,
"singularName": "resourceclassparameters",
"storageVersionHash": "MDq5XoTnXWQ=",
"storageVersionHash": "369PrU9Yi/E=",
"verbs": [
"create",
"delete",
Expand All @@ -132,7 +132,7 @@
"name": "resourceslices",
"namespaced": false,
"singularName": "resourceslice",
"storageVersionHash": "IECvOcO76kw=",
"storageVersionHash": "8Uqm6frD4H0=",
"verbs": [
"create",
"delete",
Expand Down
Loading

0 comments on commit 672a674

Please sign in to comment.