Skip to content

Commit 27bc9f6

Browse files
authored
Merge pull request #35728 from hakman/disable-wireguard
kOps: Disable Wireguard for Calico tests
2 parents e3ec1c4 + e34ad81 commit 27bc9f6

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1463,6 +1463,10 @@ def generate_network_plugins():
14631463
"--set=cluster.spec.networking.amazonVPC.env=MINIMUM_IP_TARGET=80",
14641464
"--set=cluster.spec.networking.amazonVPC.env=WARM_IP_TARGET=10",
14651465
]
1466+
if plugin == 'calico':
1467+
extra_flags.extend([
1468+
"--set=cluster.spec.networking.calico.wireguardEnabled=false",
1469+
])
14661470
results.append(
14671471
build_test(
14681472
distro=distro,
@@ -1879,6 +1883,10 @@ def generate_presubmits_network_plugins():
18791883
"--set=cluster.spec.networking.amazonVPC.env=MINIMUM_IP_TARGET=80",
18801884
"--set=cluster.spec.networking.amazonVPC.env=WARM_IP_TARGET=10",
18811885
])
1886+
if plugin == 'calico':
1887+
aws_extra_flags.extend([
1888+
"--set=cluster.spec.networking.calico.wireguardEnabled=false",
1889+
])
18821890
if plugin in ['cilium-eni']:
18831891
distro = 'u2204arm64' # pinned to 22.04 because of network issues with 24.04 and these CNIs
18841892
results.append(

config/jobs/kubernetes/kops/kops-periodics-network-plugins.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ periodics:
6666
testgrid-days-of-results: '90'
6767
testgrid-tab-name: kops-aws-cni-amazon-vpc
6868

69-
# {"cloud": "aws", "distro": "u2404", "extra_flags": "--node-size=t3.large", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
69+
# {"cloud": "aws", "distro": "u2404", "extra_flags": "--node-size=t3.large --set=cluster.spec.networking.calico.wireguardEnabled=false", "k8s_version": "stable", "kops_channel": "alpha", "kops_version": "latest", "networking": "calico"}
7070
- name: e2e-kops-aws-cni-calico
7171
cron: '16 7-23/8 * * *'
7272
labels:
@@ -96,7 +96,7 @@ periodics:
9696
-v 2 \
9797
--up --down \
9898
--cloud-provider=aws \
99-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20251001' --channel=alpha --networking=calico --node-size=t3.large" \
99+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20251001' --channel=alpha --networking=calico --node-size=t3.large --set=cluster.spec.networking.calico.wireguardEnabled=false" \
100100
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
101101
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
102102
--test=kops \
@@ -121,7 +121,7 @@ periodics:
121121
annotations:
122122
test.kops.k8s.io/cloud: aws
123123
test.kops.k8s.io/distro: u2404
124-
test.kops.k8s.io/extra_flags: --node-size=t3.large
124+
test.kops.k8s.io/extra_flags: --node-size=t3.large --set=cluster.spec.networking.calico.wireguardEnabled=false
125125
test.kops.k8s.io/k8s_version: stable
126126
test.kops.k8s.io/kops_channel: alpha
127127
test.kops.k8s.io/kops_version: latest

config/jobs/kubernetes/kops/kops-presubmits-network-plugins.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ presubmits:
136136
testgrid-days-of-results: '90'
137137
testgrid-tab-name: e2e-amazonvpc-ipv6
138138

139-
# {"cloud": "aws", "distro": "u2404arm64", "extra_flags": "--master-size=c6g.large --node-size=t4g.large", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
139+
# {"cloud": "aws", "distro": "u2404arm64", "extra_flags": "--master-size=c6g.large --node-size=t4g.large --set=cluster.spec.networking.calico.wireguardEnabled=false", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
140140
- name: pull-kops-e2e-cni-calico
141141
cluster: k8s-infra-kops-prow-build
142142
branches:
@@ -168,7 +168,7 @@ presubmits:
168168
-v 2 \
169169
--up --build --down \
170170
--cloud-provider=aws \
171-
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20251001' --channel=alpha --networking=calico --master-size=c6g.large --node-size=t4g.large" \
171+
--create-args="--image='099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20251001' --channel=alpha --networking=calico --master-size=c6g.large --node-size=t4g.large --set=cluster.spec.networking.calico.wireguardEnabled=false" \
172172
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
173173
--kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
174174
--test=kops \
@@ -195,7 +195,7 @@ presubmits:
195195
annotations:
196196
test.kops.k8s.io/cloud: aws
197197
test.kops.k8s.io/distro: u2404arm64
198-
test.kops.k8s.io/extra_flags: --master-size=c6g.large --node-size=t4g.large
198+
test.kops.k8s.io/extra_flags: --master-size=c6g.large --node-size=t4g.large --set=cluster.spec.networking.calico.wireguardEnabled=false
199199
test.kops.k8s.io/k8s_version: stable
200200
test.kops.k8s.io/kops_channel: alpha
201201
test.kops.k8s.io/networking: calico

0 commit comments

Comments
 (0)