From 3725727ede19ff41697162714d865b5ffa4bde26 Mon Sep 17 00:00:00 2001 From: Mattia Lavacca Date: Fri, 29 Nov 2024 12:32:58 +0100 Subject: [PATCH] chore: bump bundle version to 1.2.1 (#3478) * chore: bump bundle version to 1.2.1 Signed-off-by: Mattia Lavacca * chore: fix hardcoded bundle version in test Signed-off-by: Mattia Lavacca --------- Signed-off-by: Mattia Lavacca --- ...y.networking.k8s.io_backendlbpolicies.yaml | 2 +- ....networking.k8s.io_backendtlspolicies.yaml | 2 +- ...eway.networking.k8s.io_gatewayclasses.yaml | 2 +- .../gateway.networking.k8s.io_gateways.yaml | 2 +- .../gateway.networking.k8s.io_grpcroutes.yaml | 2 +- .../gateway.networking.k8s.io_httproutes.yaml | 2 +- ...way.networking.k8s.io_referencegrants.yaml | 2 +- .../gateway.networking.k8s.io_tcproutes.yaml | 2 +- .../gateway.networking.k8s.io_tlsroutes.yaml | 2 +- .../gateway.networking.k8s.io_udproutes.yaml | 2 +- ...eway.networking.k8s.io_gatewayclasses.yaml | 2 +- .../gateway.networking.k8s.io_gateways.yaml | 2 +- .../gateway.networking.k8s.io_grpcroutes.yaml | 2 +- .../gateway.networking.k8s.io_httproutes.yaml | 2 +- ...way.networking.k8s.io_referencegrants.yaml | 2 +- conformance/utils/suite/suite_test.go | 22 +++++++++---------- pkg/consts/consts.go | 2 +- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/config/crd/experimental/gateway.networking.k8s.io_backendlbpolicies.yaml b/config/crd/experimental/gateway.networking.k8s.io_backendlbpolicies.yaml index 59a6f36ca6..ed69501aa2 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_backendlbpolicies.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_backendlbpolicies.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null labels: diff --git a/config/crd/experimental/gateway.networking.k8s.io_backendtlspolicies.yaml b/config/crd/experimental/gateway.networking.k8s.io_backendtlspolicies.yaml index 7cdd9f301e..d9a8059d8c 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_backendtlspolicies.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_backendtlspolicies.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null labels: diff --git a/config/crd/experimental/gateway.networking.k8s.io_gatewayclasses.yaml b/config/crd/experimental/gateway.networking.k8s.io_gatewayclasses.yaml index 28f9c3867b..631fb2e3cf 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_gatewayclasses.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_gatewayclasses.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: gatewayclasses.gateway.networking.k8s.io diff --git a/config/crd/experimental/gateway.networking.k8s.io_gateways.yaml b/config/crd/experimental/gateway.networking.k8s.io_gateways.yaml index 93c202f261..b59f235154 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_gateways.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_gateways.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: gateways.gateway.networking.k8s.io diff --git a/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml b/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml index e30ff85b77..133445ad4e 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_grpcroutes.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: grpcroutes.gateway.networking.k8s.io diff --git a/config/crd/experimental/gateway.networking.k8s.io_httproutes.yaml b/config/crd/experimental/gateway.networking.k8s.io_httproutes.yaml index b618105a65..84397c8246 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_httproutes.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_httproutes.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: httproutes.gateway.networking.k8s.io diff --git a/config/crd/experimental/gateway.networking.k8s.io_referencegrants.yaml b/config/crd/experimental/gateway.networking.k8s.io_referencegrants.yaml index 3bbde36bb7..c28a380a73 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_referencegrants.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_referencegrants.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: referencegrants.gateway.networking.k8s.io diff --git a/config/crd/experimental/gateway.networking.k8s.io_tcproutes.yaml b/config/crd/experimental/gateway.networking.k8s.io_tcproutes.yaml index b37d6641f4..e33001c527 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_tcproutes.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_tcproutes.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: tcproutes.gateway.networking.k8s.io diff --git a/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml b/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml index 63a046f38c..749f85939a 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_tlsroutes.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: tlsroutes.gateway.networking.k8s.io diff --git a/config/crd/experimental/gateway.networking.k8s.io_udproutes.yaml b/config/crd/experimental/gateway.networking.k8s.io_udproutes.yaml index 25a712a798..ea552dbb6b 100644 --- a/config/crd/experimental/gateway.networking.k8s.io_udproutes.yaml +++ b/config/crd/experimental/gateway.networking.k8s.io_udproutes.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: udproutes.gateway.networking.k8s.io diff --git a/config/crd/standard/gateway.networking.k8s.io_gatewayclasses.yaml b/config/crd/standard/gateway.networking.k8s.io_gatewayclasses.yaml index 2fe5c246c4..ed98fd4085 100644 --- a/config/crd/standard/gateway.networking.k8s.io_gatewayclasses.yaml +++ b/config/crd/standard/gateway.networking.k8s.io_gatewayclasses.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: standard creationTimestamp: null name: gatewayclasses.gateway.networking.k8s.io diff --git a/config/crd/standard/gateway.networking.k8s.io_gateways.yaml b/config/crd/standard/gateway.networking.k8s.io_gateways.yaml index 30ccd8b897..7d5b5811d1 100644 --- a/config/crd/standard/gateway.networking.k8s.io_gateways.yaml +++ b/config/crd/standard/gateway.networking.k8s.io_gateways.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: standard creationTimestamp: null name: gateways.gateway.networking.k8s.io diff --git a/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml b/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml index 70e58b59d7..c099c00bef 100644 --- a/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml +++ b/config/crd/standard/gateway.networking.k8s.io_grpcroutes.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: standard creationTimestamp: null name: grpcroutes.gateway.networking.k8s.io diff --git a/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml b/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml index d553e0dee0..8c272c5d00 100644 --- a/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml +++ b/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: standard creationTimestamp: null name: httproutes.gateway.networking.k8s.io diff --git a/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml b/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml index eddc28b1f7..d18ee62fba 100644 --- a/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml +++ b/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml @@ -3,7 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/3328 - gateway.networking.k8s.io/bundle-version: v1.2.0 + gateway.networking.k8s.io/bundle-version: v1.2.1 gateway.networking.k8s.io/channel: standard creationTimestamp: null name: referencegrants.gateway.networking.k8s.io diff --git a/conformance/utils/suite/suite_test.go b/conformance/utils/suite/suite_test.go index b94f879539..639fc6ca2a 100644 --- a/conformance/utils/suite/suite_test.go +++ b/conformance/utils/suite/suite_test.go @@ -49,7 +49,7 @@ func TestGetAPIVersionAndChannel(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "gateways.gateway.networking.k8s.io", Annotations: map[string]string{ - consts.BundleVersionAnnotation: "v1.2.0", + consts.BundleVersionAnnotation: consts.BundleVersion, consts.ChannelAnnotation: "standard", }, }, @@ -58,13 +58,13 @@ func TestGetAPIVersionAndChannel(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "httproutes.gateway.networking.k8s.io", Annotations: map[string]string{ - consts.BundleVersionAnnotation: "v1.2.0", + consts.BundleVersionAnnotation: consts.BundleVersion, consts.ChannelAnnotation: "standard", }, }, }, }, - expectedVersion: "v1.2.0", + expectedVersion: consts.BundleVersion, expectedChannel: "standard", }, { @@ -74,7 +74,7 @@ func TestGetAPIVersionAndChannel(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "gateways.gateway.networking.k8s.io", Annotations: map[string]string{ - consts.BundleVersionAnnotation: "v1.2.0", + consts.BundleVersionAnnotation: consts.BundleVersion, consts.ChannelAnnotation: "standard", }, }, @@ -83,7 +83,7 @@ func TestGetAPIVersionAndChannel(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "httproutes.gateway.networking.k8s.io", Annotations: map[string]string{ - consts.BundleVersionAnnotation: "v1.2.0", + consts.BundleVersionAnnotation: consts.BundleVersion, consts.ChannelAnnotation: "standard", }, }, @@ -94,7 +94,7 @@ func TestGetAPIVersionAndChannel(t *testing.T) { }, }, }, - expectedVersion: "v1.2.0", + expectedVersion: consts.BundleVersion, expectedChannel: "standard", }, { @@ -104,7 +104,7 @@ func TestGetAPIVersionAndChannel(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "gateways.gateway.networking.k8s.io", Annotations: map[string]string{ - consts.BundleVersionAnnotation: "v1.2.0", + consts.BundleVersionAnnotation: consts.BundleVersion, consts.ChannelAnnotation: "standard", }, }, @@ -128,7 +128,7 @@ func TestGetAPIVersionAndChannel(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "gateways.gateway.networking.k8s.io", Annotations: map[string]string{ - consts.BundleVersionAnnotation: "v1.2.0", + consts.BundleVersionAnnotation: consts.BundleVersion, consts.ChannelAnnotation: "standard", }, }, @@ -137,7 +137,7 @@ func TestGetAPIVersionAndChannel(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "httproutes.gateway.networking.k8s.io", Annotations: map[string]string{ - consts.BundleVersionAnnotation: "v1.2.0", + consts.BundleVersionAnnotation: consts.BundleVersion, consts.ChannelAnnotation: "experimental", }, }, @@ -152,7 +152,7 @@ func TestGetAPIVersionAndChannel(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "gateways.gateway.networking.k8s.io", Annotations: map[string]string{ - consts.BundleVersionAnnotation: "v1.2.0", + consts.BundleVersionAnnotation: consts.BundleVersion, consts.ChannelAnnotation: "standard", }, }, @@ -161,7 +161,7 @@ func TestGetAPIVersionAndChannel(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "httproutes.gateway.networking.k8s.io", Annotations: map[string]string{ - consts.BundleVersionAnnotation: "v1.2.0", + consts.BundleVersionAnnotation: consts.BundleVersion, }, }, }, diff --git a/pkg/consts/consts.go b/pkg/consts/consts.go index bf81e153da..a40af3af10 100644 --- a/pkg/consts/consts.go +++ b/pkg/consts/consts.go @@ -27,7 +27,7 @@ const ( // BundleVersion is the value used for the "gateway.networking.k8s.io/bundle-version" annotation. // These value must be updated during the release process. - BundleVersion = "v1.2.0" + BundleVersion = "v1.2.1" // ApprovalLink is the value used for the "api-approved.kubernetes.io" annotation. // These value must be updated during the release process.