Skip to content

Commit 6c0278e

Browse files
authored
Merge pull request kubernetes#90673 from deads2k/beta-annotations-17-crd
add prerelease lifecycle tags to apiextensions.k8s.io
2 parents 3a7b454 + 555225e commit 6c0278e

File tree

4 files changed

+110
-0
lines changed

4 files changed

+110
-0
lines changed

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ go_library(
2121
"zz_generated.conversion.go",
2222
"zz_generated.deepcopy.go",
2323
"zz_generated.defaults.go",
24+
"zz_generated.prerelease-lifecycle.go",
2425
],
2526
importmap = "k8s.io/kubernetes/vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1",
2627
importpath = "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1",

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ limitations under the License.
1919
// +k8s:conversion-gen=k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
2020
// +k8s:defaulter-gen=TypeMeta
2121
// +k8s:openapi-gen=true
22+
// +k8s:prerelease-lifecycle-gen=true
2223
// +groupName=apiextensions.k8s.io
2324

2425
// Package v1beta1 is the v1beta1 version of the API.

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,9 @@ const CustomResourceCleanupFinalizer = "customresourcecleanup.apiextensions.k8s.
374374
// +genclient
375375
// +genclient:nonNamespaced
376376
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
377+
// +k8s:prerelease-lifecycle-gen:introduced=1.7
378+
// +k8s:prerelease-lifecycle-gen:deprecated=1.19
379+
// +k8s:prerelease-lifecycle-gen:replacement=apiextensions.k8s.io,v1,CustomResourceDefinition
377380

378381
// CustomResourceDefinition represents a resource that should be exposed on the API server. Its name MUST be in the format
379382
// <.spec.name>.<.spec.group>.
@@ -390,6 +393,9 @@ type CustomResourceDefinition struct {
390393
}
391394

392395
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
396+
// +k8s:prerelease-lifecycle-gen:introduced=1.7
397+
// +k8s:prerelease-lifecycle-gen:deprecated=1.19
398+
// +k8s:prerelease-lifecycle-gen:replacement=apiextensions.k8s.io,v1,CustomResourceDefinitionList
393399

394400
// CustomResourceDefinitionList is a list of CustomResourceDefinition objects.
395401
type CustomResourceDefinitionList struct {
@@ -454,6 +460,11 @@ type CustomResourceSubresourceScale struct {
454460
}
455461

456462
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
463+
// +k8s:prerelease-lifecycle-gen:introduced=1.13
464+
// +k8s:prerelease-lifecycle-gen:deprecated=1.19
465+
// This API is never served. It is used for outbound requests from apiservers. This will ensure it never gets served accidentally
466+
// and having the generator against this group will protect future APIs which may be served.
467+
// +k8s:prerelease-lifecycle-gen:replacement=apiextensions.k8s.io,v1,ConversionReview
457468

458469
// ConversionReview describes a conversion request/response.
459470
type ConversionReview struct {

staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/zz_generated.prerelease-lifecycle.go

Lines changed: 97 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)