Skip to content
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

Set the right kubelet version for the kubeadm PR job #4705

Merged
merged 1 commit into from
Sep 22, 2017
Merged

Set the right kubelet version for the kubeadm PR job #4705

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
1 change: 0 additions & 1 deletion jobs/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 7 additions & 0 deletions scenarios/kubernetes_e2e.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,13 @@ def main(args):
'--kubernetes-anywhere-kubeadm-version=%s' % version,
])

if args.kubeadm == "pull":
Copy link
Member

Choose a reason for hiding this comment

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

I anticipate you will get a push not to do this in scenarios but rather to do this in kubetest (ie. https://github.com/kubernetes/test-infra/blob/master/kubetest/anywhere.go).

Idea: maybe we should support something like "kubeadm" in addition to "stable" and gs:// link for kubernetesAnywhereKubeletVersion where "kubeadm" means to match the version of kubeadm in anywhere.go.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, I also want to get this out of scenarios eventually.
But for now, I want to get it working first.

# 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:
Expand Down