github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-09-05 02:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1902 from fluxcd/update-e2e-versinos

Browse Source 
Update e2e environment to Kubernetes 1.35
This commit is contained in:
Sanskar Jaiswal
2026-04-20 18:12:56 +05:30
committed by GitHub
parent 70fb775b41 6fde326e5b
commit 35c8f95491
4 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/e2e.yaml
+3 -3
View File
@@ -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'
pkg/router/gateway_api.go
-7
View File
@@ -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 != "" {
test/gatewayapi/install.sh
+2 -2
View File
@@ -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
test/istio/install.sh
+1 -1
View File
@@ -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