From 8f41cde73accf5a27d104a37f011488ea2081867 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Wed, 26 Apr 2017 15:22:33 -0500 Subject: [PATCH] KubeADM-AIO: update NFS image and move to Canal This PS updates the NFS Image, and moves the CNI to use Canal as the backend for container networking. Change-Id: Iade12181be9a427bad7bc5eb2658eefacbff0279 --- tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml | 3 ++- tools/kubeadm-aio/assets/usr/bin/kubeadm-aio | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml b/tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml index e13f7a441b..81d64cb8ab 100644 --- a/tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml +++ b/tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml @@ -33,7 +33,7 @@ spec: spec: containers: - name: nfs-provisioner - image: quay.io/kubernetes_incubator/nfs-provisioner:v1.0.3 + image: quay.io/kubernetes_incubator/nfs-provisioner:v1.0.7 ports: - name: nfs containerPort: 2049 @@ -48,6 +48,7 @@ spec: capabilities: add: - DAC_READ_SEARCH + - SYS_RESOURCE args: - "-provisioner=example.com/nfs" - "-grace-period=10" diff --git a/tools/kubeadm-aio/assets/usr/bin/kubeadm-aio b/tools/kubeadm-aio/assets/usr/bin/kubeadm-aio index b7497bd840..fc136d4ffc 100755 --- a/tools/kubeadm-aio/assets/usr/bin/kubeadm-aio +++ b/tools/kubeadm-aio/assets/usr/bin/kubeadm-aio @@ -41,8 +41,8 @@ export KUBECONFIG=/root/admin.conf echo 'Marking master node as schedulable' kubectl taint nodes --all node-role.kubernetes.io/master- -echo 'Installing Calico CNI' -kubectl create -f http://docs.projectcalico.org/v2.1/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml +echo 'Installing Canal CNI' +kubectl create -f https://raw.githubusercontent.com/projectcalico/canal/master/k8s-install/kubeadm/1.6/canal.yaml echo 'Setting Up Cluser for OpenStack-Helm dev use' /usr/bin/openstack-helm-dev-prep