From 245ca30207735f00978e635489a7bbc862d329d3 Mon Sep 17 00:00:00 2001 From: Arnaud Meukam Date: Mon, 8 Jul 2024 14:48:09 +0200 Subject: [PATCH] kops: Migrate E2E and network-plugins kops-presubmits Ref: - https://github.com/kubernetes/kops/issues/16637 - https://github.com/kubernetes/k8s.io/issues/5127 Ensure E2E and network plugins presubmits runs on community-owned infrastructure. Signed-off-by: Arnaud Meukam --- config/jobs/kubernetes/kops/build_jobs.py | 2 +- .../kubernetes/kops/kops-presubmits-e2e.yaml | 60 +++++++++---------- .../kops/kops-presubmits-network-plugins.yaml | 22 +++---- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/config/jobs/kubernetes/kops/build_jobs.py b/config/jobs/kubernetes/kops/build_jobs.py index 454f22b6b694..fa1369786664 100644 --- a/config/jobs/kubernetes/kops/build_jobs.py +++ b/config/jobs/kubernetes/kops/build_jobs.py @@ -268,7 +268,7 @@ def presubmit_test(branch='master', env=None, template_path=None, use_boskos=False, - build_cluster="default", + build_cluster="k8s-infra-kops-prow-build", cluster_name=None, use_preset_for_account_creds=None): # pylint: disable=too-many-statements,too-many-branches,too-many-arguments diff --git a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml index 6871b81ca842..f75bdf2c5353 100644 --- a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml +++ b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml @@ -5,7 +5,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "ci", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-ci - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -75,7 +75,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--master-count=3 --node-count=6 --zones=eu-central-1a,eu-central-1b,eu-central-1c --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "ci", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-ci-ha - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -145,7 +145,7 @@ presubmits: # {"cloud": "aws", "distro": "channels", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-aws-calico - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: true @@ -279,7 +279,7 @@ presubmits: # {"cloud": "aws", "distro": "al2023", "extra_flags": "--node-size=r5d.xlarge --master-size=r5d.xlarge --set=cluster.spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true --set=cluster.spec.networking.amazonVPC.env=MINIMUM_IP_TARGET=80 --set=cluster.spec.networking.amazonVPC.env=WARM_IP_TARGET=10 --set=spec.kubeAPIServer.logLevel=4 --set=spec.kubeAPIServer.auditLogMaxSize=2000000000 --set=spec.kubeAPIServer.enableAggregatorRouting=true --set=spec.kubeAPIServer.auditLogPath=/var/log/kube-apiserver-audit.log --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "amazonvpc"} - name: pull-kops-e2e-k8s-aws-amazonvpc - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -746,7 +746,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "extra_flags": "--set=cluster.spec.cloudControllerManager.cloudProvider=aws --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "ci", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-cloud-controller-manager - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -815,7 +815,7 @@ presubmits: # {"cloud": "aws", "distro": "u2004", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-aws-load-balancer-controller - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -872,7 +872,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-addon-resource-tracking - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -929,7 +929,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-metrics-server - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -986,7 +986,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-pod-identity-webhook - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -1043,7 +1043,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "extra_flags": "--set=cluster.spec.externalDNS.provider=external-dns --dns=public --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-aws-external-dns - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -1110,7 +1110,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "extra_flags": "--ipv6 --bastion --set=cluster.spec.externalDNS.provider=external-dns --dns=public --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-aws-ipv6-external-dns - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -1177,7 +1177,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--set=cluster.spec.kubeDNS.nodeLocalDNS.enabled=true --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-node-local-dns - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -1244,7 +1244,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "feature_flags": "APIServerNodes", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-apiserver-nodes - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -1314,7 +1314,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--zones=eu-central-1a --node-size=m6g.large --master-size=m6g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-arm64 - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -1381,7 +1381,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--dns=none --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-aws-dns-none - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -1514,7 +1514,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--api-loadbalancer-type=public --api-loadbalancer-class=network --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-aws-nlb - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -1581,7 +1581,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--dns=public --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-terraform - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -1649,7 +1649,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--ipv6 --bastion --dns=public --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-ipv6-terraform - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -1717,7 +1717,7 @@ presubmits: # {"cloud": "aws", "distro": "channels", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.29", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-aws-calico-1-29 - cluster: default + cluster: k8s-infra-kops-prow-build branches: - release-1.29 always_run: true @@ -1784,7 +1784,7 @@ presubmits: # {"cloud": "aws", "distro": "channels", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.28", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-aws-calico-1-28 - cluster: default + cluster: k8s-infra-kops-prow-build branches: - release-1.28 always_run: true @@ -1851,7 +1851,7 @@ presubmits: # {"cloud": "aws", "distro": "channels", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.27", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-aws-calico-1-27 - cluster: default + cluster: k8s-infra-kops-prow-build branches: - release-1.27 always_run: true @@ -1918,7 +1918,7 @@ presubmits: # {"cloud": "aws", "distro": "channels", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.26", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-k8s-aws-calico-1-26 - cluster: default + cluster: k8s-infra-kops-prow-build branches: - release-1.26 always_run: true @@ -1985,7 +1985,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--instance-manager=karpenter --master-size=c6g.xlarge --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-karpenter - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master run_if_changed: '^upup\/models\/cloudup\/resources\/addons\/karpenter\.sh\/' @@ -2055,7 +2055,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--instance-manager=karpenter --ipv6 --topology=private --bastion --master-size=c6g.xlarge --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-ipv6-karpenter - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -2124,7 +2124,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-upgrade-k124-ko124-to-k125-kolatest - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -2189,7 +2189,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-upgrade-k125-kolatest-to-k126-kolatest - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -2260,7 +2260,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-upgrade-k127-ko127-to-klatest-kolatest-many-addons - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master run_if_changed: '^upup\/(models\/cloudup\/resources\/addons\/|pkg\/fi\/cloudup\/bootstrapchannelbuilder\/)' @@ -2332,7 +2332,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--instance-manager=karpenter --master-size=c6g.xlarge", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-aws-upgrade-k127-ko127-to-k128-kolatest-karpenter - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master run_if_changed: '^upup\/models\/cloudup\/resources\/addons\/karpenter\.sh\/' @@ -2405,7 +2405,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: presubmit-kops-aws-boskos - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -2461,7 +2461,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204", "extra_flags": "--discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: presubmit-kops-aws-boskos-kubetest2 - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false diff --git a/config/jobs/kubernetes/kops/kops-presubmits-network-plugins.yaml b/config/jobs/kubernetes/kops/kops-presubmits-network-plugins.yaml index e8e1e3311023..2b2557e6f611 100644 --- a/config/jobs/kubernetes/kops/kops-presubmits-network-plugins.yaml +++ b/config/jobs/kubernetes/kops/kops-presubmits-network-plugins.yaml @@ -5,7 +5,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--node-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "amazonvpc"} - name: pull-kops-e2e-cni-amazonvpc - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master run_if_changed: '^(upup\/models\/cloudup\/resources\/addons\/networking\.amazon-vpc-routed-eni\/|pkg\/model\/(firewall|components\/containerd|components\/kubeproxy|iam\/iam_builder)\.go|nodeup\/pkg\/model\/kubelet\.go)' @@ -73,7 +73,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--ipv6 --topology=private --bastion --zones=us-west-2a --dns=public --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "amazonvpc"} - name: pull-kops-e2e-cni-amazonvpc-ipv6 - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master always_run: false @@ -140,7 +140,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--node-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-cni-calico - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master 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)' @@ -208,7 +208,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--ipv6 --topology=private --bastion --zones=us-west-2a --dns=public --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "calico"} - name: pull-kops-e2e-cni-calico-ipv6 - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master 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)' @@ -276,7 +276,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--node-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.27", "kops_channel": "alpha", "networking": "canal"} - name: pull-kops-e2e-cni-canal - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master run_if_changed: '^(upup\/models\/cloudup\/resources\/addons\/networking\.projectcalico\.org\.canal\/)' @@ -344,7 +344,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--node-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-cni-cilium - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master 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)' @@ -412,7 +412,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--ipv6 --topology=private --bastion --zones=us-west-2a --dns=public --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium"} - name: pull-kops-e2e-cni-cilium-ipv6 - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master 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)' @@ -480,7 +480,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--node-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium-etcd"} - name: pull-kops-e2e-cni-cilium-etcd - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master 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)' @@ -548,7 +548,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--node-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "stable", "kops_channel": "alpha", "networking": "cilium-eni"} - name: pull-kops-e2e-cni-cilium-eni - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master 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)' @@ -616,7 +616,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--node-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "1.27", "kops_channel": "alpha", "networking": "flannel"} - name: pull-kops-e2e-cni-flannel - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master run_if_changed: '^(upup\/models\/cloudup\/resources\/addons\/networking\.flannel\/|pkg\/model\/components\/containerd\.go)' @@ -684,7 +684,7 @@ presubmits: # {"cloud": "aws", "distro": "u2204arm64", "extra_flags": "--node-size=t4g.large --discovery-store=s3://k8s-kops-prow/discovery", "k8s_version": "ci", "kops_channel": "alpha", "networking": "kube-router"} - name: pull-kops-e2e-cni-kuberouter - cluster: default + cluster: k8s-infra-kops-prow-build branches: - master run_if_changed: '^(upup\/models\/cloudup\/resources\/addons\/networking\.kuberouter\/|pkg\/model\/components\/containerd\.go)'