Merge pull request #667 from arijitr-citrix/master

NSIC Release 2.0.6

Author: subashd

canary/README.md

@@ -40,8 +40,8 @@ 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:
 
--  Netscaler ingress controller build/version: `quay.io/netscaler/netscaler-k8s-ingress-controller:1.43.7`.
--  Netscaler CPX version: `quay.io/netscaler/netscaler-cpx:14.1-25.109`.
+-  Netscaler ingress controller build/version: `quay.io/netscaler/netscaler-k8s-ingress-controller:2.0.6`.
+-  Netscaler CPX version: `quay.io/netscaler/netscaler-cpx:14.1-25.111`.
 -  Netscaler Metrics Exporter version: `quay.io/netscaler/netscaler-adc-metrics-exporter:1.4.9`.
 
 ### Workflow of a Spinnaker pipeline for Netscaler-Integrated Canary Deployment Solution

canary/manifest/cic-vpx.yaml

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

canary/manifest/cpx-exporter.yaml

@@ -36,7 +36,7 @@ spec:
         - name: EULA
           value: "YES"
         - name: KUBERNETES_TASK_ID
-        image: quay.io/netscaler/netscaler-cpx:14.1-25.109
+        image: quay.io/netscaler/netscaler-cpx:14.1-25.111
         imagePullPolicy: Always
         name: cpx-ingress
         ports:

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

@@ -56,7 +56,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.43.7
+        image: quay.io/netscaler/netscaler-k8s-ingress-controller:2.0.6
         imagePullPolicy: Always
         name: cic-k8s-ingress-controller
       - args:
@@ -65,7 +65,7 @@ spec:
         - name: EULA
           value: "YES"
         - name: KUBERNETES_TASK_ID
-        image: quay.io/netscaler/netscaler-cpx:14.1-25.109
+        image: quay.io/netscaler/netscaler-cpx:14.1-25.111
         imagePullPolicy: Always
         name: cpx-ingress
         ports:

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

