Skip to content

Commit 38596ed

Browse files
authored
Merge pull request #28619 from hakman/revert-28580-kops_ipv6_optional
Revert "kOps: Make ipv6 pre-submits optional"
2 parents 9abd2f6 + 11e5e73 commit 38596ed

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

config/jobs/kubernetes/kops/build_jobs.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ def generate_presubmits_network_plugins():
11081108
'--zones=us-west-2a',
11091109
],
11101110
run_if_changed=run_if_changed,
1111-
optional=True,
1111+
optional=optional,
11121112
)
11131113
)
11141114
return results

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ presubmits:
206206
- master
207207
run_if_changed: '^(upup\/models\/cloudup\/resources\/addons\/networking\.projectcalico\.org\/|pkg\/model\/(components\/containerd|firewall|pki|iam\/iam_builder)\.go|nodeup\/pkg\/model\/networking\/calico\.go)'
208208
always_run: false
209-
optional: true
209+
optional: false
210210
skip_report: false
211211
labels:
212212
preset-service-account: "true"
@@ -404,7 +404,7 @@ presubmits:
404404
- master
405405
run_if_changed: '^(upup\/models\/cloudup\/resources\/addons\/networking\.cilium\.io\/|pkg\/model\/(components\/containerd|firewall|components\/cilium|iam\/iam_builder)\.go|nodeup\/pkg\/model\/(context|networking\/cilium)\.go)'
406406
always_run: false
407-
optional: true
407+
optional: false
408408
skip_report: false
409409
labels:
410410
preset-service-account: "true"

0 commit comments

Comments
 (0)