Skip to content

Commit 863daa0

Browse files
authored
Merge pull request kubernetes#90301 from deads2k/beta-annotations-02
add api lifecycle tags to admissionregistration.k8s.io
2 parents 219f062 + d32fc4e commit 863daa0

File tree

5 files changed

+141
-2
lines changed

5 files changed

+141
-2
lines changed

build/root/Makefile.generated_files

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ ALL_K8S_TAG_FILES := $(shell \
119119
# // +k8s:prerelease-lifecycle-gen=true
120120
#
121121

122-
# The result file, in each pkg, of deep-copy generation.
122+
# The result file, in each pkg, of prerelease-lifecycle generation.
123123
PRERELEASE_LIFECYCLE_BASENAME := $(GENERATED_FILE_PREFIX)prerelease-lifecycle
124124
PRERELEASE_LIFECYCLE_FILENAME := $(PRERELEASE_LIFECYCLE_BASENAME).go
125125

@@ -131,7 +131,7 @@ ifeq ($(DBG_MAKEFILE),1)
131131
$(warning ***** finding all +k8s:prerelease-lifecycle-gen tags)
132132
endif
133133
PRERELEASE_LIFECYCLE_DIRS := $(shell \
134-
grep --color=never -l '+k8s:prerelease-lifecycle-gen=' $(ALL_K8S_TAG_FILES) \
134+
grep --color=never -l '+k8s:prerelease-lifecycle-gen=true' $(ALL_K8S_TAG_FILES) \
135135
| xargs -n1 dirname \
136136
| LC_ALL=C sort -u \
137137
)

staging/src/k8s.io/api/admissionregistration/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/admissionregistration/v1beta1",
1920
importpath = "k8s.io/api/admissionregistration/v1beta1",

staging/src/k8s.io/api/admissionregistration/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
// +groupName=admissionregistration.k8s.io
2122

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

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ const (
113113
// +genclient
114114
// +genclient:nonNamespaced
115115
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
116+
// +k8s:prerelease-lifecycle-gen:introduced=1.9
117+
// +k8s:prerelease-lifecycle-gen:deprecated=1.16
118+
// +k8s:prerelease-lifecycle-gen:removed=1.22
119+
// +k8s:prerelease-lifecycle-gen:replacement=admissionregistration.k8s.io,v1,ValidatingWebhookConfiguration
116120

117121
// ValidatingWebhookConfiguration describes the configuration of and admission webhook that accept or reject and object without changing it.
118122
// Deprecated in v1.16, planned for removal in v1.19. Use admissionregistration.k8s.io/v1 ValidatingWebhookConfiguration instead.
@@ -129,6 +133,10 @@ type ValidatingWebhookConfiguration struct {
129133
}
130134

131135
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
136+
// +k8s:prerelease-lifecycle-gen:introduced=1.9
137+
// +k8s:prerelease-lifecycle-gen:deprecated=1.16
138+
// +k8s:prerelease-lifecycle-gen:removed=1.22
139+
// +k8s:prerelease-lifecycle-gen:replacement=admissionregistration.k8s.io,v1,ValidatingWebhookConfigurationList
132140

133141
// ValidatingWebhookConfigurationList is a list of ValidatingWebhookConfiguration.
134142
type ValidatingWebhookConfigurationList struct {
@@ -144,6 +152,10 @@ type ValidatingWebhookConfigurationList struct {
144152
// +genclient
145153
// +genclient:nonNamespaced
146154
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
155+
// +k8s:prerelease-lifecycle-gen:introduced=1.9
156+
// +k8s:prerelease-lifecycle-gen:deprecated=1.16
157+
// +k8s:prerelease-lifecycle-gen:removed=1.22
158+
// +k8s:prerelease-lifecycle-gen:replacement=admissionregistration.k8s.io,v1,MutatingWebhookConfiguration
147159

148160
// MutatingWebhookConfiguration describes the configuration of and admission webhook that accept or reject and may change the object.
149161
// Deprecated in v1.16, planned for removal in v1.19. Use admissionregistration.k8s.io/v1 MutatingWebhookConfiguration instead.
@@ -160,6 +172,10 @@ type MutatingWebhookConfiguration struct {
160172
}
161173

162174
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
175+
// +k8s:prerelease-lifecycle-gen:introduced=1.9
176+
// +k8s:prerelease-lifecycle-gen:deprecated=1.16
177+
// +k8s:prerelease-lifecycle-gen:removed=1.22
178+
// +k8s:prerelease-lifecycle-gen:replacement=admissionregistration.k8s.io,v1,MutatingWebhookConfigurationList
163179

164180
// MutatingWebhookConfigurationList is a list of MutatingWebhookConfiguration.
165181
type MutatingWebhookConfigurationList struct {

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

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