Skip to content

Commit 3e24be5

Browse files
authored
Merge pull request kubernetes#92220 from deads2k/crd-removal
fix the timeline for CRD v1beta1 removal
2 parents f4e2cf7 + 923c4b4 commit 3e24be5

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

api/openapi-spec/swagger.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,12 +375,13 @@ const CustomResourceCleanupFinalizer = "customresourcecleanup.apiextensions.k8s.
375375
// +genclient:nonNamespaced
376376
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
377377
// +k8s:prerelease-lifecycle-gen:introduced=1.7
378-
// +k8s:prerelease-lifecycle-gen:deprecated=1.19
378+
// +k8s:prerelease-lifecycle-gen:deprecated=1.16
379+
// +k8s:prerelease-lifecycle-gen:removed=1.22
379380
// +k8s:prerelease-lifecycle-gen:replacement=apiextensions.k8s.io,v1,CustomResourceDefinition
380381

381382
// CustomResourceDefinition represents a resource that should be exposed on the API server. Its name MUST be in the format
382383
// <.spec.name>.<.spec.group>.
383-
// Deprecated in v1.16, planned for removal in v1.19. Use apiextensions.k8s.io/v1 CustomResourceDefinition instead.
384+
// Deprecated in v1.16, planned for removal in v1.22. Use apiextensions.k8s.io/v1 CustomResourceDefinition instead.
384385
type CustomResourceDefinition struct {
385386
metav1.TypeMeta `json:",inline"`
386387
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)