Skip to content

Commit 35c8f95

Browse files
authored
Merge pull request #1902 from fluxcd/update-e2e-versinos
Update e2e environment to Kubernetes 1.35
2 parents 70fb775 + 6fde326 commit 35c8f95

4 files changed

Lines changed: 6 additions & 13 deletions

File tree

.github/workflows/e2e.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ jobs:
4040
- name: Checkout
4141
uses: actions/checkout@v5
4242
- name: Setup Kubernetes
43-
uses: helm/kind-action@v1.12.0
43+
uses: helm/kind-action@v1.14.0
4444
if: matrix.provider != 'skipper'
4545
with:
46-
version: v0.23.0
46+
version: v0.27.0
4747
cluster_name: kind
48-
node_image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
48+
node_image: kindest/node:v1.35.1@sha256:05d7bcdefbda08b4e038f644c4df690cdac3fba8b06f8289f30e10026720a1ab
4949
- name: Setup Kubernetes for skipper
5050
uses: helm/kind-action@v1.12.0
5151
if: matrix.provider == 'skipper'

pkg/router/gateway_api.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,6 @@ func (gwr *GatewayAPIRouter) SetRoutes(
369369
},
370370
})
371371
}
372-
var timeout v1.Duration
373-
if canary.Spec.Service.Timeout != "" {
374-
timeout = v1.Duration(canary.Spec.Service.Timeout)
375-
}
376372

377373
weightedRouteRule := &v1.HTTPRouteRule{
378374
Matches: matches,
@@ -441,9 +437,6 @@ func (gwr *GatewayAPIRouter) SetRoutes(
441437
BackendRef: gwr.makeBackendRef(primarySvcName, initialPrimaryWeight, canary.Spec.Service.Port),
442438
},
443439
},
444-
Timeouts: &v1.HTTPRouteTimeouts{
445-
Request: &timeout,
446-
},
447440
})
448441

449442
if canary.Spec.Service.Timeout != "" {

test/gatewayapi/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
set -o errexit
44

5-
GATEWAY_API_VER="v1.0.0"
5+
GATEWAY_API_VER="v1.5.1"
66
REPO_ROOT=$(git rev-parse --show-toplevel)
7-
ISTIO_VER="1.20.0"
7+
ISTIO_VER="1.29.2"
88

99
mkdir -p ${REPO_ROOT}/bin
1010

test/istio/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -o errexit
44

5-
ISTIO_VER="1.18.2"
5+
ISTIO_VER="1.29.2"
66
REPO_ROOT=$(git rev-parse --show-toplevel)
77

88
mkdir -p ${REPO_ROOT}/bin

0 commit comments

Comments
 (0)