From 422428908a09003ab650357530677859eb11af5c Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Wed, 14 Sep 2016 14:30:57 +0200
Subject: [PATCH] Download containers and save all
Move version/repo vars to download role.
Add container to download params, which overrides url/source_url,
if enabled.
Fix networking plugins download depending on kube_network_plugin.
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
roles/download/defaults/main.yml | 53 ++++++++++++++++++-
roles/download/tasks/main.yml | 34 ++++++++++--
roles/etcd/defaults/main.yml | 8 ---
roles/etcd/meta/main.yml | 5 +-
roles/kubernetes/master/defaults/main.yml | 3 --
roles/kubernetes/master/meta/main.yml | 4 +-
roles/kubernetes/node/defaults/main.yml | 3 --
roles/kubernetes/node/meta/main.yml | 4 +-
roles/network_plugin/calico/defaults/main.yml | 6 ---
roles/network_plugin/calico/meta/main.yml | 6 +++
.../network_plugin/flannel/defaults/main.yml | 7 ---
roles/network_plugin/flannel/meta/main.yml | 6 +++
12 files changed, 98 insertions(+), 41 deletions(-)
create mode 100644 roles/network_plugin/flannel/meta/main.yml
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 610fb5b7a..51f0b02fd 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -13,6 +13,8 @@ etcd_version: v3.0.6
calico_version: v0.20.0
calico_cni_version: v1.3.1
weave_version: v1.6.1
+flannel_version: 0.5.5
+flannel_server_helper_version: 0.1
# Download URL's
etcd_download_url: "https://storage.googleapis.com/kargo/{{etcd_version}}_etcd"
@@ -26,6 +28,22 @@ calico_cni_ipam_checksum: "3df6951a30749c279229e7e318e74ac4e41263996125be65257db
weave_checksum: "9bf9d6e5a839e7bcbb28cc00c7acae9d09284faa3e7a3720ca9c2b9e93c68580"
etcd_checksum: "385afd518f93e3005510b7aaa04d38ee4a39f06f5152cd33bb86d4f0c94c7485"
+# Containers
+# Possible values: host, docker
+etcd_deployment_type: "docker"
+etcd_image_repo: "quay.io/coreos/etcd"
+etcd_image_tag: "{{ etcd_version }}"
+flannel_server_helper_image_repo: "gcr.io/google_containers/flannel-server-helper"
+flannel_server_helper_image_tag: "{{ flannel_server_helper_version }}"
+flannel_image_repo: "quay.io/coreos/flannel"
+flannel_image_tag: "{{ flannel_version }}"
+calicoctl_image_repo: "calico/ctl"
+calicoctl_image_tag: "{{ calico_version }}"
+calico_node_image_repo: "calico/node"
+calico_node_image_tag: "{{ calico_version }}"
+hyperkube_image_repo: "quay.io/coreos/hyperkube"
+hyperkube_image_tag: "{{ kube_version }}_coreos.0"
+
downloads:
calico_cni_plugin:
dest: calico/bin/calico
@@ -35,6 +53,7 @@ downloads:
url: "{{ calico_cni_download_url }}"
owner: "root"
mode: "0755"
+ enabled: "{{ kube_network_plugin == 'calico' }}"
calico_cni_plugin_ipam:
dest: calico/bin/calico-ipam
version: "{{calico_cni_version}}"
@@ -43,6 +62,7 @@ downloads:
url: "{{ calico_cni_ipam_download_url }}"
owner: "root"
mode: "0755"
+ enabled: "{{ kube_network_plugin == 'calico' }}"
weave:
dest: weave/bin/weave
version: "{{weave_version}}"
@@ -51,6 +71,7 @@ downloads:
sha256: "{{ weave_checksum }}"
owner: "root"
mode: "0755"
+ enabled: "{{ kube_network_plugin == 'weave' }}"
etcd:
version: "{{etcd_version}}"
dest: "etcd/etcd-{{ etcd_version }}-linux-amd64.tar.gz"
@@ -60,10 +81,38 @@ downloads:
unarchive: true
owner: "etcd"
mode: "0755"
- nothing:
- enabled: false
+ container: "{{ etcd_deployment_type == 'docker' }}"
+ repo: "{{ etcd_image_repo }}"
+ tag: "{{ etcd_image_tag }}"
+ hyperkube:
+ container: true
+ repo: "{{ hyperkube_image_repo }}"
+ tag: "{{ hyperkube_image_tag }}"
+ flannel:
+ container: true
+ repo: "{{ flannel_image_repo }}"
+ tag: "{{ flannel_image_tag }}"
+ enabled: "{{ kube_network_plugin == 'flannel' }}"
+ flannel_server_helper:
+ container: true
+ repo: "{{ flannel_server_helper_image_repo }}"
+ tag: "{{ flannel_server_helper_image_tag }}"
+ enabled: "{{ kube_network_plugin == 'flannel' }}"
+ calicoctl:
+ container: true
+ repo: "{{ calicoctl_image_repo }}"
+ tag: "{{ calicoctl_image_tag }}"
+ enabled: "{{ kube_network_plugin == 'calico' }}"
+ calico_node:
+ container: true
+ repo: "{{ calico_node_image_repo }}"
+ tag: "{{ calico_node_image_tag }}"
+ enabled: "{{ kube_network_plugin == 'calico' }}"
download:
+ container: "{{ file.container|default('false') }}"
+ repo: "{{ file.repo|default(None) }}"
+ tag: "{{ file.tag|default(None) }}"
enabled: "{{ file.enabled|default('true') }}"
dest: "{{ file.dest|default(None) }}"
version: "{{ file.version|default(None) }}"
diff --git a/roles/download/tasks/main.yml b/roles/download/tasks/main.yml
index 40c52f5ea..8d9c351a3 100644
--- a/roles/download/tasks/main.yml
+++ b/roles/download/tasks/main.yml
@@ -4,11 +4,11 @@
- name: downloading...
debug:
msg: "{{ download.url }}"
- when: "{{ download.enabled|bool }}"
+ when: "{{ download.enabled|bool and not download.container|bool }}"
- name: Create dest directories
file: path={{local_release_dir}}/{{download.dest|dirname}} state=directory recurse=yes
- when: "{{ download.enabled|bool }}"
+ when: "{{ download.enabled|bool and not download.container|bool }}"
run_once: "{{ download_run_once|bool }}"
- name: Download items
@@ -18,7 +18,11 @@
sha256sum: "{{download.sha256 | default(omit)}}"
owner: "{{ download.owner|default(omit) }}"
mode: "{{ download.mode|default(omit) }}"
- when: "{{ download.enabled|bool }}"
+ register: get_url_result
+ until: "'OK' in get_url_result.msg or 'file already exists' in get_url_result.msg"
+ retries: 4
+ delay: "{{ 20 | random + 3 }}"
+ when: "{{ download.enabled|bool and not download.container|bool }}"
run_once: "{{ download_run_once|bool }}"
- name: Extract archives
@@ -28,7 +32,7 @@
owner: "{{ download.owner|default(omit) }}"
mode: "{{ download.mode|default(omit) }}"
copy: no
- when: "{{ download.enabled|bool }} and ({{download.unarchive is defined and download.unarchive == True}})"
+ when: "{{ download.enabled|bool and not download.container|bool and download.unarchive is defined and download.unarchive == True }}"
run_once: "{{ download_run_once|bool }}"
- name: Fix permissions
@@ -37,5 +41,25 @@
path: "{{local_release_dir}}/{{download.dest}}"
owner: "{{ download.owner|default(omit) }}"
mode: "{{ download.mode|default(omit) }}"
- when: "{{ download.enabled|bool }} and ({{download.unarchive is not defined or download.unarchive == False}})"
+ when: "{{ download.enabled|bool and not download.container|bool and (download.unarchive is not defined or download.unarchive == False) }}"
+ run_once: "{{ download_run_once|bool }}"
+
+- name: pulling...
+ debug:
+ msg: "{{ download.repo }}:{{ download.tag }}"
+ when: "{{ download.enabled|bool and download.container|bool }}"
+
+- name: Create dest directory for container images to be saved
+ file: path="{{local_release_dir}}/containers" state=directory recurse=yes
+ when: "{{ download.enabled|bool and download.container|bool }}"
+ run_once: "{{ download_run_once|bool }}"
+
+#NOTE(bogdando) this brings no docker-py deps for nodes
+- name: Download containers
+ command: "/usr/bin/docker pull {{ download.repo }}:{{ download.tag }}"
+ register: pull_task_result
+ until: pull_task_result.rc == 0
+ retries: 4
+ delay: "{{ 20 | random + 3 }}"
+ when: "{{ download.enabled|bool and download.container|bool }}"
run_once: "{{ download_run_once|bool }}"
diff --git a/roles/etcd/defaults/main.yml b/roles/etcd/defaults/main.yml
index 585f75a40..02234a2fe 100644
--- a/roles/etcd/defaults/main.yml
+++ b/roles/etcd/defaults/main.yml
@@ -1,10 +1,2 @@
---
-etcd_version: v3.0.6
etcd_bin_dir: "{{ local_release_dir }}/etcd/etcd-{{ etcd_version }}-linux-amd64/"
-
-# Possible values: host, docker
-etcd_deployment_type: "docker"
-
-
-etcd_image_repo: "quay.io/coreos/etcd"
-etcd_image_tag: "{{ etcd_version }}"
diff --git a/roles/etcd/meta/main.yml b/roles/etcd/meta/main.yml
index 8e4cb5846..b55966a99 100644
--- a/roles/etcd/meta/main.yml
+++ b/roles/etcd/meta/main.yml
@@ -3,8 +3,7 @@ dependencies:
- role: adduser
user: "{{ addusers.etcd }}"
when: ansible_os_family != 'CoreOS'
- - role: download
- file: "{{ downloads.etcd }}"
- when: etcd_deployment_type == "host"
- role: docker
when: (ansible_os_family != "CoreOS" and etcd_deployment_type == "docker" or inventory_hostname in groups['k8s-cluster'])
+ - role: download
+ file: "{{ downloads.etcd }}"
diff --git a/roles/kubernetes/master/defaults/main.yml b/roles/kubernetes/master/defaults/main.yml
index ac23c0ada..d0be14d64 100644
--- a/roles/kubernetes/master/defaults/main.yml
+++ b/roles/kubernetes/master/defaults/main.yml
@@ -10,6 +10,3 @@ kube_users_dir: "{{ kube_config_dir }}/users"
# An experimental dev/test only dynamic volumes provisioner,
# for PetSets. Works for kube>=v1.3 only.
kube_hostpath_dynamic_provisioner: "false"
-
-hyperkube_image_repo: "quay.io/coreos/hyperkube"
-hyperkube_image_tag: "{{ kube_version }}_coreos.0"
diff --git a/roles/kubernetes/master/meta/main.yml b/roles/kubernetes/master/meta/main.yml
index 021c01de4..f4da42e39 100644
--- a/roles/kubernetes/master/meta/main.yml
+++ b/roles/kubernetes/master/meta/main.yml
@@ -1,4 +1,4 @@
---
dependencies:
- - role: download # For kube_version variable
- file: "{{ downloads.nothing }}"
+ - role: download
+ file: "{{ downloads.hyperkube }}"
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index 96b941a5e..7dc7d1183 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -8,9 +8,6 @@ kube_resolv_conf: "/etc/resolv.conf"
kube_proxy_mode: iptables
-hyperkube_image_repo: "quay.io/coreos/hyperkube"
-hyperkube_image_tag: "{{ kube_version }}_coreos.0"
-
# IP address of the DNS server.
# Kubernetes will create a pod with several containers, serving as the DNS
# server and expose it under this IP address. The IP address must be from
diff --git a/roles/kubernetes/node/meta/main.yml b/roles/kubernetes/node/meta/main.yml
index c65c68393..b9cbbd9ff 100644
--- a/roles/kubernetes/node/meta/main.yml
+++ b/roles/kubernetes/node/meta/main.yml
@@ -1,5 +1,5 @@
---
dependencies:
- - role: download #For kube_version
- file: "{{ downloads.nothing }}"
+ - role: download
+ file: "{{ downloads.hyperkube }}"
- role: kubernetes/secrets
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index 3cdf5b492..b5b275e04 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -7,9 +7,3 @@ ipip: false
# cloud_provider can only be set to 'gce' or 'aws'
# cloud_provider:
-
-calicoctl_image_repo: calico/ctl
-calicoctl_image_tag: "{{ calico_version }}"
-
-calico_node_image_repo: calico/node
-calico_node_image_tag: "{{ calico_version }}"
diff --git a/roles/network_plugin/calico/meta/main.yml b/roles/network_plugin/calico/meta/main.yml
index 92ab5391b..c13e976d3 100644
--- a/roles/network_plugin/calico/meta/main.yml
+++ b/roles/network_plugin/calico/meta/main.yml
@@ -4,3 +4,9 @@ dependencies:
file: "{{ downloads.calico_cni_plugin }}"
- role: download
file: "{{ downloads.calico_cni_plugin_ipam }}"
+ - role: download
+ file: "{{ downloads.calico_node }}"
+ - role: download
+ file: "{{ downloads.calicoctl }}"
+ - role: download
+ file: "{{ downloads.hyperkube }}"
diff --git a/roles/network_plugin/flannel/defaults/main.yml b/roles/network_plugin/flannel/defaults/main.yml
index 8ff48cdb0..ce00090ec 100644
--- a/roles/network_plugin/flannel/defaults/main.yml
+++ b/roles/network_plugin/flannel/defaults/main.yml
@@ -10,10 +10,3 @@ flannel_public_ip: "{{ access_ip|default(ip|default(ansible_default_ipv4.address
# You can choose what type of flannel backend to use
# please refer to flannel's docs : https://github.com/coreos/flannel/blob/master/README.md
flannel_backend_type: "vxlan"
-
-
-flannel_server_helper_image_repo: "gcr.io/google_containers/flannel-server-helper"
-flannel_server_helper_image_tag: "0.1"
-
-flannel_image_repo: "quay.io/coreos/flannel"
-flannel_image_tag: "0.5.5"
diff --git a/roles/network_plugin/flannel/meta/main.yml b/roles/network_plugin/flannel/meta/main.yml
new file mode 100644
index 000000000..935d9c3bb
--- /dev/null
+++ b/roles/network_plugin/flannel/meta/main.yml
@@ -0,0 +1,6 @@
+---
+dependencies:
+ - role: download
+ file: "{{ downloads.flannel_server_helper }}"
+ - role: download
+ file: "{{ downloads.flannel }}"
--
GitLab