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

Signed-off-by: Marko Mudrinić <[email protected]>

Author: xmudrii

config/jobs/kubernetes/kops/build_jobs.py

@@ -146,11 +146,12 @@ def build_test(cloud='aws',
     if irsa and cloud == "aws" and scenario is None:
         if extra_flags is None:
             extra_flags = []
-        if build_cluster == "k8s-infra-kops-prow-build":
-            # TODO: migrate to an s3 bucket within the k8s-infra-kops-prow-build cluster's account
-            extra_flags.append("--discovery-store=s3://k8s-kops-prow/discovery")
-        else:
-            extra_flags.append("--discovery-store=s3://k8s-kops-ci-prow/discovery")
+        if name_override != "kops-aws-distro-al2023":
+            if build_cluster == "k8s-infra-kops-prow-build":
+                # TODO: migrate to an s3 bucket within the k8s-infra-kops-prow-build cluster's account
+                extra_flags.append("--discovery-store=s3://k8s-kops-prow/discovery")
+            else:
+                extra_flags.append("--discovery-store=s3://k8s-kops-ci-prow/discovery")
 
     marker, k8s_deploy_url, test_package_url, test_package_dir = k8s_version_info(k8s_version)
     args = create_args(kops_channel, networking, extra_flags, kops_image)

config/jobs/kubernetes/kops/kops-presubmits-distros.yaml

@@ -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:
@@ -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 \
@@ -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