From 9893e941400c2fc767d0efc93f078d85f111e647 Mon Sep 17 00:00:00 2001 From: juliankatz Date: Tue, 8 Apr 2025 17:34:36 -0700 Subject: [PATCH] Add exception for dual-variable setting in utils.go for extended channel --- test/k8s-integration/main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go index b8daec1f3..b84727503 100644 --- a/test/k8s-integration/main.go +++ b/test/k8s-integration/main.go @@ -176,8 +176,10 @@ func main() { if *deploymentStrat == "gke" { ensureVariable(kubeVersion, false, "Cannot set kube-version when using deployment strategy 'gke'. Use gke-cluster-version.") - ensureExactlyOneVariableSet([]*string{gkeClusterVer, gkeReleaseChannel}, - "For GKE cluster deployment, exactly one of 'gke-cluster-version' or 'gke-release-channel' must be set") + if *gkeReleaseChannel != "extended" { + ensureExactlyOneVariableSet([]*string{gkeClusterVer, gkeReleaseChannel}, + "For GKE cluster deployment, exactly one of 'gke-cluster-version' or 'gke-release-channel' must be set") + } ensureVariable(kubeFeatureGates, false, "Cannot set feature gates when using deployment strategy 'gke'.") if len(*localK8sDir) == 0 { ensureVariable(testVersion, true, "Must set either test-version or local k8s dir when using deployment strategy 'gke'.")