Browse Source

Use k8s 1.13 in devstack

Change-Id: I718a7f009f1b21bdc0092f97767db275ca7b1614
changes/72/659672/2
Lingxian Kong 2 years ago
parent
commit
de1d83bf59
3 changed files with 7 additions and 10 deletions
  1. +1
    -1
      tools/gate/kubeadm/playbook/roles/k8s_cli/defaults/main.yaml
  2. +1
    -1
      tools/gate/kubeadm/playbook/roles/kube_master/defaults/main.yaml
  3. +5
    -8
      tools/gate/kubeadm/playbook/roles/kube_master/tasks/main.yml

+ 1
- 1
tools/gate/kubeadm/playbook/roles/k8s_cli/defaults/main.yaml View File

@ -1,3 +1,3 @@
---
k8s_version: "1.11.0"
k8s_version: "1.13.6"
kube_prompt_version: "v1.0.5"

+ 1
- 1
tools/gate/kubeadm/playbook/roles/kube_master/defaults/main.yaml View File

@ -1,2 +1,2 @@
---
k8s_version: "1.11.0"
k8s_version: "1.13.6"

+ 5
- 8
tools/gate/kubeadm/playbook/roles/kube_master/tasks/main.yml View File

@ -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
- 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

Loading…
Cancel
Save