diff --git a/jobs/config.json b/jobs/config.json index 1388ca063e12..f45d72b2ae4e 100644 --- a/jobs/config.json +++ b/jobs/config.json @@ -10532,7 +10532,6 @@ "--gcp-zone=us-central1-f", "--ginkgo-parallel=30", "--kubeadm=pull", - "--kubernetes-anywhere-kubelet-ci-version=latest", "--kubernetes-anywhere-kubernetes-version=ci/latest", "--provider=kubernetes-anywhere", "--test_args=--ginkgo.focus=\\[Conformance\\] --ginkgo.skip=\\[Slow\\]|\\[Serial\\]|\\[Disruptive\\]|\\[Flaky\\] --minStartupPods=8", diff --git a/scenarios/kubernetes_e2e.py b/scenarios/kubernetes_e2e.py index 9bc648f8b5df..fca557bfbda6 100755 --- a/scenarios/kubernetes_e2e.py +++ b/scenarios/kubernetes_e2e.py @@ -578,6 +578,13 @@ def main(args): '--kubernetes-anywhere-kubeadm-version=%s' % version, ]) + if args.kubeadm == "pull": + # If this is a pull job; the kubelet version should equal + # the kubeadm version here: we should use debs from the PR build + runner_args.extend([ + '--kubernetes-anywhere-kubelet-version=%s' % version, + ]) + if args.aws: set_up_aws(args, mode, cluster, runner_args) elif args.gce_ssh: