From 1f08e46698bffa44484d5f90f89bac8c9ebe12a4 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Sat, 16 Sep 2023 02:22:46 -0700 Subject: [PATCH] chore: bump gateway api to v0.8.1 (#1891) * chore: bump gateway api to v0.8.1 https://github.com/kubernetes-sigs/gateway-api/releases/tag/v0.8.1 Signed-off-by: Arko Dasgupta * make manifests Signed-off-by: Arko Dasgupta * skip HTTPRouteRequestMultipleMirrors Signed-off-by: Arko Dasgupta --- charts/gateway-helm/crds/gatewayapi-crds.yaml | 22 +++++++++---------- go.mod | 2 +- go.sum | 4 ++-- test/conformance/conformance_test.go | 6 ++++- .../experimental_conformance_test.go | 8 ++++--- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/charts/gateway-helm/crds/gatewayapi-crds.yaml b/charts/gateway-helm/crds/gatewayapi-crds.yaml index 74c8fd4ef10..2de13927474 100644 --- a/charts/gateway-helm/crds/gatewayapi-crds.yaml +++ b/charts/gateway-helm/crds/gatewayapi-crds.yaml @@ -24,7 +24,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245 - gateway.networking.k8s.io/bundle-version: v0.8.0 + gateway.networking.k8s.io/bundle-version: v0.8.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: gatewayclasses.gateway.networking.k8s.io @@ -469,7 +469,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245 - gateway.networking.k8s.io/bundle-version: v0.8.0 + gateway.networking.k8s.io/bundle-version: v0.8.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: gateways.gateway.networking.k8s.io @@ -964,7 +964,7 @@ spec: for each listener rule: 'self.all(l1, self.exists_one(l2, l1.port == l2.port && l1.protocol == l2.protocol && (has(l1.hostname) && has(l2.hostname) ? l1.hostname - == l2.hostname : true)))' + == l2.hostname : !has(l1.hostname) && !has(l2.hostname))))' required: - gatewayClassName - listeners @@ -1742,7 +1742,7 @@ spec: for each listener rule: 'self.all(l1, self.exists_one(l2, l1.port == l2.port && l1.protocol == l2.protocol && (has(l1.hostname) && has(l2.hostname) ? l1.hostname - == l2.hostname : true)))' + == l2.hostname : !has(l1.hostname) && !has(l2.hostname))))' required: - gatewayClassName - listeners @@ -2060,7 +2060,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245 - gateway.networking.k8s.io/bundle-version: v0.8.0 + gateway.networking.k8s.io/bundle-version: v0.8.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: grpcroutes.gateway.networking.k8s.io @@ -3765,7 +3765,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245 - gateway.networking.k8s.io/bundle-version: v0.8.0 + gateway.networking.k8s.io/bundle-version: v0.8.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: httproutes.gateway.networking.k8s.io @@ -8596,7 +8596,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245 - gateway.networking.k8s.io/bundle-version: v0.8.0 + gateway.networking.k8s.io/bundle-version: v0.8.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: referencegrants.gateway.networking.k8s.io @@ -8885,7 +8885,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245 - gateway.networking.k8s.io/bundle-version: v0.8.0 + gateway.networking.k8s.io/bundle-version: v0.8.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: tcproutes.gateway.networking.k8s.io @@ -9501,7 +9501,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245 - gateway.networking.k8s.io/bundle-version: v0.8.0 + gateway.networking.k8s.io/bundle-version: v0.8.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: tlsroutes.gateway.networking.k8s.io @@ -10166,7 +10166,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.kubernetes.io: https://github.com/kubernetes-sigs/gateway-api/pull/2245 - gateway.networking.k8s.io/bundle-version: v0.8.0 + gateway.networking.k8s.io/bundle-version: v0.8.1 gateway.networking.k8s.io/channel: experimental creationTimestamp: null name: udproutes.gateway.networking.k8s.io @@ -10847,7 +10847,7 @@ spec: spec: containers: - name: webhook - image: registry.k8s.io/gateway-api/admission-server:v0.8.0 + image: registry.k8s.io/gateway-api/admission-server:v0.8.1 imagePullPolicy: IfNotPresent args: - -logtostderr diff --git a/go.mod b/go.mod index 2534f50a72f..b84203d7f4f 100644 --- a/go.mod +++ b/go.mod @@ -37,7 +37,7 @@ require ( k8s.io/kubectl v0.28.1 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 sigs.k8s.io/controller-runtime v0.16.2 - sigs.k8s.io/gateway-api v0.8.0 + sigs.k8s.io/gateway-api v0.8.1 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index c201fc42186..056222876cb 100644 --- a/go.sum +++ b/go.sum @@ -738,8 +738,8 @@ sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gE sigs.k8s.io/controller-runtime v0.16.2 h1:mwXAVuEk3EQf478PQwQ48zGOXvW27UJc8NHktQVuIPU= sigs.k8s.io/controller-runtime v0.16.2/go.mod h1:vpMu3LpI5sYWtujJOa2uPK61nB5rbwlN7BAB8aSLvGU= sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= -sigs.k8s.io/gateway-api v0.8.0 h1:isQQ3Jx2qFP7vaA3ls0846F0Amp9Eq14P08xbSwVbQg= -sigs.k8s.io/gateway-api v0.8.0/go.mod h1:okOnjPNBFbIS/Rw9kAhuIUaIkLhTKEu+ARIuXk2dgaM= +sigs.k8s.io/gateway-api v0.8.1 h1:Bo4NMAQFYkQZnHXOfufbYwbPW7b3Ic5NjpbeW6EJxuU= +sigs.k8s.io/gateway-api v0.8.1/go.mod h1:0PteDrsrgkRmr13nDqFWnev8tOysAVrwnvfFM55tSVg= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kind v0.8.1/go.mod h1:oNKTxUVPYkV9lWzY6CVMNluVq8cBsyq+UgPJdvA3uu4= diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go index 4e3b424f10d..f7f195a55e7 100644 --- a/test/conformance/conformance_test.go +++ b/test/conformance/conformance_test.go @@ -45,7 +45,11 @@ func TestGatewayAPIConformance(t *testing.T) { Clientset: clientset, CleanupBaseResources: *flags.CleanupBaseResources, SupportedFeatures: suite.AllFeatures, - ExemptFeatures: suite.MeshCoreFeatures, + SkipTests: []string{ + // TODO: Remove once https://github.com/envoyproxy/gateway/issues/1811 is fixed + tests.HTTPRouteRequestMultipleMirrors.ShortName, + }, + ExemptFeatures: suite.MeshCoreFeatures, }) cSuite.Setup(t) cSuite.Run(t, tests.ConformanceTests) diff --git a/test/conformance/experimental_conformance_test.go b/test/conformance/experimental_conformance_test.go index ef28ce7551e..ca5abffc2bd 100644 --- a/test/conformance/experimental_conformance_test.go +++ b/test/conformance/experimental_conformance_test.go @@ -34,7 +34,6 @@ var ( mgrClient client.Client implementation *confv1a1.Implementation conformanceProfiles sets.Set[suite.ConformanceProfileName] - skipTests []string ) func TestExperimentalConformance(t *testing.T) { @@ -93,8 +92,11 @@ func experimentalConformance(t *testing.T) { GatewayClassName: *flags.GatewayClassName, Debug: *flags.ShowDebug, CleanupBaseResources: *flags.CleanupBaseResources, - SkipTests: skipTests, - SupportedFeatures: sets.Set[suite.SupportedFeature]{}.Insert(suite.HTTPRouteExtendedFeatures.UnsortedList()...), + SkipTests: []string{ + // TODO: Remove once https://github.com/envoyproxy/gateway/issues/1811 is fixed + tests.HTTPRouteRequestMultipleMirrors.ShortName, + }, + SupportedFeatures: sets.Set[suite.SupportedFeature]{}.Insert(suite.HTTPRouteExtendedFeatures.UnsortedList()...), }, Implementation: *implementation, ConformanceProfiles: conformanceProfiles,