Merge pull request #90567 from deads2k/beta-annotations-09.discovery

add prerelease lifecycle tags to discovery
This commit is contained in:
Kubernetes Prow Robot 2020-05-02 18:20:25 -07:00 committed by GitHub
commit b943e49e76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 63 additions and 0 deletions

View File

@ -10,6 +10,7 @@ go_library(
"types_swagger_doc_generated.go", "types_swagger_doc_generated.go",
"well_known_labels.go", "well_known_labels.go",
"zz_generated.deepcopy.go", "zz_generated.deepcopy.go",
"zz_generated.prerelease-lifecycle.go",
], ],
importmap = "k8s.io/kubernetes/vendor/k8s.io/api/discovery/v1beta1", importmap = "k8s.io/kubernetes/vendor/k8s.io/api/discovery/v1beta1",
importpath = "k8s.io/api/discovery/v1beta1", importpath = "k8s.io/api/discovery/v1beta1",

View File

@ -17,6 +17,7 @@ limitations under the License.
// +k8s:deepcopy-gen=package // +k8s:deepcopy-gen=package
// +k8s:protobuf-gen=package // +k8s:protobuf-gen=package
// +k8s:openapi-gen=true // +k8s:openapi-gen=true
// +k8s:prerelease-lifecycle-gen=true
// +groupName=discovery.k8s.io // +groupName=discovery.k8s.io
package v1beta1 // import "k8s.io/api/discovery/v1beta1" package v1beta1 // import "k8s.io/api/discovery/v1beta1"

View File

@ -23,6 +23,8 @@ import (
// +genclient // +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +k8s:prerelease-lifecycle-gen:introduced=1.16
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
// EndpointSlice represents a subset of the endpoints that implement a service. // EndpointSlice represents a subset of the endpoints that implement a service.
// For a given service there may be multiple EndpointSlice objects, selected by // For a given service there may be multiple EndpointSlice objects, selected by
@ -150,6 +152,8 @@ type EndpointPort struct {
} }
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +k8s:prerelease-lifecycle-gen:introduced=1.16
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
// EndpointSliceList represents a list of endpoint slices // EndpointSliceList represents a list of endpoint slices
type EndpointSliceList struct { type EndpointSliceList struct {

View File

@ -0,0 +1,57 @@
// +build !ignore_autogenerated
/*
Copyright The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// Code generated by prerelease-lifecycle-gen. DO NOT EDIT.
package v1beta1
// APILifecycleIntroduced is an autogenerated function, returning the release in which the API struct was introduced as int versions of major and minor for comparison.
// It is controlled by "k8s:prerelease-lifecycle-gen:introduced" tags in types.go.
func (in *EndpointSlice) APILifecycleIntroduced() (major, minor int) {
return 1, 16
}
// APILifecycleDeprecated is an autogenerated function, returning the release in which the API struct was or will be deprecated as int versions of major and minor for comparison.
// It is controlled by "k8s:prerelease-lifecycle-gen:deprecated" tags in types.go or "k8s:prerelease-lifecycle-gen:introduced" plus three minor.
func (in *EndpointSlice) APILifecycleDeprecated() (major, minor int) {
return 1, 22
}
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
func (in *EndpointSlice) APILifecycleRemoved() (major, minor int) {
return 1, 25
}
// APILifecycleIntroduced is an autogenerated function, returning the release in which the API struct was introduced as int versions of major and minor for comparison.
// It is controlled by "k8s:prerelease-lifecycle-gen:introduced" tags in types.go.
func (in *EndpointSliceList) APILifecycleIntroduced() (major, minor int) {
return 1, 16
}
// APILifecycleDeprecated is an autogenerated function, returning the release in which the API struct was or will be deprecated as int versions of major and minor for comparison.
// It is controlled by "k8s:prerelease-lifecycle-gen:deprecated" tags in types.go or "k8s:prerelease-lifecycle-gen:introduced" plus three minor.
func (in *EndpointSliceList) APILifecycleDeprecated() (major, minor int) {
return 1, 22
}
// APILifecycleRemoved is an autogenerated function, returning the release in which the API is no longer served as int versions of major and minor for comparison.
// It is controlled by "k8s:prerelease-lifecycle-gen:removed" tags in types.go or "k8s:prerelease-lifecycle-gen:deprecated" plus three minor.
func (in *EndpointSliceList) APILifecycleRemoved() (major, minor int) {
return 1, 25
}