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

Jump to bottom

Change to use CentOS's Docker rather than upstream #43

Merged
merged 1 commit into from Jan 25, 2017
Merged

Change to use CentOS's Docker rather than upstream #43

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 1 addition & 10 deletions kube-deploy/roles/deploy-kube/tasks/centos.yml
View file
Open in desktop
Expand Up @@ -24,19 +24,10 @@
gpgkey: https://packages.cloud.google.com/yum/doc/yum-key.gpg
https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg

- name: Add docker repository with gpg keys
yum_repository:
name: docker
description: Repository for docker
baseurl: https://yum.dockerproject.org/repo/main/centos/7/
enabled: yes
gpgcheck: yes
gpgkey: https://yum.dockerproject.org/gpg

- name: install kubeadm and required prereqs
yum: name={{ item }} update_cache=yes state=present state=latest
with_items:
- docker-engine
- docker
Copy link
Collaborator

Choose a reason for hiding this comment

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

Have you tried these [similar] changes with Ubuntu as well? I'd like to correct both with a single PR when possible. I will create an issue on our side to track the long term solution (on the Docker side).

Also, one thing to consider @intlabs is to use the same repo for upstream, but pin our docker install to a previous version. In fact, I like this approach better than removing the upstream yum/apt repos entirely and switching over to a vendor repo (since this is a little more in line with Kubernetes documentation).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Kubernetes documentation actually recommends using the vendor repo for CentOS, which is why I did not pin it. I'm afraid I'm unable to test with Ubuntu - but believe that the distro supplied Docker does not have this issue their either.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm going to merge and test. @nadeemanwar where is our CI at?

- kubelet
- kubeadm
- kubectl
Expand Down