diff options
author | Guo Ruijing <ruijing.guo@intel.com> | 2017-11-22 13:06:39 -0500 |
---|---|---|
committer | Guo Ruijing <ruijing.guo@intel.com> | 2017-11-22 18:03:19 -0500 |
commit | ec94abf0ea9154af2f0dbce13e12df775b72bbac (patch) | |
tree | b79ee46962ba50fe2cbad8efb5ef8f2cf709c3b1 /src/vagrant/kubeadm_multus/multus | |
parent | 57c01199d342c5051fef2bb94f463f21749089bb (diff) |
build multus in ubuntu:16.04 docker during deployment
Change-Id: I557be21c59e28401c5ec20cd43d2baabc13bef3e
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'src/vagrant/kubeadm_multus/multus')
-rw-r--r-- | src/vagrant/kubeadm_multus/multus/Dockerfile.build | 5 | ||||
-rw-r--r-- | src/vagrant/kubeadm_multus/multus/Dockerfile.multus | 4 | ||||
-rw-r--r-- | src/vagrant/kubeadm_multus/multus/build.sh | 7 | ||||
-rw-r--r-- | src/vagrant/kubeadm_multus/multus/install_cni.sh | 6 | ||||
-rw-r--r-- | src/vagrant/kubeadm_multus/multus/kube_cni_multus.yml | 88 | ||||
-rw-r--r-- | src/vagrant/kubeadm_multus/multus/setup.sh | 9 |
6 files changed, 0 insertions, 119 deletions
diff --git a/src/vagrant/kubeadm_multus/multus/Dockerfile.build b/src/vagrant/kubeadm_multus/multus/Dockerfile.build deleted file mode 100644 index 0b17fab..0000000 --- a/src/vagrant/kubeadm_multus/multus/Dockerfile.build +++ /dev/null @@ -1,5 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update && apt-get install -y sudo git wget -ADD ./build.sh . -RUN bash ./build.sh diff --git a/src/vagrant/kubeadm_multus/multus/Dockerfile.multus b/src/vagrant/kubeadm_multus/multus/Dockerfile.multus deleted file mode 100644 index e1d8cb0..0000000 --- a/src/vagrant/kubeadm_multus/multus/Dockerfile.multus +++ /dev/null @@ -1,4 +0,0 @@ -FROM ubuntu:16.04 - -ADD multus /cni/multus -ADD install_cni.sh /cni/install_cni.sh diff --git a/src/vagrant/kubeadm_multus/multus/build.sh b/src/vagrant/kubeadm_multus/multus/build.sh deleted file mode 100644 index 526b0b7..0000000 --- a/src/vagrant/kubeadm_multus/multus/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -wget -qO- https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | sudo tar -C /usr/local -xz -echo 'export GOPATH=/go; export PATH=/usr/local/go/bin:$GOPATH/bin:$PATH' >> ~/.bashrc -export GOPATH=/go; export PATH=/usr/local/go/bin:$GOPATH/bin:$PATH -git clone https://github.com/Intel-Corp/multus-cni -cd multus-cni; bash ./build diff --git a/src/vagrant/kubeadm_multus/multus/install_cni.sh b/src/vagrant/kubeadm_multus/multus/install_cni.sh deleted file mode 100644 index a4c5059..0000000 --- a/src/vagrant/kubeadm_multus/multus/install_cni.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -ex -cp /cni/multus /opt/cni/bin -cp /etc/kube-cnimultus/cni-conf.json /etc/cni/net.d/05-multus.conf -while true; do sleep 3600; done diff --git a/src/vagrant/kubeadm_multus/multus/kube_cni_multus.yml b/src/vagrant/kubeadm_multus/multus/kube_cni_multus.yml deleted file mode 100644 index 8290218..0000000 --- a/src/vagrant/kubeadm_multus/multus/kube_cni_multus.yml +++ /dev/null @@ -1,88 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: cnimultus - namespace: kube-system ---- -kind: ConfigMap -apiVersion: v1 -metadata: - name: kube-cnimultus-cfg - namespace: kube-system - labels: - tier: node - app: cnimultus -data: - cni-conf.json: | - { - "name": "multus", - "type": "multus", - "delegates": [ - { - "name": "weave", - "type": "weave-net", - "hairpinMode": true, - "masterplugin": true - }, - { - "name": "mynet", - "type": "bridge", - "bridge": "cni0", - "isGateway": true, - "ipMasq": true, - "ipam": { - "type": "host-local", - "subnet": "10.22.0.0/16", - "routes": [ - { "dst": "0.0.0.0/0" } - ] - } - } - ] - } ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: kube-cnimultus-ds - namespace: kube-system - labels: - tier: node - app: cnimultus -spec: - template: - metadata: - labels: - tier: node - app: cnimultus - spec: - hostNetwork: true - nodeSelector: - beta.kubernetes.io/arch: amd64 - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - serviceAccountName: cnimultus - containers: - - name: install-cni - image: openretriever/cnimultus - command: [ "/bin/bash", "/cni/install_cni.sh" ] - volumeMounts: - - name: cni-bin - mountPath: /opt/cni/bin - - name: cni-cfg - mountPath: /etc/cni/net.d - - name: cnimultus-cfg - mountPath: /etc/kube-cnimultus - volumes: - - name: cni-bin - hostPath: - path: /opt/cni/bin - - name: cni-cfg - hostPath: - path: /etc/cni/net.d - - name: cnimultus-cfg - configMap: - name: kube-cnimultus-cfg diff --git a/src/vagrant/kubeadm_multus/multus/setup.sh b/src/vagrant/kubeadm_multus/multus/setup.sh deleted file mode 100644 index 4729993..0000000 --- a/src/vagrant/kubeadm_multus/multus/setup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -BUILD=`pwd` - -sudo docker build -t multus.build . -f Dockerfile.build -sudo docker run -v $BUILD:/build -ti multus.build cp multus-cni/bin/multus /build -sudo docker build -t openretriever/cnimultus . -f Dockerfile.multus -sudo docker push openretriever/cnimultus -rm -rf multus |