Merge pull request #204 from libujacob/master

Fix cniVersion(#201) and selector validation(#203) issues in genie manifest file
cni-genie · May 7, 2020 · 34839c0 · 34839c0
2 parents e116214 + 489d0f0
commit 34839c0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/conf/1.8/genie-complete.yaml b/conf/1.8/genie-complete.yaml
@@ -131,6 +131,7 @@ data:
     {
         "name": "k8s-pod-network",
         "type": "genie",
+        "cniVersion": "0.2.0",
         "log_level": "info",
         "datastore_type": "kubernetes",
         "hostname": "__KUBERNETES_NODE_NAME__",
@@ -214,7 +215,12 @@ apiVersion: apps/v1
 metadata:
   name: genie-network-admission-controller
   namespace: kube-system
+  labels:
+    role: genie-network-admission-controller
 spec:
+  selector:
+    matchLabels:
+      role: genie-network-admission-controller
   template:
     metadata:
       labels:

diff --git a/conf/1.8/genie-plugin.yaml b/conf/1.8/genie-plugin.yaml
@@ -88,6 +88,7 @@ data:
     {
         "name": "k8s-pod-network",
         "type": "genie",
+        "cniVersion": "0.2.0",
         "log_level": "info",
         "datastore_type": "kubernetes",
         "hostname": "__KUBERNETES_NODE_NAME__",
@@ -171,7 +172,12 @@ apiVersion: apps/v1
 metadata:
   name: genie-network-admission-controller
   namespace: kube-system
+  labels:
+    role: genie-network-admission-controller
 spec:
+  selector:
+    matchLabels:
+      role: genie-network-admission-controller
   template:
     metadata:
       labels:

diff --git a/e2e/scripts/kube-cluster.sh b/e2e/scripts/kube-cluster.sh
@@ -22,6 +22,6 @@ kubectl taint nodes --all node-role.kubernetes.io/master-
 
 kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml
 
-kubectl apply -f https://raw.githubusercontent.com/cni-genie/CNI-Genie/master/conf/1.8/genie-complete.yaml
+kubectl apply -f conf/1.8/genie-complete.yaml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -22,6 +22,6 @@ kubectl taint nodes --all node-role.kubernetes.io/master-

		kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml

		kubectl apply -f https://raw.githubusercontent.com/cni-genie/CNI-Genie/master/conf/1.8/genie-complete.yaml
		kubectl apply -f conf/1.8/genie-complete.yaml