Skip to content

Commit 241415e

Browse files
committed
Dont use discovery store on terraform jobs
The terraform that kops generates can't handle the state store s3 bucket and discovery store s3 bucket being in different regions. Since it is reasonable for cluster administrators to have both buckets in the same region and only prow's shared buckets are in different regions, we can just skip the discovery store in our terraform tests.
1 parent d803f6a commit 241415e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

config/jobs/kubernetes/kops/build_jobs.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def build_test(cloud='aws',
143143
tab = name_override or (f"kops-grid{suffix}")
144144
job_name = f"e2e-{tab}"
145145

146-
if irsa and cloud == "aws" and scenario is None:
146+
if irsa and cloud == "aws" and scenario is None and terraform_version is None:
147147
if extra_flags is None:
148148
extra_flags = []
149149
if build_cluster == "k8s-infra-kops-prow-build":
@@ -336,7 +336,8 @@ def presubmit_test(branch='master',
336336
if extra_flags is None:
337337
extra_flags = []
338338

339-
if irsa and cloud == "aws" and scenario is None and name != "pull-kops-aws-distro-al2023":
339+
if (irsa and cloud == "aws" and scenario is None and
340+
terraform_version is None and name != "pull-kops-aws-distro-al2023"):
340341
extra_flags.append("--discovery-store=s3://k8s-kops-prow/discovery")
341342

342343
marker, k8s_deploy_url, test_package_url, test_package_dir = k8s_version_info(k8s_version)

0 commit comments

Comments
 (0)