Merge pull request #289 from RaveendraHolla/master

Changes for v1.9.2

Author: ankits123

deployment/baremetal/citrix-k8s-ingress-controller.yaml

@@ -30,10 +30,10 @@ rules:
     resources: ["deployments"]
     verbs: ["get", "list", "watch"]
   - apiGroups: ["citrix.com"]
-    resources: ["rewritepolicies", "continuousdeployments", "authpolicies", "ratelimits", "listeners", "httproutes"]
+    resources: ["rewritepolicies", "continuousdeployments", "authpolicies", "ratelimits", "listeners", "httproutes", "wafs"]
     verbs: ["get", "list", "watch"]
   - apiGroups: ["citrix.com"]
-    resources: ["rewritepolicies/status", "continuousdeployments/status", "ratelimits/status", "authpolicies/status", "listeners/status", "httproutes/status"]
+    resources: ["rewritepolicies/status", "continuousdeployments/status", "ratelimits/status", "authpolicies/status", "listeners/status", "httproutes/status", "wafs/status"]
     verbs: ["get", "list", "patch"]
   - apiGroups: ["citrix.com"]
     resources: ["vips"]
@@ -85,7 +85,7 @@ spec:
       serviceAccountName: cic-k8s-role
       containers:
       - name: cic-k8s-ingress-controller
-        image: "quay.io/citrix/citrix-k8s-ingress-controller:1.8.19"
+        image: "quay.io/citrix/citrix-k8s-ingress-controller:1.9.2"
         env:
          # Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled) 
          - name: "NS_IP"

docs/multicluster/multi-cluster.md

@@ -112,7 +112,7 @@ Perform the following steps to deploy the Citrix global load balancing solution
          - name: "SITENAMES"
            value: "site1,site2"
          - name: "site1_ip"
-           value: "10.102.217.148"
+           value: "x.x.x.x"
          - name: "site1_region"
            value: "east"
          - name: "site1_username"
@@ -126,7 +126,7 @@ Perform the following steps to deploy the Citrix global load balancing solution
                name: secret-1
                key: password
          - name: "site2_ip"
-           value: "10.102.217.141"
+           value: "x.x.x.x"
          - name: "site2_region"
            value: "west"
          - name: "site2_username"
@@ -214,7 +214,7 @@ Perform the following steps to deploy the Citrix global load balancing solution
         apiVersion: "citrix.com/v1beta1"
         kind: globalserviceentry
         metadata:
-          name: `app2.default.east.cluster1`
+          name: 'app2.default.east.cluster1'
           namespace: default
         spec:
           endpoint:

multicluster/Manifest/gslb-controller.yaml

@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: cic-k8s-ingress-controller
+  name: gslb-k8s-ingress-controller
   namespace: default
   labels:
-    app: cic-k8s-ingress-controller
+    app: gslb-k8s-ingress-controller
 spec:
-      serviceAccountName: cic-k8s-role
+      serviceAccountName: gslb-k8s-role
       containers:
-      - name: cic-k8s-ingress-controller
-        image: us.gcr.io/gslbk8/gslbk8_cic_merge:v1
+      - name: gslb-k8s-ingress-controller
+        image: "quay.io/citrix/citrix-k8s-ingress-controller:1.9.2"
         imagePullPolicy: Always
         env:
         # Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
@@ -30,7 +30,7 @@ spec:
         - name: "SITENAMES"
           value: "site1,site2"
         - name: "site1_ip"
-          value: "10.102.217.148"
+          value: "x.x.x.x"
         - name: "site1_region"
           value: "east"
         - name: "site1_username"
@@ -44,7 +44,7 @@ spec:
               name: secret-1
               key: password
         - name: "site2_ip"
-          value: "10.102.217.141"
+          value: "x.x.x.x"
         - name: "site2_region"
           value: "west"
         - name: "site2_username"
@@ -59,4 +59,4 @@ spec:
               key: password
         args:
         - --config-interface
-            gslb-endpoints
+            gslb-endpoints

multicluster/Manifest/gslb-rbac.yaml

@@ -1,7 +1,7 @@
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
-  name: cic-k8s-role
+  name: gslb-k8s-role
 rules:
   - apiGroups: [""]
     resources: ["endpoints", "ingresses", "pods", "secrets", "nodes", "routes", "namespaces","configmaps"]
@@ -46,19 +46,19 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
-  name: cic-k8s-role
+  name: gslb-k8s-role
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: cic-k8s-role
+  name: gslb-k8s-role
 subjects:
 - kind: ServiceAccount
-  name: cic-k8s-role
+  name: gslb-k8s-role
   namespace: default
 apiVersion: rbac.authorization.k8s.io/v1
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: cic-k8s-role
+  name: gslb-k8s-role
   namespace: default

multicluster/Manifest/gtp-crd.yaml

@@ -141,4 +141,3 @@ spec:
             status:
               type: object
           type: object
-```

multicluster/README.md

@@ -112,7 +112,7 @@ Perform the following steps to deploy the Citrix global load balancing solution
          - name: "SITENAMES"
            value: "site1,site2"
          - name: "site1_ip"
-           value: "10.102.217.148"
+           value: "x.x.x.x"
          - name: "site1_region"
            value: "east"
          - name: "site1_username"
@@ -126,7 +126,7 @@ Perform the following steps to deploy the Citrix global load balancing solution
                name: secret-1
                key: password
          - name: "site2_ip"
-           value: "10.102.217.141"
+           value: "x.x.x.x"
          - name: "site2_region"
            value: "west"
          - name: "site2_username"