Skip to content

Commit 0bcbe38

Browse files
authored
Merge pull request kubernetes#90599 from deads2k/beta-annotations-11-networking
add prerelease lifecycle tags to networking
2 parents 628b413 + cf9a9a9 commit 0bcbe38

File tree

4 files changed

+104
-1
lines changed

4 files changed

+104
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ go_library(
1515
"types_swagger_doc_generated.go",
1616
"well_known_annotations.go",
1717
"zz_generated.deepcopy.go",
18+
"zz_generated.prerelease-lifecycle.go",
1819
],
1920
importmap = "k8s.io/kubernetes/vendor/k8s.io/api/networking/v1beta1",
2021
importpath = "k8s.io/api/networking/v1beta1",

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

2223
package v1beta1 // import "k8s.io/api/networking/v1beta1"

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@ limitations under the License.
1717
package v1beta1
1818

1919
import (
20-
"k8s.io/api/core/v1"
20+
v1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/apimachinery/pkg/util/intstr"
2323
)
2424

2525
// +genclient
2626
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
27+
// +k8s:prerelease-lifecycle-gen:introduced=1.14
28+
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
2729

2830
// Ingress is a collection of rules that allow inbound connections to reach the
2931
// endpoints defined by a backend. An Ingress can be configured to give services
@@ -48,6 +50,8 @@ type Ingress struct {
4850
}
4951

5052
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
53+
// +k8s:prerelease-lifecycle-gen:introduced=1.14
54+
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
5155

5256
// IngressList is a collection of Ingress.
5357
type IngressList struct {
@@ -269,6 +273,8 @@ type IngressBackend struct {
269273
// +genclient
270274
// +genclient:nonNamespaced
271275
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
276+
// +k8s:prerelease-lifecycle-gen:introduced=1.18
277+
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
272278

273279
// IngressClass represents the class of the Ingress, referenced by the Ingress
274280
// Spec. The `ingressclass.kubernetes.io/is-default-class` annotation can be
@@ -306,6 +312,8 @@ type IngressClassSpec struct {
306312
}
307313

308314
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
315+
// +k8s:prerelease-lifecycle-gen:introduced=1.18
316+
// +k8s:prerelease-lifecycle-gen:deprecated=1.22
309317

310318
// IngressClassList is a collection of IngressClasses.
311319
type IngressClassList struct {

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

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