From f16df7bd9a5175274a1c8791372c798e62d1bec8 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Wed, 21 Nov 2018 08:23:08 -0800 Subject: Centralizes version of components The galaxy roles used by KRD requires to centralize their version used in the playbook/krd-vars.yml file, this file facilitates the version control and helps as single point of truth. Change-Id: If4544f529ff00689dc6cd6bca7e8adc0c876aa18 Signed-off-by: Victor Morales Issue-ID: MULTICLOUD-301 --- vagrant/galaxy-requirements.yml | 4 ++-- vagrant/installer.sh | 2 +- vagrant/playbooks/configure-istio.yml | 5 +++-- vagrant/playbooks/configure-multus.yml | 11 +++++++++-- vagrant/playbooks/configure-nfd.yml | 3 ++- vagrant/playbooks/configure-ovn-kubernetes.yml | 5 +++++ vagrant/playbooks/configure-virtlet.yml | 6 ++++-- vagrant/playbooks/krd-vars.yml | 6 ++++-- 8 files changed, 30 insertions(+), 12 deletions(-) (limited to 'vagrant') diff --git a/vagrant/galaxy-requirements.yml b/vagrant/galaxy-requirements.yml index 4b252964..55e105a6 100644 --- a/vagrant/galaxy-requirements.yml +++ b/vagrant/galaxy-requirements.yml @@ -10,8 +10,8 @@ - src: andrewrothstein.go version: v2.1.10 - src: andrewrothstein.kubectl - version: v1.1.12 + version: v1.1.16 - src: andrewrothstein.kubernetes-helm version: v1.2.9 - src: geerlingguy.docker - version: 2.5.1 + version: 2.5.2 diff --git a/vagrant/installer.sh b/vagrant/installer.sh index 860f63d6..f1109073 100755 --- a/vagrant/installer.sh +++ b/vagrant/installer.sh @@ -13,7 +13,7 @@ set -o pipefail # _install_go() - Install GoLang package function _install_go { - version=$(grep "go_version" ${krd_playbooks}/krd-vars.yml | awk -F ': ' '{print $2}') + version=$(grep "go_version" ${krd_playbooks}/krd-vars.yml | awk -F "'" '{print $2}') local tarball=go$version.linux-amd64.tar.gz if $(go version &>/dev/null); then diff --git a/vagrant/playbooks/configure-istio.yml b/vagrant/playbooks/configure-istio.yml index 25a343f0..e6a138e7 100644 --- a/vagrant/playbooks/configure-istio.yml +++ b/vagrant/playbooks/configure-istio.yml @@ -15,9 +15,10 @@ include_vars: file: krd-vars.yml roles: - - andrewrothstein.kubectl + - role: andrewrothstein.kubectl + kubectl_ver: "v{{ kubectl_version }}" - role: andrewrothstein.kubernetes-helm - kubernetes_helm_ver: v2.9.1 + kubernetes_helm_ver: "v{{ helm_client_version }}" tasks: - name: create istio folder file: diff --git a/vagrant/playbooks/configure-multus.yml b/vagrant/playbooks/configure-multus.yml index 33e72757..23fe546a 100644 --- a/vagrant/playbooks/configure-multus.yml +++ b/vagrant/playbooks/configure-multus.yml @@ -14,7 +14,9 @@ include_vars: file: krd-vars.yml roles: - - { role: andrewrothstein.go, when: multus_source_type == "source" } + - role: andrewrothstein.go + go_ver: "{{ go_version }}" + when: multus_source_type == "source" environment: PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin/" tasks: @@ -78,8 +80,13 @@ } - hosts: localhost + pre_tasks: + - name: Load krd variables + include_vars: + file: krd-vars.yml roles: - - andrewrothstein.kubectl + - role: andrewrothstein.kubectl + kubectl_ver: "v{{ kubectl_version }}" tasks: - name: define a CRD network object specification blockinfile: diff --git a/vagrant/playbooks/configure-nfd.yml b/vagrant/playbooks/configure-nfd.yml index 90bad671..26ad5497 100644 --- a/vagrant/playbooks/configure-nfd.yml +++ b/vagrant/playbooks/configure-nfd.yml @@ -48,7 +48,8 @@ - hosts: localhost become: yes roles: - - andrewrothstein.kubectl + - role: andrewrothstein.kubectl + kubectl_ver: "v{{ kubectl_version }} tasks: - name: create service accounts command: "/usr/local/bin/kubectl apply -f /tmp/{{ item }}" diff --git a/vagrant/playbooks/configure-ovn-kubernetes.yml b/vagrant/playbooks/configure-ovn-kubernetes.yml index cea102f2..e3042ff4 100644 --- a/vagrant/playbooks/configure-ovn-kubernetes.yml +++ b/vagrant/playbooks/configure-ovn-kubernetes.yml @@ -14,8 +14,13 @@ central_node_ip: "{{ hostvars[groups['ovn-central'][0]]['ansible_ssh_host'] }}" environment: PATH: "{{ ansible_env.PATH }}:/usr/local/go/bin/" + pre_tasks: + - name: Load krd variables + include_vars: + file: krd-vars.yml roles: - role: andrewrothstein.go + go_ver: "{{ go_version }}" tasks: - name: Load krd variables include_vars: diff --git a/vagrant/playbooks/configure-virtlet.yml b/vagrant/playbooks/configure-virtlet.yml index 98aa74cc..b1dee09f 100644 --- a/vagrant/playbooks/configure-virtlet.yml +++ b/vagrant/playbooks/configure-virtlet.yml @@ -16,8 +16,10 @@ include_vars: file: krd-vars.yml roles: - - andrewrothstein.kubectl - - { role: geerlingguy.docker, when: virtlet_source_type == "source" } + - role: andrewrothstein.kubectl + kubectl_ver: "v{{ kubectl_version }}" + - role: geerlingguy.docker + when: virtlet_source_type == "source" tasks: - name: create Virtlet binary folder file: diff --git a/vagrant/playbooks/krd-vars.yml b/vagrant/playbooks/krd-vars.yml index 9c2de308..48ae5284 100644 --- a/vagrant/playbooks/krd-vars.yml +++ b/vagrant/playbooks/krd-vars.yml @@ -35,7 +35,7 @@ criproxy_url: "https://github.com/Mirantis/criproxy/releases/download/v{{ cripro #criproxy_url: "https://github.com/Mirantis/criproxy" virtlet_dest: "{{ base_dest }}/virtlet" virtlet_source_type: "binary" -virtlet_version: 1.4.1 +virtlet_version: 1.4.2 virtlet_url: "https://github.com/Mirantis/virtlet/releases/download/v{{ virtlet_version }}/virtletctl" #virtlet_source_type: "source" #virtlet_version: 68e11b8f1db2c78b063126899f0e60910700975d @@ -51,5 +51,7 @@ istio_source_type: "tarball" istio_version: 1.0.3 istio_url: "https://github.com/istio/istio/releases/download/{{ istio_version }}/istio-{{ istio_version }}-linux.tar.gz" -go_version: 1.11.1 +go_version: '1.11' kubespray_version: 2.7.0 +kubectl_version: 1.11.2 +helm_client_version: 2.9.1 -- cgit 1.2.3-korg