@@ -291,7 +291,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/netscaler/netscaler-k8s-ingress-controller:1.43.7` | The CIC image. |
+| image | Mandatory | `quay.io/netscaler/netscaler-k8s-ingress-controller:2.0.6` | The CIC image. |
 | pullPolicy | Mandatory | IfNotPresent | The CIC image pull policy. |
 | adcCredentialSecret | Mandatory | N/A | The secret key to log on to the Netscaler VPX or MPX. For information on how to create the secret keys, see [Prerequisites](#prerequistes). |
 | nsIP | Mandatory | N/A | The IP address of the Netscaler device. For details, see [Prerequisites](#prerequistes). |

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

@@ -29,7 +29,8 @@ data:
       enable: {{ .Values.coeConfig.distributedTracing.enable | quote }}
       samplingrate: {{ .Values.coeConfig.distributedTracing.samplingrate }}
     endpoint:
-      server: {{ include "analytics.server" . | quote }}
+      metrics:
+        service: {{ include "analytics.server" . | quote }}
     timeseries:
       port: {{ .Values.coeConfig.timeseries.port }}
       metrics:

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

@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 
 # Netscaler ingress controller config details
-image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.43.7
+image: quay.io/netscaler/netscaler-k8s-ingress-controller:2.0.6
 pullPolicy: IfNotPresent
 openshift: false
 adcCredentialSecret:

crd/contentrouting/Listener.yaml

@@ -31,10 +31,13 @@ spec:
             properties:
               ingressclass:
                 type: string
-                description: "Ingress class, if not specified then all Netscaler ingress controllers in the cluster will process the resource otherwise only the controller with that ingress class will process this resource"
+                description: "Ingress class, if not specified then all citrix ingress controllers in the cluster will process the resource otherwise only the controller with that ingress class will process this resource"
+              multicluster:
+                description: "Is the csvserver IP shared by multiclusters and CICs"
+                type: boolean
               protocol:
                 type: string
-                enum: ["https", "http"]
+                enum: ["tcp", "udp", "https", "http"]
                 description: "Protocol for this listener"
               vip:
                 type: string
@@ -104,7 +107,7 @@ spec:
                     - required: ["config"]
                   tcpprofile:
                     type: object
-                    description: "TCP level configurations, uses  ns tcpprofile of Netscaler"
+                    description: "TCP level configurations, uses  ns tcpprofile of citrix ADC"
                     properties:
                       preconfigured:
                         description: "Preconfigured or Built-in TCP profile name"
@@ -130,7 +133,7 @@ spec:
                         type: string
                         description: "SSL profile which is preconfigured in ADC. Ciphers bound to the profile is not overriden"
                       config:
-                        description: "Netscaler frontend SSL profile configurations. Refer:https://developer-docs.citrix.com/projects/netscaler-nitro-api/en/12.0/configuration/ssl/sslprofile/  for all configurations; Name field is auto generated"
+                        description: "Citrix ADC frontend SSL profile configurations. Refer:https://developer-docs.citrix.com/projects/netscaler-nitro-api/en/12.0/configuration/ssl/sslprofile/  for all configurations; Name field is auto generated"
                         type: object
                         additionalProperties:
                           type: string
@@ -233,12 +236,12 @@ spec:
                                 description: "Use Secure communications to the backends"
                                 type: boolean
                               lbConfig:
-                                description: "Netscaler LB vserver configurations for the backend. Refer: https://developer-docs.citrix.com/projects/netscaler-nitro-api/en/12.0/configuration/load-balancing/lbvserver/lbvserver/ for all configurations"
+                                description: "Citrix ADC LB vserver configurations for the backend. Refer: https://developer-docs.citrix.com/projects/netscaler-nitro-api/en/12.0/configuration/load-balancing/lbvserver/lbvserver/ for all configurations"
                                 type: object
                                 additionalProperties:
                                   type: string
                               servicegroupConfig:
-                                description: "Netscaler service group configurations for the backend; Refer: https://developer-docs.citrix.com/projects/netscaler-nitro-api/en/12.0/configuration/basic/servicegroup/servicegroup/ for all configurations"
+                                description: "Citrix ADC service group configurations for the backend; Refer: https://developer-docs.citrix.com/projects/netscaler-nitro-api/en/12.0/configuration/basic/servicegroup/servicegroup/ for all configurations"
                                 type: object
                                 additionalProperties:
                                   type: string
@@ -256,7 +259,7 @@ spec:
                         description: "Host name specified is used for redirection with URL intact"
                         type: string
                       targetExpression:
-                        description: "A target can be specified using Netscaler policy expression"
+                        description: "A target can be specified using Citrix ADC policy expression"
                         type: string
                       responseCode:
                         description: "Default response code is 302, which can be customised using this attribute"
@@ -268,4 +271,4 @@ spec:
                 - required: ["redirect"]
     subresources:
       # status enables the status subresource.
-      status: {}
+      status: {}

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

@@ -91,7 +91,7 @@ spec:
       serviceAccountName: cic-k8s-role
       containers:
       - name: cic-k8s-ingress-controller
-        image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.43.7"
+        image: "quay.io/netscaler/netscaler-k8s-ingress-controller:2.0.6"
         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

@@ -95,7 +95,7 @@ spec:
       serviceAccountName: cpx
       containers:
         - name: cpx-ingress
-          image: quay.io/netscaler/netscaler-cpx:14.1-25.109
+          image: quay.io/netscaler/netscaler-cpx:14.1-25.111
           securityContext:
              privileged: true
           env:
@@ -130,7 +130,7 @@ spec:
               name: cpx-volume-conf
         # Add cic as a sidecar
         - name: cic
-          image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.43.7
+          image: quay.io/netscaler/netscaler-k8s-ingress-controller:2.0.6
           volumeMounts:
           - mountPath: /var/deviceinfo
             name: shared-data