Merge pull request #15 from aroraharsh23/ver_2.2.0

Ver 2.2.1

Author: subashd

deploy/README.md

@@ -34,6 +34,8 @@ Perform the following:
     | VNID | Mandatory | A unique VXLAN VNID to create a VXLAN overlay between Kubernetes cluster and the ingress devices. </br></br>**Note:** Ensure that the VXLAN VNID that you use does not conflict with the Kubernetes cluster or Citrix ADC VXLAN VNID. You can use the `show vxlan` command on your Citrix ADC to view the VXLAN VNID. For example: </br></br> `show vxlan` </br>`1) ID: 500       Port: 9090`</br>`Done` </br> </br>In this case, ensure that you do not use `500` as the VXLAN VNID.|
     | VXLAN_PORT | Mandatory | The VXLAN port that you want to use for the overlay. </br></br>**Note:** Ensure that the VXLAN PORT that you use does not conflict with the Kubernetes cluster or Citrix ADC VXLAN PORT. You can use the `show vxlan` command on your Citrix ADC to view the VXLAN PORT. For example: </br></br> `show vxlan` </br>`1) ID: 500       Port: 9090`</br>`Done` </br> </br>In this case, ensure that you do not use `9090` as the VXLAN PORT.|
     | REMOTE_VTEPIP | Mandatory | The Ingress Citrix ADC SNIP. This IP address is used to establish an overlay network between the Kubernetes clusters.|
+    | DSR_IP_RANGE | Optional | This IP address range is used for DSR Iptable configuration on nodes. Both IP and subnet must be specified in format : "xx.xx.xx.xx/xx" |
+
 
 1.  After you have updated the Citrix k8s node controller deployment YAML file, deploy it using the following command:
 
@@ -48,28 +50,32 @@ Perform the following:
 
 After you have deployed the Citrix node controller, you can verify if Citrix node controller has configured a route on the Citrix ADC. 
 
-To verify, log on to the Citrix ADC and use the following commands to verify the VXLAN VNID, VXLAN PORT, SNIP, route, and ARP configured by Citrix node controller  on the Citrix ADC:
+To verify, log on to the Citrix ADC and use the following commands to verify the VXLAN VNID, VXLAN PORT, SNIP, route, and Bridgetable configured by Citrix node controller  on the Citrix ADC:
+
+![Verification](../images/ip_route_vxlan.jpg)
 
-![Verification](../images/verify.png)
+![Verification](../images/bridge_table.jpg)
 
-The highlights in the screenshot show the VXLAN VNID, VXLAN PORT, SNIP, route, and ARP configured by Citrix node controller on the Citrix ADC.
+The highlights in the screenshot show the VXLAN VNID, VXLAN PORT, SNIP, route, and bridgetable configured by Citrix node controller on the Citrix ADC.
 
 ## Verify cluster deployments
 
 Apart from "citrix-node-controller" deployment, some other resources are also created.
 
 - In "Kube-system" namespace:
-    - For each worker node, a "kube-chorus-router" pod.
-    - A configmap "kube-chorus-router".
-    - A serviceaccount "kube-chorus-router"
-- A clusterrole "kube-chorus-router"
-- A clusterrolebinding "kube-chorus-router"
+    - For each worker node, a "kube-cnc-router" pod.
+    - A configmap "kube-cnc-router".
+    - A serviceaccount "kube-cnc-router"
+- A clusterrole "kube-cnc-router"
+- A clusterrolebinding "kube-cnc-router"
+
+![Verification](../images/k8s_deployments.png)
 
 # Delete the Citrix K8s node controller 
 
 1.  Delete the [config map](config_map.yaml) using the following command:
 
-	When we delete the configmap, Citrix node controller cleans up the configuration created on Citrix ADC, the "kube-chorus-router" configmap and the "kube-chorus-router" pods created by citrix node controller.
+	When we delete the configmap, Citrix node controller cleans up the configuration created on Citrix ADC, the "kube-cnc-router" configmap and the "kube-cnc-router" pods created by citrix node controller
 
         kubectl delete -f https://raw.githubusercontent.com/citrix/citrix-k8s-node-controller/git_cnc_v2/deploy/config_map.yaml
 

deploy/citrix-k8s-node-controller.yaml

@@ -1,6 +1,6 @@
 ---
 kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: citrix-node-controller
 rules:
@@ -22,9 +22,12 @@ rules:
   - apiGroups: ["*"]
     resources: ["serviceaccounts", "clusterroles", "clusterrolebindings", "namespaces"]
     verbs: ["get", "list", "create", "delete"]
+  - apiGroups: ["crd.projectcalico.org"]
+    resources: ["ipamblocks"]
+    verbs: ["get", "list"]
 ---
 kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: citrix-node-controller
 roleRef:
@@ -43,7 +46,7 @@ metadata:
   name: citrix-node-controller
   namespace: default
 ---
-apiVersion: apps/v1 #  for k8s versions before 1.9.0 use apps/v1beta2  and before 1.8.0 use extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: citrix-node-controller
@@ -60,7 +63,7 @@ spec:
       serviceAccountName: citrix-node-controller
       containers:
       - name: citrix-node-controller
-        image: "quay.io/citrix/citrix-k8s-node-controller:2.1.0"
+        image: "quay.io/citrix/citrix-k8s-node-controller:2.2.1"
         imagePullPolicy: Always
         env:
         - name: NS_IP
@@ -76,10 +79,10 @@ spec:
              name: nslogin
              key: password
         - name: NETWORK
-          value: "192.168.1.0/24"
+          value: "172.16.3.0/24"
         - name: REMOTE_VTEPIP
           value: "xx.xx.xx.xx"
         - name: VXLAN_PORT
-          value: "8472"
+          value: "3267"
         - name: VNID
-          value: "200"
+          value: "300"