[release-1.20] gateway-api: attached routes conformance test fix (#47728

) * gateway-api: attached routes conformance test fix * reenable ambient * regen * also unskip fixed GatewayObservedGenerationBump --------- Co-authored-by: Frank Budinsky <frankb@ca.ibm.com>
istio · Nov 14, 2023 · 3afecbe · 3afecbe
1 parent 16f03c6
commit 3afecbe
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/go.mod b/go.mod
@@ -120,7 +120,7 @@ require (
 	k8s.io/kubectl v0.28.0
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/controller-runtime v0.16.3
-	sigs.k8s.io/gateway-api v1.0.0
+	sigs.k8s.io/gateway-api v1.0.1-0.20231102234152-004e14bfe016
 	sigs.k8s.io/mcs-api v0.1.0
 	sigs.k8s.io/yaml v1.4.0
 )

diff --git a/go.sum b/go.sum
@@ -1430,8 +1430,8 @@ sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gE
 sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
 sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
 sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI=
-sigs.k8s.io/gateway-api v1.0.0 h1:iPTStSv41+d9p0xFydll6d7f7MOBGuqXM6p2/zVYMAs=
-sigs.k8s.io/gateway-api v1.0.0/go.mod h1:4cUgr0Lnp5FZ0Cdq8FdRwCvpiWws7LVhLHGIudLlf4c=
+sigs.k8s.io/gateway-api v1.0.1-0.20231102234152-004e14bfe016 h1:ovFzI+PB1mdbfAyR+Olnhc+HSys1z9IXSYqNfSdUUf0=
+sigs.k8s.io/gateway-api v1.0.1-0.20231102234152-004e14bfe016/go.mod h1:4cUgr0Lnp5FZ0Cdq8FdRwCvpiWws7LVhLHGIudLlf4c=
 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/tests/integration/ambient/gateway_conformance_test.go b/tests/integration/ambient/gateway_conformance_test.go
@@ -53,9 +53,8 @@ var conformanceNamespaces = []string{
 
 var skippedTests = map[string]string{
 	// TODO(https://github.com/kubernetes-sigs/gateway-api/issues/1996) scope this skip more
-	"MeshConsumerRoute":         "This requires an egress waypoint which is not yet implemented",
-	"GatewayStaticAddresses":    "https://github.com/istio/istio/issues/47467",
-	"GatewayWithAttachedRoutes": "https://github.com/kubernetes-sigs/gateway-api/pull/2548",
+	"MeshConsumerRoute":      "This requires an egress waypoint which is not yet implemented",
+	"GatewayStaticAddresses": "https://github.com/istio/istio/issues/47467",
 }
 
 func init() {

diff --git a/tests/integration/pilot/gateway_conformance_test.go b/tests/integration/pilot/gateway_conformance_test.go
@@ -54,10 +54,8 @@ var conformanceNamespaces = []string{
 }
 
 var skippedTests = map[string]string{
-	"MeshFrontendHostname":          "https://github.com/istio/istio/issues/44702",
-	"GatewayObservedGenerationBump": "https://github.com/istio/istio/issues/44850",
-	"GatewayStaticAddresses":        "https://github.com/istio/istio/issues/47467",
-	"GatewayWithAttachedRoutes":     "https://github.com/kubernetes-sigs/gateway-api/pull/2548",
+	"MeshFrontendHostname":   "https://github.com/istio/istio/issues/44702",
+	"GatewayStaticAddresses": "https://github.com/istio/istio/issues/47467",
 }
 
 func init() {

diff --git a/tests/integration/pilot/testdata/gateway-api-crd.yaml b/tests/integration/pilot/testdata/gateway-api-crd.yaml
@@ -1,4 +1,4 @@
-# Generated with `kubectl kustomize "https://github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.0.0"`
+# Generated with `kubectl kustomize "https://github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=004e14bfe016cbbe6aaecd0489558326ea244de5"`
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata: