Upgrade CNI to 0.6.0 in install #314
Conversation
|
build PR |
install/k8s/k8s1.4/contiv.yaml
Outdated
| @@ -15,7 +15,7 @@ data: | |||
| # The CNI network configuration to install on each node. | |||
| cni_config: |- | |||
| { | |||
| "cniVersion": "0.1.0", | |||
| "cniVersion": "0.6.0", | |||
There was a problem hiding this comment.
Why is a 1.4 manifest being upgraded to cni 0.6.0? I would expect only k8s 1.9 and greater to use 0.6.0.
There was a problem hiding this comment.
Thanks for the comment @danehans. Sure, I'll correct it. Btw, we are planning to deprecate k8s 1.4 in contiv/install. k8s 1.4 has already been deprecated in contiv/netplugin.
There was a problem hiding this comment.
@danehans I've reverted the CNI version for k8s 1.4 in the latest commit. I'll deprecate/remove k8s 1.4 in contiv/install in a separate PR.
|
build PR |
1 similar comment
|
build PR |
cluster/k8s1.6/bootstrap_centos.sh
Outdated
| @@ -18,7 +18,7 @@ EOF | |||
|
|
|||
| setenforce 0 | |||
|
|
|||
| yum install -y docker kubelet-1.6.5 kubeadm-1.6.5 kubectl-1.6.5 kubernetes-cni-1.6.5 ntp | |||
| yum install -y docker kubelet-1.6.5 kubeadm-1.6.5 kubectl-1.6.5 kubernetes-cni ntp | |||
There was a problem hiding this comment.
We don't need to explicitly pick a version any more? Seems like we'd want to limit this.
cluster/k8s1.8/bootstrap_centos.sh
Outdated
| @@ -20,7 +20,7 @@ setenforce 0 | |||
|
|
|||
| swapoff -a | |||
|
|
|||
| yum install -y docker kubelet-1.8.4 kubeadm-1.8.4 kubectl-1.8.4 kubernetes-cni-1.8.4 ntp | |||
| yum install -y docker kubelet-1.8.4 kubeadm-1.8.4 kubectl-1.8.4 kubernetes-cni ntp | |||
cluster/k8s1.4/bootstrap_centos.sh
Outdated
| @@ -23,7 +23,7 @@ yum install -y docker ebtables \ | |||
| https://fedorapeople.org/groups/kolla/kubeadm-1.6.0-0.alpha.0.2074.a092d8e0f95f52.x86_64.rpm \ | |||
| https://fedorapeople.org/groups/kolla/kubectl-1.5.4-0.x86_64.rpm \ | |||
| https://fedorapeople.org/groups/kolla/kubelet-1.5.4-0.x86_64.rpm \ | |||
| https://fedorapeople.org/groups/kolla/kubernetes-cni-0.3.0.1-0.07a8a2.x86_64.rpm | |||
| kubernetes-cni | |||
There was a problem hiding this comment.
k8s 1.4 will go away soonish, don't need to use updated CNI here
|
This needs a rebase now that @amccormi's changes have been merged |
Signed-off-by: Vikram Hosakote <vhosakot@cisco.com>
Signed-off-by: Vikram Hosakote <vhosakot@cisco.com>
Signed-off-by: Vikram Hosakote <vhosakot@cisco.com>
|
build PR |
|
build PR |
|
Green gate ready for merge. |
This PR upgrades CNI to
0.6.0ininstall/k8s/configs/contiv.yaml.Signed-off-by: Vikram Hosakote vhosakot@cisco.com