Skip to content

Commit b0967ed

Browse files
authored
Merge pull request kubernetes#92484 from liggitt/csr-deprecation
Mark 1.19 deprecated beta APIs and replacements
2 parents cb37c08 + f9f5262 commit b0967ed

File tree

6 files changed

+72
-22
lines changed

6 files changed

+72
-22
lines changed

staging/src/k8s.io/api/certificates/v1beta1/types.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ import (
2727
// +genclient:nonNamespaced
2828
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
2929
// +k8s:prerelease-lifecycle-gen:introduced=1.12
30-
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
30+
// +k8s:prerelease-lifecycle-gen:deprecated=1.19
31+
// +k8s:prerelease-lifecycle-gen:replacement=certificates.k8s.io,v1,CertificateSigningRequest
3132

3233
// Describes a certificate signing request
3334
type CertificateSigningRequest struct {
@@ -195,7 +196,8 @@ type CertificateSigningRequestCondition struct {
195196

196197
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
197198
// +k8s:prerelease-lifecycle-gen:introduced=1.12
198-
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
199+
// +k8s:prerelease-lifecycle-gen:deprecated=1.19
200+
// +k8s:prerelease-lifecycle-gen:replacement=certificates.k8s.io,v1,CertificateSigningRequestList
199201

200202
type CertificateSigningRequestList struct {
201203
metav1.TypeMeta `json:",inline"`

staging/src/k8s.io/api/certificates/v1beta1/zz_generated.prerelease-lifecycle.go

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

staging/src/k8s.io/api/extensions/v1beta1/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ type DaemonSetList struct {
554554
// +k8s:prerelease-lifecycle-gen:introduced=1.1
555555
// +k8s:prerelease-lifecycle-gen:deprecated=1.14
556556
// +k8s:prerelease-lifecycle-gen:removed=1.22
557-
// +k8s:prerelease-lifecycle-gen:replacement=networking.k8s.io,v1beta1,Ingress
557+
// +k8s:prerelease-lifecycle-gen:replacement=networking.k8s.io,v1,Ingress
558558

559559
// Ingress is a collection of rules that allow inbound connections to reach the
560560
// endpoints defined by a backend. An Ingress can be configured to give services
@@ -583,7 +583,7 @@ type Ingress struct {
583583
// +k8s:prerelease-lifecycle-gen:introduced=1.1
584584
// +k8s:prerelease-lifecycle-gen:deprecated=1.14
585585
// +k8s:prerelease-lifecycle-gen:removed=1.22
586-
// +k8s:prerelease-lifecycle-gen:replacement=networking.k8s.io,v1beta1,IngressList
586+
// +k8s:prerelease-lifecycle-gen:replacement=networking.k8s.io,v1,IngressList
587587

588588
// IngressList is a collection of Ingress.
589589
type IngressList struct {

staging/src/k8s.io/api/extensions/v1beta1/zz_generated.prerelease-lifecycle.go

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

staging/src/k8s.io/api/networking/v1beta1/types.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ import (
2525
// +genclient
2626
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
2727
// +k8s:prerelease-lifecycle-gen:introduced=1.14
28-
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
28+
// +k8s:prerelease-lifecycle-gen:deprecated=1.19
29+
// +k8s:prerelease-lifecycle-gen:replacement=networking.k8s.io,v1,Ingress
2930

3031
// Ingress is a collection of rules that allow inbound connections to reach the
3132
// endpoints defined by a backend. An Ingress can be configured to give services
@@ -51,7 +52,8 @@ type Ingress struct {
5152

5253
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
5354
// +k8s:prerelease-lifecycle-gen:introduced=1.14
54-
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
55+
// +k8s:prerelease-lifecycle-gen:deprecated=1.19
56+
// +k8s:prerelease-lifecycle-gen:replacement=networking.k8s.io,v1,IngressList
5557

5658
// IngressList is a collection of Ingress.
5759
type IngressList struct {
@@ -274,7 +276,8 @@ type IngressBackend struct {
274276
// +genclient:nonNamespaced
275277
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
276278
// +k8s:prerelease-lifecycle-gen:introduced=1.18
277-
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
279+
// +k8s:prerelease-lifecycle-gen:deprecated=1.19
280+
// +k8s:prerelease-lifecycle-gen:replacement=networking.k8s.io,v1,IngressClassList
278281

279282
// IngressClass represents the class of the Ingress, referenced by the Ingress
280283
// Spec. The `ingressclass.kubernetes.io/is-default-class` annotation can be
@@ -313,7 +316,8 @@ type IngressClassSpec struct {
313316

314317
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
315318
// +k8s:prerelease-lifecycle-gen:introduced=1.18
316-
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
319+
// +k8s:prerelease-lifecycle-gen:deprecated=1.19
320+
// +k8s:prerelease-lifecycle-gen:replacement=networking.k8s.io,v1,IngressClassList
317321

318322
// IngressClassList is a collection of IngressClasses.
319323
type IngressClassList struct {

staging/src/k8s.io/api/networking/v1beta1/zz_generated.prerelease-lifecycle.go

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

0 commit comments

Comments
 (0)