Skip to content

Commit 66ea0f5

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#94936 from liggitt/1.16-default-off
Return the Kubernetes version which stopped serving deprecated APIs by default
2 parents 4304f4b + bf9e169 commit 66ea0f5

File tree

6 files changed

+62
-62
lines changed

6 files changed

+62
-62
lines changed

‎staging/src/k8s.io/api/apps/v1beta1/types.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ type ScaleStatus struct {
5858
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
5959
// +k8s:prerelease-lifecycle-gen:introduced=1.6
6060
// +k8s:prerelease-lifecycle-gen:deprecated=1.8
61-
// +k8s:prerelease-lifecycle-gen:removed=1.18
61+
// +k8s:prerelease-lifecycle-gen:removed=1.16
6262
// +k8s:prerelease-lifecycle-gen:replacement=autoscaling,v1,Scale
6363

6464
// Scale represents a scaling request for a resource.
@@ -81,7 +81,7 @@ type Scale struct {
8181
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
8282
// +k8s:prerelease-lifecycle-gen:introduced=1.5
8383
// +k8s:prerelease-lifecycle-gen:deprecated=1.8
84-
// +k8s:prerelease-lifecycle-gen:removed=1.18
84+
// +k8s:prerelease-lifecycle-gen:removed=1.16
8585
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,StatefulSet
8686

8787
// DEPRECATED - This group version of StatefulSet is deprecated by apps/v1beta2/StatefulSet. See the release notes for
@@ -284,7 +284,7 @@ type StatefulSetCondition struct {
284284
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
285285
// +k8s:prerelease-lifecycle-gen:introduced=1.5
286286
// +k8s:prerelease-lifecycle-gen:deprecated=1.8
287-
// +k8s:prerelease-lifecycle-gen:removed=1.18
287+
// +k8s:prerelease-lifecycle-gen:removed=1.16
288288
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,StatefulSetList
289289

290290
// StatefulSetList is a collection of StatefulSets.
@@ -299,7 +299,7 @@ type StatefulSetList struct {
299299
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
300300
// +k8s:prerelease-lifecycle-gen:introduced=1.6
301301
// +k8s:prerelease-lifecycle-gen:deprecated=1.8
302-
// +k8s:prerelease-lifecycle-gen:removed=1.18
302+
// +k8s:prerelease-lifecycle-gen:removed=1.16
303303
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,Deployment
304304

305305
// DEPRECATED - This group version of Deployment is deprecated by apps/v1beta2/Deployment. See the release notes for
@@ -373,7 +373,7 @@ type DeploymentSpec struct {
373373
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
374374
// +k8s:prerelease-lifecycle-gen:introduced=1.6
375375
// +k8s:prerelease-lifecycle-gen:deprecated=1.8
376-
// +k8s:prerelease-lifecycle-gen:removed=1.18
376+
// +k8s:prerelease-lifecycle-gen:removed=1.16
377377
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,DeploymentRollback
378378

379379
// DEPRECATED.
@@ -534,7 +534,7 @@ type DeploymentCondition struct {
534534
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
535535
// +k8s:prerelease-lifecycle-gen:introduced=1.6
536536
// +k8s:prerelease-lifecycle-gen:deprecated=1.8
537-
// +k8s:prerelease-lifecycle-gen:removed=1.18
537+
// +k8s:prerelease-lifecycle-gen:removed=1.16
538538
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,DeploymentList
539539

540540
// DeploymentList is a list of Deployments.
@@ -552,7 +552,7 @@ type DeploymentList struct {
552552
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
553553
// +k8s:prerelease-lifecycle-gen:introduced=1.7
554554
// +k8s:prerelease-lifecycle-gen:deprecated=1.8
555-
// +k8s:prerelease-lifecycle-gen:removed=1.18
555+
// +k8s:prerelease-lifecycle-gen:removed=1.16
556556
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,ControllerRevision
557557

558558
// DEPRECATED - This group version of ControllerRevision is deprecated by apps/v1beta2/ControllerRevision. See the
@@ -583,7 +583,7 @@ type ControllerRevision struct {
583583
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
584584
// +k8s:prerelease-lifecycle-gen:introduced=1.7
585585
// +k8s:prerelease-lifecycle-gen:deprecated=1.8
586-
// +k8s:prerelease-lifecycle-gen:removed=1.18
586+
// +k8s:prerelease-lifecycle-gen:removed=1.16
587587
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,ControllerRevisionList
588588

589589
// ControllerRevisionList is a resource containing a list of ControllerRevision objects.

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

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

‎staging/src/k8s.io/api/apps/v1beta2/types.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ type ScaleStatus struct {
6060
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
6161
// +k8s:prerelease-lifecycle-gen:introduced=1.8
6262
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
63-
// +k8s:prerelease-lifecycle-gen:removed=1.18
63+
// +k8s:prerelease-lifecycle-gen:removed=1.16
6464
// +k8s:prerelease-lifecycle-gen:replacement=autoscaling,v1,Scale
6565

6666
// Scale represents a scaling request for a resource.
@@ -85,7 +85,7 @@ type Scale struct {
8585
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
8686
// +k8s:prerelease-lifecycle-gen:introduced=1.8
8787
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
88-
// +k8s:prerelease-lifecycle-gen:removed=1.18
88+
// +k8s:prerelease-lifecycle-gen:removed=1.16
8989
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,StatefulSet
9090

9191
// DEPRECATED - This group version of StatefulSet is deprecated by apps/v1/StatefulSet. See the release notes for
@@ -292,7 +292,7 @@ type StatefulSetCondition struct {
292292
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
293293
// +k8s:prerelease-lifecycle-gen:introduced=1.8
294294
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
295-
// +k8s:prerelease-lifecycle-gen:removed=1.18
295+
// +k8s:prerelease-lifecycle-gen:removed=1.16
296296
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,StatefulSetList
297297

298298
// StatefulSetList is a collection of StatefulSets.
@@ -307,7 +307,7 @@ type StatefulSetList struct {
307307
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
308308
// +k8s:prerelease-lifecycle-gen:introduced=1.8
309309
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
310-
// +k8s:prerelease-lifecycle-gen:removed=1.18
310+
// +k8s:prerelease-lifecycle-gen:removed=1.16
311311
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,Deployment
312312

313313
// DEPRECATED - This group version of Deployment is deprecated by apps/v1/Deployment. See the release notes for
@@ -510,7 +510,7 @@ type DeploymentCondition struct {
510510
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
511511
// +k8s:prerelease-lifecycle-gen:introduced=1.8
512512
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
513-
// +k8s:prerelease-lifecycle-gen:removed=1.18
513+
// +k8s:prerelease-lifecycle-gen:removed=1.16
514514
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,DeploymentList
515515

516516
// DeploymentList is a list of Deployments.
@@ -681,7 +681,7 @@ type DaemonSetCondition struct {
681681
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
682682
// +k8s:prerelease-lifecycle-gen:introduced=1.8
683683
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
684-
// +k8s:prerelease-lifecycle-gen:removed=1.18
684+
// +k8s:prerelease-lifecycle-gen:removed=1.16
685685
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,DaemonSet
686686

687687
// DEPRECATED - This group version of DaemonSet is deprecated by apps/v1/DaemonSet. See the release notes for
@@ -718,7 +718,7 @@ const (
718718
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
719719
// +k8s:prerelease-lifecycle-gen:introduced=1.8
720720
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
721-
// +k8s:prerelease-lifecycle-gen:removed=1.18
721+
// +k8s:prerelease-lifecycle-gen:removed=1.16
722722
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,DaemonSetList
723723

724724
// DaemonSetList is a collection of daemon sets.
@@ -737,7 +737,7 @@ type DaemonSetList struct {
737737
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
738738
// +k8s:prerelease-lifecycle-gen:introduced=1.8
739739
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
740-
// +k8s:prerelease-lifecycle-gen:removed=1.18
740+
// +k8s:prerelease-lifecycle-gen:removed=1.16
741741
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,ReplicaSet
742742

743743
// DEPRECATED - This group version of ReplicaSet is deprecated by apps/v1/ReplicaSet. See the release notes for
@@ -769,7 +769,7 @@ type ReplicaSet struct {
769769
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
770770
// +k8s:prerelease-lifecycle-gen:introduced=1.8
771771
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
772-
// +k8s:prerelease-lifecycle-gen:removed=1.18
772+
// +k8s:prerelease-lifecycle-gen:removed=1.16
773773
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,ReplicaSetList
774774

775775
// ReplicaSetList is a collection of ReplicaSets.
@@ -873,7 +873,7 @@ type ReplicaSetCondition struct {
873873
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
874874
// +k8s:prerelease-lifecycle-gen:introduced=1.8
875875
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
876-
// +k8s:prerelease-lifecycle-gen:removed=1.18
876+
// +k8s:prerelease-lifecycle-gen:removed=1.16
877877
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,ControllerRevision
878878

879879
// DEPRECATED - This group version of ControllerRevision is deprecated by apps/v1/ControllerRevision. See the
@@ -904,7 +904,7 @@ type ControllerRevision struct {
904904
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
905905
// +k8s:prerelease-lifecycle-gen:introduced=1.8
906906
// +k8s:prerelease-lifecycle-gen:deprecated=1.9
907-
// +k8s:prerelease-lifecycle-gen:removed=1.18
907+
// +k8s:prerelease-lifecycle-gen:removed=1.16
908908
// +k8s:prerelease-lifecycle-gen:replacement=apps,v1,ControllerRevisionList
909909

910910
// ControllerRevisionList is a resource containing a list of ControllerRevision objects.

0 commit comments

Comments
 (0)