Skip to content

Commit b48f5af

Browse files
authored
Merge pull request kubernetes#90603 from deads2k/beta-annotations-13-policy
add prerelease lifecycle tags to policy
2 parents de66c64 + 81d1234 commit b48f5af

File tree

4 files changed

+123
-0
lines changed

4 files changed

+123
-0
lines changed

staging/src/k8s.io/api/policy/v1beta1/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ go_library(
1414
"types.go",
1515
"types_swagger_doc_generated.go",
1616
"zz_generated.deepcopy.go",
17+
"zz_generated.prerelease-lifecycle.go",
1718
],
1819
importmap = "k8s.io/kubernetes/vendor/k8s.io/api/policy/v1beta1",
1920
importpath = "k8s.io/api/policy/v1beta1",

staging/src/k8s.io/api/policy/v1beta1/doc.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
// +k8s:deepcopy-gen=package
1818
// +k8s:protobuf-gen=package
1919
// +k8s:openapi-gen=true
20+
// +k8s:prerelease-lifecycle-gen=true
2021

2122
// Package policy is for any kind of policy object. Suitable examples, even if
2223
// they aren't all here, are PodDisruptionBudget, PodSecurityPolicy,

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ type PodDisruptionBudgetStatus struct {
8181

8282
// +genclient
8383
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
84+
// +k8s:prerelease-lifecycle-gen:introduced=1.5
85+
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
8486

8587
// PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods
8688
type PodDisruptionBudget struct {
@@ -97,6 +99,8 @@ type PodDisruptionBudget struct {
9799
}
98100

99101
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
102+
// +k8s:prerelease-lifecycle-gen:introduced=1.5
103+
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
100104

101105
// PodDisruptionBudgetList is a collection of PodDisruptionBudgets.
102106
type PodDisruptionBudgetList struct {
@@ -109,6 +113,8 @@ type PodDisruptionBudgetList struct {
109113
// +genclient
110114
// +genclient:noVerbs
111115
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
116+
// +k8s:prerelease-lifecycle-gen:introduced=1.5
117+
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
112118

113119
// Eviction evicts a pod from its node subject to certain policies and safety constraints.
114120
// This is a subresource of Pod. A request to cause such an eviction is
@@ -128,6 +134,8 @@ type Eviction struct {
128134
// +genclient
129135
// +genclient:nonNamespaced
130136
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
137+
// +k8s:prerelease-lifecycle-gen:introduced=1.10
138+
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
131139

132140
// PodSecurityPolicy governs the ability to make requests that affect the Security Context
133141
// that will be applied to a pod and container.
@@ -475,6 +483,8 @@ type RuntimeClassStrategyOptions struct {
475483
const AllowAllRuntimeClassNames = "*"
476484

477485
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
486+
// +k8s:prerelease-lifecycle-gen:introduced=1.10
487+
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
478488

479489
// PodSecurityPolicyList is a list of PodSecurityPolicy objects.
480490
type PodSecurityPolicyList struct {

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

Lines changed: 111 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)