From 468379a10fb9cca833fcc5ce3a1291883c533f80 Mon Sep 17 00:00:00 2001 From: Lingxian Kong Date: Fri, 17 May 2019 09:33:45 +1200 Subject: [PATCH] Use k8s 1.13 in devstack Change-Id: I718a7f009f1b21bdc0092f97767db275ca7b1614 (cherry picked from commit de1d83bf59bcbb58d3c96759950619528739b19b) --- .../playbook/roles/k8s_cli/defaults/main.yaml | 2 +- .../playbook/roles/kube_master/defaults/main.yaml | 2 +- .../playbook/roles/kube_master/tasks/main.yml | 13 +++++-------- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tools/gate/kubeadm/playbook/roles/k8s_cli/defaults/main.yaml b/tools/gate/kubeadm/playbook/roles/k8s_cli/defaults/main.yaml index f082e220..c295bcfc 100644 --- a/tools/gate/kubeadm/playbook/roles/k8s_cli/defaults/main.yaml +++ b/tools/gate/kubeadm/playbook/roles/k8s_cli/defaults/main.yaml @@ -1,3 +1,3 @@ --- -k8s_version: "1.11.0" +k8s_version: "1.13.6" kube_prompt_version: "v1.0.5" \ No newline at end of file diff --git a/tools/gate/kubeadm/playbook/roles/kube_master/defaults/main.yaml b/tools/gate/kubeadm/playbook/roles/kube_master/defaults/main.yaml index c468dbd4..77dc2929 100644 --- a/tools/gate/kubeadm/playbook/roles/kube_master/defaults/main.yaml +++ b/tools/gate/kubeadm/playbook/roles/kube_master/defaults/main.yaml @@ -1,2 +1,2 @@ --- -k8s_version: "1.11.0" \ No newline at end of file +k8s_version: "1.13.6" \ No newline at end of file diff --git a/tools/gate/kubeadm/playbook/roles/kube_master/tasks/main.yml b/tools/gate/kubeadm/playbook/roles/kube_master/tasks/main.yml index fb597fbd..d95c8540 100644 --- a/tools/gate/kubeadm/playbook/roles/kube_master/tasks/main.yml +++ b/tools/gate/kubeadm/playbook/roles/kube_master/tasks/main.yml @@ -36,11 +36,8 @@ - name: Allow pod on master shell: kubectl taint nodes --all node-role.kubernetes.io/master- -- name: Download calico yaml - get_url: - url: https://docs.projectcalico.org/v2.6/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml - dest: "{{ ansible_env.HOME }}/calico.yaml" - force: no - -- name: Install network plugin - shell: kubectl apply -f {{ ansible_env.HOME }}/calico.yaml \ No newline at end of file +- name: Install Calico + shell: kubectl apply -f {{ item }} + loop: + - https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml + - https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.7/calico.yaml