Merge "KubeADM-AIO: update NFS image and move to Canal"

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"

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