From da51aabb3171afb8107f837fd0ccfe1add403c4d Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Thu, 3 Aug 2017 17:54:29 -0700 Subject: Fix some issues in ovsdpdk, cni for ovsdpdk Change-Id: Ib919a14a74c6d33c74c7d4f9baa5fd81b9054cbd Signed-off-by: Guo Ruijing --- src/cni/ovsdpdk/install_cni.sh | 2 +- src/cni/ovsdpdk/kube_cniovsdpdk.yml | 71 +++++++++++++++++++++++++++++++++++++ src/cni/ovsdpdk/kube_ovsdpdk.yml | 71 ------------------------------------- 3 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 src/cni/ovsdpdk/kube_cniovsdpdk.yml delete mode 100644 src/cni/ovsdpdk/kube_ovsdpdk.yml (limited to 'src/cni/ovsdpdk') diff --git a/src/cni/ovsdpdk/install_cni.sh b/src/cni/ovsdpdk/install_cni.sh index 8f5b78a..1996700 100644 --- a/src/cni/ovsdpdk/install_cni.sh +++ b/src/cni/ovsdpdk/install_cni.sh @@ -4,5 +4,5 @@ set -ex cp /cni/ovsdpdk /opt/cni/bin cp /cni/setup_ovsdpdk.sh /opt/cni/bin cp /cni/teardown_ovsdpdk.sh /opt/cni/bin -cp /etc/kube-ovsdpdk/cni-conf.json /etc/cni/net.d/10-ovsdpdk.conf +cp /etc/kube-cniovsdpdk/cni-conf.json /etc/cni/net.d/10-ovsdpdk.conf while true; do sleep 3600; done diff --git a/src/cni/ovsdpdk/kube_cniovsdpdk.yml b/src/cni/ovsdpdk/kube_cniovsdpdk.yml new file mode 100644 index 0000000..8e8ed0e --- /dev/null +++ b/src/cni/ovsdpdk/kube_cniovsdpdk.yml @@ -0,0 +1,71 @@ +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: cniovsdpdk + namespace: kube-system +--- +kind: ConfigMap +apiVersion: v1 +metadata: + name: kube-cniovsdpdk-cfg + namespace: kube-system + labels: + tier: node + app: cniovsdpdk +data: + cni-conf.json: | + { + "name": "ovsdpdk", + "type": "ovsdpdk", + "bridge": "br-dpdk", + "ipam": { + "type": "host-local", + "subnet": "10.244.0.0/16" + } + } +--- +apiVersion: extensions/v1beta1 +kind: DaemonSet +metadata: + name: kube-cniovsdpdk-ds + namespace: kube-system + labels: + tier: node + app: cniovsdpdk +spec: + template: + metadata: + labels: + tier: node + app: cniovsdpdk + spec: + hostNetwork: true + nodeSelector: + beta.kubernetes.io/arch: amd64 + tolerations: + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + serviceAccountName: cniovsdpdk + containers: + - name: install-cni + image: openretriever/cni-ovsdpdk + command: [ "/bin/bash", "/cni/install_cni.sh" ] + volumeMounts: + - name: cni-bin + mountPath: /opt/cni/bin + - name: cni-cfg + mountPath: /etc/cni/net.d + - name: cniovsdpdk-cfg + mountPath: /etc/kube-cniovsdpdk + volumes: + - name: cni-bin + hostPath: + path: /opt/cni/bin + - name: cni-cfg + hostPath: + path: /etc/cni/net.d + - name: cniovsdpdk-cfg + configMap: + name: kube-cniovsdpdk-cfg diff --git a/src/cni/ovsdpdk/kube_ovsdpdk.yml b/src/cni/ovsdpdk/kube_ovsdpdk.yml deleted file mode 100644 index 2bcebdc..0000000 --- a/src/cni/ovsdpdk/kube_ovsdpdk.yml +++ /dev/null @@ -1,71 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: ovsdpdk - namespace: kube-system ---- -kind: ConfigMap -apiVersion: v1 -metadata: - name: kube-ovsdpdk-cfg - namespace: kube-system - labels: - tier: node - app: ovsdpdk -data: - cni-conf.json: | - { - "name": "ovsdpdk", - "type": "ovsdpdk", - "bridge": "br-dpdk", - "ipam": { - "type": "host-local", - "subnet": "10.244.0.0/16" - } - } ---- -apiVersion: extensions/v1beta1 -kind: DaemonSet -metadata: - name: kube-ovsdpdk-ds - namespace: kube-system - labels: - tier: node - app: ovsdpdk -spec: - template: - metadata: - labels: - tier: node - app: ovsdpdk - spec: - hostNetwork: true - nodeSelector: - beta.kubernetes.io/arch: amd64 - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: NoSchedule - serviceAccountName: ovsdpdk - containers: - - name: install-cni - image: openretriever/cni-ovsdpdk - command: [ "/bin/bash", "/cni/install_cni.sh" ] - volumeMounts: - - name: cni-bin - mountPath: /opt/cni/bin - - name: cni-cfg - mountPath: /etc/cni/net.d - - name: ovsdpdk-cfg - mountPath: /etc/kube-ovsdpdk - volumes: - - name: cni-bin - hostPath: - path: /opt/cni/bin - - name: cni-cfg - hostPath: - path: /etc/cni/net.d - - name: ovsdpdk-cfg - configMap: - name: kube-ovsdpdk-cfg -- cgit 1.2.3-korg