Code Review
/
openretriever.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix some issues in ovsdpdk, cni for ovsdpdk
[openretriever.git]
/
src
/
cni
/
ovsdpdk
/
kube_cniovsdpdk.yml
diff --git
a/src/cni/ovsdpdk/kube_ovsdpdk.yml
b/src/cni/ovsdpdk/kube_cniovsdpdk.yml
similarity index 79%
rename from
src/cni/ovsdpdk/kube_ovsdpdk.yml
rename to
src/cni/ovsdpdk/kube_cniovsdpdk.yml
index
2bcebdc
..
8e8ed0e
100644
(file)
--- a/
src/cni/ovsdpdk/kube_ovsdpdk.yml
+++ b/
src/cni/ovsdpdk/kube_cniovsdpdk.yml
@@
-2,17
+2,17
@@
apiVersion: v1
kind: ServiceAccount
metadata:
apiVersion: v1
kind: ServiceAccount
metadata:
- name: ovsdpdk
+ name:
cni
ovsdpdk
namespace: kube-system
---
kind: ConfigMap
apiVersion: v1
metadata:
namespace: kube-system
---
kind: ConfigMap
apiVersion: v1
metadata:
- name: kube-ovsdpdk-cfg
+ name: kube-
cni
ovsdpdk-cfg
namespace: kube-system
labels:
tier: node
namespace: kube-system
labels:
tier: node
- app: ovsdpdk
+ app:
cni
ovsdpdk
data:
cni-conf.json: |
{
data:
cni-conf.json: |
{
@@
-28,17
+28,17
@@
data:
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
- name: kube-ovsdpdk-ds
+ name: kube-
cni
ovsdpdk-ds
namespace: kube-system
labels:
tier: node
namespace: kube-system
labels:
tier: node
- app: ovsdpdk
+ app:
cni
ovsdpdk
spec:
template:
metadata:
labels:
tier: node
spec:
template:
metadata:
labels:
tier: node
- app: ovsdpdk
+ app:
cni
ovsdpdk
spec:
hostNetwork: true
nodeSelector:
spec:
hostNetwork: true
nodeSelector:
@@
-47,7
+47,7
@@
spec:
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- key: node-role.kubernetes.io/master
operator: Exists
effect: NoSchedule
- serviceAccountName: ovsdpdk
+ serviceAccountName:
cni
ovsdpdk
containers:
- name: install-cni
image: openretriever/cni-ovsdpdk
containers:
- name: install-cni
image: openretriever/cni-ovsdpdk
@@
-57,8
+57,8
@@
spec:
mountPath: /opt/cni/bin
- name: cni-cfg
mountPath: /etc/cni/net.d
mountPath: /opt/cni/bin
- name: cni-cfg
mountPath: /etc/cni/net.d
- - name: ovsdpdk-cfg
- mountPath: /etc/kube-ovsdpdk
+ - name:
cni
ovsdpdk-cfg
+ mountPath: /etc/kube-
cni
ovsdpdk
volumes:
- name: cni-bin
hostPath:
volumes:
- name: cni-bin
hostPath:
@@
-66,6
+66,6
@@
spec:
- name: cni-cfg
hostPath:
path: /etc/cni/net.d
- name: cni-cfg
hostPath:
path: /etc/cni/net.d
- - name: ovsdpdk-cfg
+ - name:
cni
ovsdpdk-cfg
configMap:
configMap:
- name: kube-ovsdpdk-cfg
+ name: kube-
cni
ovsdpdk-cfg