Skip to content

Remove discovery-store from pull-kops-aws-distro-al2023 #35250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 1, 2025
+3 −4
Merged

Remove discovery-store from pull-kops-aws-distro-al2023 #35250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/jobs/kubernetes/kops/build_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ def presubmit_test(branch='master',
if extra_flags is None:
extra_flags = []

if irsa and cloud == "aws" and scenario is None:
Copy link
Member Author

@xmudrii xmudrii Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to add this hack so lint passes, it'll be reverted after testing.

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

marker, k8s_deploy_url, test_package_url, test_package_dir = k8s_version_info(k8s_version)
Expand Down
5 changes: 2 additions & 3 deletions config/jobs/kubernetes/kops/kops-presubmits-distros.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ presubmits:
testgrid-days-of-results: '90'
testgrid-tab-name: e2e-amazonlinux2

# {"cloud": "aws", "distro": "al2023", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
# {"cloud": "aws", "distro": "al2023", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"}
- name: pull-kops-aws-distro-al2023
cluster: k8s-infra-kops-prow-build
branches:
Expand Down Expand Up @@ -705,7 +705,7 @@ presubmits:
-v 2 \
--up --build --down \
--cloud-provider=aws \
--create-args="--image='137112412989/al2023-ami-2023.7.20250609.0-kernel-6.1-x86_64' --channel=alpha --networking=calico --discovery-store=s3://k8s-kops-prow/discovery" \
--create-args="--image='137112412989/al2023-ami-2023.7.20250609.0-kernel-6.1-x86_64' --channel=alpha --networking=calico" \
--kubernetes-version=https://dl.k8s.io/release/stable.txt \
--kops-binary-path=/home/prow/go/src/k8s.io/kops/.build/dist/linux/amd64/kops \
--test=kops \
Expand All @@ -732,7 +732,6 @@ presubmits:
annotations:
test.kops.k8s.io/cloud: aws
test.kops.k8s.io/distro: al2023
test.kops.k8s.io/extra_flags: --discovery-store=s3://k8s-kops-prow/discovery
test.kops.k8s.io/k8s_version: stable
test.kops.k8s.io/kops_channel: alpha
test.kops.k8s.io/networking: calico
Expand Down