Merge pull request #506 from raviganapatp/master

release version 1.21.9

Author: sreejithgs

canary/README.md

@@ -40,7 +40,7 @@ GitHub has many utilities available for integrating with other tools that form p
 
 Following Citrix software versions are required for Citrix-Integrated Canary Deployment Solution:
 
--  Citrix ingress controller build/version: `quay.io/citrix/citrix-k8s-ingress-controller:1.19.6`.
+-  Citrix ingress controller build/version: `quay.io/citrix/citrix-k8s-ingress-controller:1.21.9`.
 -  Citrix ADC CPX version: `quay.io/citrix/citrix-k8s-cpx-ingress:13.0-83.27`.
 -  Citrix ADC Metrics Exporter version: `quay.io/citrix/netscaler-metrics-exporter:1.4.0`.
 

canary/manifest/cic-vpx.yaml

@@ -8,7 +8,7 @@ spec:
       serviceAccountName: cpx
       containers:
       - name: cic-k8s-ingress-controller
-        image: "quay.io/citrix/citrix-k8s-ingress-controller:1.19.6"
+        image: "quay.io/citrix/citrix-k8s-ingress-controller:1.21.9"
         env:
          # Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled) 
          - name: "NS_IP"

canary/manifest/cpx-with-cic-sidecar.yml

@@ -56,7 +56,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: quay.io/citrix/citrix-k8s-ingress-controller:1.19.6
+        image: quay.io/citrix/citrix-k8s-ingress-controller:1.21.9
         imagePullPolicy: Always
         name: cic-k8s-ingress-controller
       - args:

canary/manifest/rbac.yaml

@@ -33,6 +33,15 @@ rules:
   - apiGroups: ["citrix.com"]
     resources: ["ratelimits"]
     verbs: ["get", "list", "watch"]
+  - apiGroups: ["config.openshift.io"]
+    resources: ["networks"]
+    verbs: ["get", "list"]
+  - apiGroups: ["network.openshift.io"]
+    resources: ["hostsubnets"]
+    verbs: ["get", "list", "watch"]
+  - apiGroups: ["crd.projectcalico.org"]
+    resources: ["ipamblocks"]
+    verbs: ["get", "list", "watch"]
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

cd/canary-azure-devops/kubernetes_configs/cic_helm/README.md

@@ -290,7 +290,7 @@ The following table lists the mandatory and optional parameters that you can con
 | Parameters | Mandatory or Optional | Default value | Description |
 | --------- | --------------------- | ------------- | ----------- |
 | license.accept | Mandatory | no | Set `yes` to accept the CIC end user license agreement. |
-| image | Mandatory | `quay.io/citrix/citrix-k8s-ingress-controller:1.19.6` | The CIC image. |
+| image | Mandatory | `quay.io/citrix/citrix-k8s-ingress-controller:1.21.9` | The CIC image. |
 | pullPolicy | Mandatory | IfNotPresent | The CIC image pull policy. |
 | adcCredentialSecret | Mandatory | N/A | The secret key to log on to the Citrix ADC VPX or MPX. For information on how to create the secret keys, see [Prerequisites](#prerequistes). |
 | nsIP | Mandatory | N/A | The IP address of the Citrix ADC device. For details, see [Prerequisites](#prerequistes). |

cd/canary-azure-devops/kubernetes_configs/cic_helm/templates/rbac.yaml

@@ -52,6 +52,9 @@ rules:
   - apiGroups: ["network.openshift.io"]
     resources: ["hostsubnets"]
     verbs: ["get", "list", "watch"]
+  - apiGroups: ["config.openshift.io"]
+    resources: ["networks"]
+    verbs: ["get", "list"]
 {{- end }}
 
 ---

cd/canary-azure-devops/kubernetes_configs/cic_helm/values.yaml

@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 
 # Citrix Ingress Controller config details
-image: quay.io/citrix/citrix-k8s-ingress-controller:1.19.6
+image: quay.io/citrix/citrix-k8s-ingress-controller:1.21.9
 pullPolicy: IfNotPresent
 openshift: false
 adcCredentialSecret:

deployment/anthos/manifest/dual-tiered-ingress/cic.yaml

@@ -38,6 +38,12 @@ rules:
   - apiGroups: ["route.openshift.io"]
     resources: ["routes"]
     verbs: ["get", "list", "watch"]
+  - apiGroups: ["config.openshift.io"]
+    resources: ["networks"]
+    verbs: ["get", "list"]
+  - apiGroups: ["network.openshift.io"]
+    resources: ["hostsubnets"]
+    verbs: ["get", "list", "watch"]
   - apiGroups: ["crd.projectcalico.org"]
     resources: ["ipamblocks"]
     verbs: ["get", "list", "watch"]
@@ -85,7 +91,7 @@ spec:
       serviceAccountName: cic-k8s-role
       containers:
       - name: cic-k8s-ingress-controller
-        image: "quay.io/citrix/citrix-k8s-ingress-controller:1.19.6"
+        image: "quay.io/citrix/citrix-k8s-ingress-controller:1.21.9"
         env:
          # Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled) 
          - name: "NS_IP"

deployment/anthos/manifest/dual-tiered-ingress/cpx-cic.yaml

@@ -39,6 +39,12 @@ rules:
   - apiGroups: ["route.openshift.io"]
     resources: ["routes"]
     verbs: ["get", "list", "watch"]
+  - apiGroups: ["config.openshift.io"]
+    resources: ["networks"]
+    verbs: ["get", "list"]
+  - apiGroups: ["network.openshift.io"]
+    resources: ["hostsubnets"]
+    verbs: ["get", "list", "watch"]
   - apiGroups: ["crd.projectcalico.org"]
     resources: ["ipamblocks"]
     verbs: ["get", "list", "watch"]
@@ -122,7 +128,7 @@ spec:
               name: cpx-volume
         # Add cic as a sidecar
         - name: cic
-          image: quay.io/citrix/citrix-k8s-ingress-controller:1.19.6
+          image: quay.io/citrix/citrix-k8s-ingress-controller:1.21.9
           volumeMounts:
           - mountPath: /var/deviceinfo
             name: shared-data

deployment/anthos/manifest/service-type-lb/cic.yaml

@@ -38,6 +38,12 @@ rules:
   - apiGroups: ["route.openshift.io"]
     resources: ["routes"]
     verbs: ["get", "list", "watch"]
+  - apiGroups: ["config.openshift.io"]
+    resources: ["networks"]
+    verbs: ["get", "list"]
+  - apiGroups: ["network.openshift.io"]
+    resources: ["hostsubnets"]
+    verbs: ["get", "list", "watch"]
   - apiGroups: ["crd.projectcalico.org"]
     resources: ["ipamblocks"]
     verbs: ["get", "list", "watch"]
@@ -85,7 +91,7 @@ spec:
       serviceAccountName: cic-k8s-role
       containers:
       - name: cic-k8s-ingress-controller
-        image: "quay.io/citrix/citrix-k8s-ingress-controller:1.19.6"
+        image: "quay.io/citrix/citrix-k8s-ingress-controller:1.21.9"
         env:
          # Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled) 
          - name: "NS_IP"