diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 51363daf..3c27428c 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -40,12 +40,12 @@ jobs: - name: Checkout uses: actions/checkout@v5 - name: Setup Kubernetes - uses: helm/kind-action@v1.12.0 + uses: helm/kind-action@v1.14.0 if: matrix.provider != 'skipper' with: - version: v0.23.0 + version: v0.27.0 cluster_name: kind - node_image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e + node_image: kindest/node:v1.35.1@sha256:05d7bcdefbda08b4e038f644c4df690cdac3fba8b06f8289f30e10026720a1ab - name: Setup Kubernetes for skipper uses: helm/kind-action@v1.12.0 if: matrix.provider == 'skipper' diff --git a/pkg/router/gateway_api.go b/pkg/router/gateway_api.go index bbcadc28..31b09b20 100644 --- a/pkg/router/gateway_api.go +++ b/pkg/router/gateway_api.go @@ -369,10 +369,6 @@ func (gwr *GatewayAPIRouter) SetRoutes( }, }) } - var timeout v1.Duration - if canary.Spec.Service.Timeout != "" { - timeout = v1.Duration(canary.Spec.Service.Timeout) - } weightedRouteRule := &v1.HTTPRouteRule{ Matches: matches, @@ -441,9 +437,6 @@ func (gwr *GatewayAPIRouter) SetRoutes( BackendRef: gwr.makeBackendRef(primarySvcName, initialPrimaryWeight, canary.Spec.Service.Port), }, }, - Timeouts: &v1.HTTPRouteTimeouts{ - Request: &timeout, - }, }) if canary.Spec.Service.Timeout != "" { diff --git a/test/gatewayapi/install.sh b/test/gatewayapi/install.sh index 20778f79..3c3e3749 100755 --- a/test/gatewayapi/install.sh +++ b/test/gatewayapi/install.sh @@ -2,9 +2,9 @@ set -o errexit -GATEWAY_API_VER="v1.0.0" +GATEWAY_API_VER="v1.5.1" REPO_ROOT=$(git rev-parse --show-toplevel) -ISTIO_VER="1.20.0" +ISTIO_VER="1.29.2" mkdir -p ${REPO_ROOT}/bin diff --git a/test/istio/install.sh b/test/istio/install.sh index 0a123ed2..6e0e82cf 100755 --- a/test/istio/install.sh +++ b/test/istio/install.sh @@ -2,7 +2,7 @@ set -o errexit -ISTIO_VER="1.18.2" +ISTIO_VER="1.29.2" REPO_ROOT=$(git rev-parse --show-toplevel) mkdir -p ${REPO_ROOT}/bin