openstack/openstack-helm
Code Issues Proposed changes

KubeADM-AIO: update NFS image and move to Canal

Browse Source 
This PS updates the NFS Image, and moves the CNI to use Canal as
the backend for container networking.

Change-Id: Iade12181be9a427bad7bc5eb2658eefacbff0279
This commit is contained in:
Pete Birley 2017-04-26 15:22:33 -05:00
parent 932f8a9928
commit 8f41cde73a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/kubeadm-aio/assets/opt/nfs-provisioner/deployment.yaml
View File

@ -33,7 +33,7 @@ spec:
spec: spec:
containers: containers:
- name: nfs-provisioner - name: nfs-provisioner
image: quay.io/kubernetes_incubator/nfs-provisioner:v1.0.3 image: quay.io/kubernetes_incubator/nfs-provisioner:v1.0.7
ports: ports:
- name: nfs - name: nfs
containerPort: 2049 containerPort: 2049
@ -48,6 +48,7 @@ spec:
capabilities: capabilities:
add: add:
- DAC_READ_SEARCH - DAC_READ_SEARCH
- SYS_RESOURCE
args: args:
- "-provisioner=example.com/nfs" - "-provisioner=example.com/nfs"
- "-grace-period=10" - "-grace-period=10"

4
tools/kubeadm-aio/assets/usr/bin/kubeadm-aio
View File

@ -41,8 +41,8 @@ export KUBECONFIG=/root/admin.conf
echo 'Marking master node as schedulable' echo 'Marking master node as schedulable'
kubectl taint nodes --all node-role.kubernetes.io/master- kubectl taint nodes --all node-role.kubernetes.io/master-
echo 'Installing Calico CNI' echo 'Installing Canal CNI'
kubectl create -f http://docs.projectcalico.org/v2.1/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml 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' echo 'Setting Up Cluser for OpenStack-Helm dev use'
/usr/bin/openstack-helm-dev-prep /usr/bin/openstack-helm-dev-prep