epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-09 03:37:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update kube-ovn to 1.2.0 - also update minor version for multus and weave (#6223)

Browse Source
This commit is contained in:
Florian Ruynat
2020-06-09 21:09:01 +02:00
committed by GitHub
parent 144743e818
commit ecc3a0aec5
4 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
roles/download/defaults/main.yml
View File

@@ -63,9 +63,6 @@ docker_image_repo: "docker.io"
# quay image repo define
quay_image_repo: "quay.io"
# alauda.cn image repo (for kube-ovn...)
alauda_image_repo: "index.alauda.cn"
# TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
# after migration to container download
calico_version: "v3.14.1"
@@ -79,13 +76,13 @@ flannel_version: "v0.12.0"
cni_version: "v0.8.6"
weave_version: 2.6.3
weave_version: 2.6.4
pod_infra_version: "3.2"
contiv_version: 1.2.1
cilium_version: "v1.7.4"
kube_ovn_version: "v1.1.1"
kube_ovn_version: "v1.2.0"
kube_router_version: "v0.4.0"
multus_version: "v3.4.1"
multus_version: "v3.4.2"
# Get kubernetes major version (i.e. 1.17.4 => 1.17)
kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}"
@@ -408,7 +405,7 @@ cilium_init_image_repo: "{{ docker_image_repo }}/cilium/cilium-init"
cilium_init_image_tag: "2019-04-05"
cilium_operator_image_repo: "{{ docker_image_repo }}/cilium/operator"
cilium_operator_image_tag: "{{ cilium_version }}"
kube_ovn_container_image_repo: "{{ alauda_image_repo }}/alaudak8s/kube-ovn"
kube_ovn_container_image_repo: "{{ docker_image_repo }}/kubeovn/kube-ovn"
kube_ovn_container_image_tag: "{{ kube_ovn_version }}"
kube_router_image_repo: "{{ docker_image_repo }}/cloudnativelabs/kube-router"
kube_router_image_tag: "{{ kube_router_version }}"