mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 01:06:27 +00:00
Merge pull request #90599 from deads2k/beta-annotations-11-networking
add prerelease lifecycle tags to networking
This commit is contained in:
commit
0bcbe384d8
@ -15,6 +15,7 @@ go_library(
|
|||||||
"types_swagger_doc_generated.go",
|
"types_swagger_doc_generated.go",
|
||||||
"well_known_annotations.go",
|
"well_known_annotations.go",
|
||||||
"zz_generated.deepcopy.go",
|
"zz_generated.deepcopy.go",
|
||||||
|
"zz_generated.prerelease-lifecycle.go",
|
||||||
],
|
],
|
||||||
importmap = "k8s.io/kubernetes/vendor/k8s.io/api/networking/v1beta1",
|
importmap = "k8s.io/kubernetes/vendor/k8s.io/api/networking/v1beta1",
|
||||||
importpath = "k8s.io/api/networking/v1beta1",
|
importpath = "k8s.io/api/networking/v1beta1",
|
||||||
|
@ -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=networking.k8s.io
|
// +groupName=networking.k8s.io
|
||||||
|
|
||||||
package v1beta1 // import "k8s.io/api/networking/v1beta1"
|
package v1beta1 // import "k8s.io/api/networking/v1beta1"
|
||||||
|
@ -17,13 +17,15 @@ limitations under the License.
|
|||||||
package v1beta1
|
package v1beta1
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"k8s.io/api/core/v1"
|
v1 "k8s.io/api/core/v1"
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/util/intstr"
|
"k8s.io/apimachinery/pkg/util/intstr"
|
||||||
)
|
)
|
||||||
|
|
||||||
// +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.14
|
||||||
|
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
|
||||||
|
|
||||||
// Ingress is a collection of rules that allow inbound connections to reach the
|
// Ingress is a collection of rules that allow inbound connections to reach the
|
||||||
// endpoints defined by a backend. An Ingress can be configured to give services
|
// endpoints defined by a backend. An Ingress can be configured to give services
|
||||||
@ -48,6 +50,8 @@ type Ingress 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.14
|
||||||
|
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
|
||||||
|
|
||||||
// IngressList is a collection of Ingress.
|
// IngressList is a collection of Ingress.
|
||||||
type IngressList struct {
|
type IngressList struct {
|
||||||
@ -269,6 +273,8 @@ type IngressBackend struct {
|
|||||||
// +genclient
|
// +genclient
|
||||||
// +genclient:nonNamespaced
|
// +genclient:nonNamespaced
|
||||||
// +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.18
|
||||||
|
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
|
||||||
|
|
||||||
// IngressClass represents the class of the Ingress, referenced by the Ingress
|
// IngressClass represents the class of the Ingress, referenced by the Ingress
|
||||||
// Spec. The `ingressclass.kubernetes.io/is-default-class` annotation can be
|
// Spec. The `ingressclass.kubernetes.io/is-default-class` annotation can be
|
||||||
@ -306,6 +312,8 @@ type IngressClassSpec 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.18
|
||||||
|
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
|
||||||
|
|
||||||
// IngressClassList is a collection of IngressClasses.
|
// IngressClassList is a collection of IngressClasses.
|
||||||
type IngressClassList struct {
|
type IngressClassList struct {
|
||||||
|
93
staging/src/k8s.io/api/networking/v1beta1/zz_generated.prerelease-lifecycle.go
generated
Normal file
93
staging/src/k8s.io/api/networking/v1beta1/zz_generated.prerelease-lifecycle.go
generated
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
// +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 *Ingress) APILifecycleIntroduced() (major, minor int) {
|
||||||
|
return 1, 14
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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 *Ingress) 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 *Ingress) 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 *IngressClass) APILifecycleIntroduced() (major, minor int) {
|
||||||
|
return 1, 18
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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 *IngressClass) 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 *IngressClass) 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 *IngressClassList) APILifecycleIntroduced() (major, minor int) {
|
||||||
|
return 1, 18
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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 *IngressClassList) 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 *IngressClassList) 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 *IngressList) APILifecycleIntroduced() (major, minor int) {
|
||||||
|
return 1, 14
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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 *IngressList) 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 *IngressList) APILifecycleRemoved() (major, minor int) {
|
||||||
|
return 1, 25
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user