Merge pull request #82 from citrix/cic-v1.15.12

Releasing CIC v1.15.12

citrix-cloud-native/Chart.yaml

@@ -14,15 +14,15 @@ maintainers:
   email: subash.dangol@citrix.com
 dependencies:
   - name: citrix-ingress-controller
-    version: "1.14.17"
+    version: "1.15.12"
     condition: cic.enabled
     alias: cic
   - name: citrix-cpx-with-ingress-controller
-    version: "1.14.17"
+    version: "1.15.12"
     condition: cpx.enabled
     alias: cpx
   - name: citrix-multi-cluster-ingress-controller
-    version: "1.14.17"
+    version: "1.15.12"
     condition: mcIngress.enabled
     alias: mcIngress
   - name: citrix-node-controller

citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "1.14.17"
+appVersion: "1.15.12"
 description: A Helm chart for Citrix ADC CPX with Citrix ingress Controller running as sidecar.
 name: citrix-cpx-with-ingress-controller
-version: 1.14.17
+version: 1.15.12
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
 home: https://www.citrix.com
 sources:

citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/README.md

@@ -109,6 +109,27 @@ Use the following command for this:
   ```
   helm install my-release citrix/citrix-cloud-native --set cpx.enabled=true,cpx.license.accept=yes,cpx.openshift=true,cpx.exporter.required=true
   ```
+### Installed components
+
+The following components are installed:
+
+-  [Citrix ADC CPX](https://docs.citrix.com/en-us/citrix-adc-cpx/netscaler-cpx.html)
+-  [Citrix ingress controller](https://github.com/citrix/citrix-k8s-ingress-controller) (if enabled)
+-  [Exporter](https://github.com/citrix/citrix-adc-metrics-exporter) (if enabled)
+
+## Configuration for ServiceGraph:
+   If Citrix ADC CPX need to send data to the Citrix ADM to bring up the servicegraph, then the below steps can be followed to install Citrix ADC CPX with ingress controller. Citrix ingress controller configures Citrix ADC CPX with the configuration required for servicegraph.
+
+   1. Create secret using Citrix ADC Agent credentials, which will be used by Citrix ADC CPX to communicate with Citrix ADM Agent:
+
+	kubectl create secret generic admlogin --from-literal=username=<adm-agent-username> --from-literal=password=<adm-agent-password>
+
+   2. Deploy Citrix ADC CPX with Citrix ingress controller using helm command:
+
+	helm install my-release citrix/citrix-cloud-native --set cpx.enabled=true,cpx.license.accept=yes,cpx.coeConfig.required=true,cpx.coeConfig.timeseries.metrics.enable=true,cpx.coeConfig.distributedTracing.enable=true,cpx.coeConfig.endpoint.server=<ADM-Agent-IP>,cpx.ADMSettings.ADMIP=<ADM-Agent-IP>,cpx.ADMSettings.loginSecret=<Secret-for-ADM-Agent-credentials>
+
+> **Note:**
+> If container agent is being used here for Citrix ADM, please provide `svcIP` of container agent in the `cpx.coeConfig.endpoint.server` parameter.
 
 ## Citrix ADC CPX DaemonSet with Citrix Ingress Controller as sidecar for BGP Advertisement
 The previous section of deploying CPX as a Deployment  requires a Tier-1 Loadbalancer such as Citrix VPX or cloud loadbalancers to route the traffic to CPX instances running in Kubernetes cluster, but you can also leverage  BGP network fabric in your on-prem environemnt to route the traffic to CPX instances in a Kubernetes or Openshift cluster. you need to deploy CPX with Citrix Ingress Controller as Daemonset to advertise the ExternalIPs of the K8s services of type LoadBalancer to your BGP Fabric. Citrix ADC CPX establishes a BGP peering session with your network routers, and uses that peering session to advertise the IP addresses of external cluster services. If your routers have ECMP capability, the traffic is load-balanced to multiple CPX instances by the upstream router, which in turn load-balances to actual application pods. When you deploy the Citrix ADC CPX with this mode, Citrix ADC CPX adds iptables rules for each service of type LoadBalancer on Kubernetes nodes. The traffic destined to the external IP address is routed to Citrix ADC CPX pods. You can also set the 'ingressIP' variable to an IP Address to advertise the External IP address for Ingress resources. Refer [documentation](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/docs/network/cpx-bgp-router.md) for complete details about BGP advertisement with CPX.
@@ -260,23 +281,6 @@ If you are running Citrix IPAM controller for auto allocation of IPs for Service
    helm install my-release ./citrix-cpx-with-ingress-controller --set license.accept=yes,cpxBgpRouter=true,ingressIP=<Ingress External IP Address>,openshift=true,exporter.required=true
    ```
 
-### Installed components
-
-The following components are installed:
-
--  [Citrix ADC CPX](https://docs.citrix.com/en-us/citrix-adc-cpx/netscaler-cpx.html)
--  [Citrix ingress controller](https://github.com/citrix/citrix-k8s-ingress-controller) (if enabled)
--  [Exporter](https://github.com/citrix/citrix-adc-metrics-exporter) (if enabled)
-
-### Installed components
-
-The following components are installed:
-
--  [Citrix ADC CPX](https://docs.citrix.com/en-us/citrix-adc-cpx/netscaler-cpx.html)
--  [Citrix ingress controller](https://github.com/citrix/citrix-k8s-ingress-controller) (if enabled)
--  [Exporter](https://github.com/citrix/citrix-adc-metrics-exporter) (if enabled)
-
-
 ## CRDs configuration
 
 CRDs can be installed/upgraded when we install/upgrade Citrix ADC CPX with Citrix ingress controller using `crds.install=true` parameter in Helm. If you do not want to install CRDs, then set the option `crds.install` to `false`. By default, CRDs too get deleted if you uninstall through Helm. This means, even the CustomResource objects created by the customer will get deleted. If you want to avoid this data loss set `crds.retainOnDelete` to `true`.
@@ -376,7 +380,7 @@ The following table lists the configurable parameters of the Citrix ADC CPX with
 | cpx.license.accept | Mandatory | no | Set `yes` to accept the Citrix ingress controller end user license agreement. |
 | cpx.image | Mandatory | `quay.io/citrix/citrix-k8s-cpx-ingress:13.0-76.29` | The Citrix ADC CPX image. |
 | cpx.pullPolicy | Mandatory | IfNotPresent | The Citrix ADC CPX image pull policy. |
-| cpx.cic.image | Mandatory | `quay.io/citrix/citrix-k8s-ingress-controller:1.14.17` | The Citrix ingress controller image. |
+| cpx.cic.image | Mandatory | `quay.io/citrix/citrix-k8s-ingress-controller:1.15.12` | The Citrix ingress controller image. |
 | cpx.cic.pullPolicy | Mandatory | IfNotPresent | The Citrix ingress controller image pull policy. |
 | cpx.cic.required | Mandatory | true | CIC to be run as sidecar with Citrix ADC CPX |
 | cpx.logLevel | Optional | DEBUG | The loglevel to control the logs generated by CIC. The supported loglevels are: CRITICAL, ERROR, WARNING, INFO, DEBUG and TRACE. For more information, see [Logging](https://github.com/citrix/citrix-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
@@ -417,7 +421,6 @@ The following table lists the configurable parameters of the Citrix ADC CPX with
 | cpx.ADMSettings.licenseServerIP | Optional | N/A | Provide the Citrix Application Delivery Management (ADM) IP address to license Citrix ADC CPX. For more information, see [Licensing](https://developer-docs.citrix.com/projects/citrix-k8s-ingress-controller/en/latest/licensing/)|
 | cpx.ADMSettings.licenseServerPort | Optional | 27000 | Citrix ADM port if non-default port is used. |
 | cpx.ADMSettings.ADMIP | Optional | |  Citrix Application Delivery Management (ADM) IP address. |
-| cpx.ADMSettings.ADMFingerPrint | Optional | N/A | Citrix Application Delivery Management (ADM) Finger Print. For more information, see [this](https://docs.citrix.com/en-us/citrix-application-delivery-management-service/application-analytics-and-management/service-graph.html). |
 | cpx.ADMSettings.loginSecret | Optional | N/A | The secret key to login to the ADM. For information on how to create the secret keys, see [Prerequisites](#prerequistes). |
 | cpx.ADMSettings.bandWidthLicense | Optional | False | Set to true if you want to use bandwidth based licensing for Citrix ADC CPX. |
 | cpx.ADMSettings.bandWidth | Optional | N/A | Desired bandwidth capacity to be set for Citrix ADC CPX in Mbps. |

citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml

@@ -62,8 +62,6 @@ spec:
 {{- if .Values.ADMSettings.ADMIP }}
           - name: "NS_MGMT_SERVER"
             value: {{ .Values.ADMSettings.ADMIP | quote }}
-          - name: "NS_MGMT_FINGER_PRINT"
-            value: {{ .Values.ADMSettings.ADMFingerPrint | quote }}
           - name: "NS_HTTP_PORT"
             value: {{ .Values.mgmtHttpPort | quote }}
           - name: "NS_HTTPS_PORT"
@@ -203,8 +201,13 @@ spec:
 {{- end }}
 {{- end }}
 {{- if .Values.updateIngressStatus }}
+{{- if .Values.cpxBgpRouter }}
+            - --update-ingress-status
+              yes
+{{- else }}
             - --cpx-service
               {{ .Release.Namespace }}/{{ include "cpxservice.fullname" . }}
+{{- end }}
 {{- end }}
           volumeMounts:
             - mountPath: /var/deviceinfo
@@ -297,7 +300,7 @@ metadata:
 {{- end }}
 {{- end }}
 spec:
-{{- if or ( and .Values.aws .Values.sslCertManagedByAWS) .Values.serviceType.loadBalancer.enabled .Values.updateIngressStatus }}
+{{- if or ( and .Values.aws .Values.sslCertManagedByAWS) .Values.serviceType.loadBalancer.enabled ( and (.Values.updateIngressStatus) (not .Values.cpxBgpRouter)) }}
   externalTrafficPolicy: {{ .Values.serviceType.loadBalancer.externalTrafficPolicy }}
   type: LoadBalancer
 {{- else if .Values.serviceType.nodePort.enabled }}

citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/values.yaml

@@ -66,7 +66,7 @@ serviceAnnotations:
 
 # Citrix Ingress Controller config details
 cic:
-  image: quay.io/citrix/citrix-k8s-ingress-controller:1.14.17
+  image: quay.io/citrix/citrix-k8s-ingress-controller:1.15.12
   pullPolicy: IfNotPresent
   required: true
 entityPrefix:
@@ -85,7 +85,6 @@ ADMSettings:
   licenseServerIP:
   licenseServerPort: 27000
   ADMIP:
-  ADMFingerPrint:
   loginSecret:
   bandWidthLicense: false
   bandWidth:

citrix-cloud-native/charts/citrix-ingress-controller/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "1.14.17"
+appVersion: "1.15.12"
 description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
 name: citrix-ingress-controller
-version: 1.14.17
+version: 1.15.12
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
 home: https://www.citrix.com
 sources:

citrix-cloud-native/charts/citrix-ingress-controller/README.md

@@ -180,6 +180,20 @@ The following components are installed:
 -  [Citrix ingress controller](https://github.com/citrix/citrix-k8s-ingress-controller)
 -  [Exporter](https://github.com/citrix/citrix-adc-metrics-exporter) (if enabled)
 
+## Configuration for ServiceGraph:
+   If Citrix ADC VPX/MPX need to send data to the Citrix ADM to bring up the servicegraph, then the below steps can be followed to install Citrix ingress controller for Citrix ADC VPX/MPX. Citrix ingress controller configures Citrix ADC VPX/MPX with the configuration required for servicegraph.
+
+   1. Create secret using Citrix ADC VPX credentials, which will be used by Citrix ingress controller for configuring Citrix ADC VPX/MPX:
+
+	kubectl create secret generic nslogin --from-literal=username='cic' --from-literal=password='mypassword'
+
+   2. Deploy Citrix ingress controller using helm command:
+
+	helm install my-release citrix/citrix-cloud-native --set cic.enabled=true,cic.nsIP=<NSIP>,cic.nsVIP=<NSVIP>,cic.license.accept=yes,cic.adcCredentialSecret=<Secret-of-Citrix-ADC-credentials>,cic.coeConfig.required=true,cic.coeConfig.timeseries.metrics.enable=true,cic.coeConfig.timeseries.port=5563,cic.coeConfig.distributedTracing.enable=true,cic.coeConfig.transactions.enable=true,cic.coeConfig.transactions.port=5557,cic.coeConfig.endpoint.server=<ADM-Agent-IP>
+
+> **Note:**
+> If container agent is being used here for Citrix ADM, please provide `podIP` of container agent in the `cic.coeConfig.endpoint.server` parameter.
+
 ## CRDs configuration
 
 CRDs can be installed/upgraded when we install/upgrade Citrix ingress controller using `crds.install=true` parameter in Helm. If you do not want to install CRDs, then set the option `crds.install` to `false`. By default, CRDs too get deleted if you uninstall through Helm. This means, even the CustomResource objects created by the customer will get deleted. If you want to avoid this data loss set `crds.retainOnDelete` to `true`.
@@ -276,7 +290,7 @@ The following table lists the mandatory and optional parameters that you can con
 | --------- | --------------------- | ------------- | ----------- |
 | cic.enabled | Mandatory | False | Set to "True" for deploying Citrix Ingress Controller for Citrix ADC VPX/MPX. |
 | cic.license.accept | Mandatory | no | Set `yes` to accept the CIC end user license agreement. |
-| cic.image | Mandatory | `quay.io/citrix/citrix-k8s-ingress-controller:1.14.17` | The CIC image. |
+| cic.image | Mandatory | `quay.io/citrix/citrix-k8s-ingress-controller:1.15.12` | The CIC image. |
 | cic.pullPolicy | Mandatory | IfNotPresent | The CIC image pull policy. |
 | cic.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). |
 | cic.nsIP | Mandatory | N/A | The IP address of the Citrix ADC device. For details, see [Prerequisites](#prerequistes). |

citrix-cloud-native/charts/citrix-ingress-controller/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.14.17
+image: quay.io/citrix/citrix-k8s-ingress-controller:1.15.12
 pullPolicy: IfNotPresent
 openshift: false
 adcCredentialSecret:

citrix-cloud-native/charts/citrix-multi-cluster-ingress-controller/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "1.14.17"
+appVersion: "1.15.12"
 description: A Helm chart for Citrix Multi-Cluster Ingress Controller configuring MPX/VPX.
 name: citrix-multi-cluster-ingress-controller
-version: 1.14.17
+version: 1.15.12
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
 home: https://www.citrix.com
 maintainers:

citrix-cloud-native/charts/citrix-multi-cluster-ingress-controller/README.md

@@ -170,7 +170,7 @@ The following table lists the mandatory and optional parameters that you can con
 | Parameters | Mandatory or Optional | Default value | Description |
 | --------- | --------------------- | ------------- | ----------- |
 | mcIngress.license.accept | Mandatory | no | Set `yes` to accept the CIC end user license agreement. |
-| mcIngress.image | Optional | `quay.io/citrix/citrix-k8s-ingress-controller:1.14.17` | The CIC image. |
+| mcIngress.image | Optional | `quay.io/citrix/citrix-k8s-ingress-controller:1.15.12` | The CIC image. |
 | mcIngress.pullPolicy | Optional | Always | The CIC image pull policy. |
 | mcIngress.nsPort | Optional | 443 | The port used by CIC to communicate with Citrix ADC. You can use port 80 for HTTP. |
 | mcIngress.nsProtocol | Optional | HTTPS | The protocol used by CIC to communicate with Citrix ADC. You can also use HTTP on port 80. |

citrix-cloud-native/charts/citrix-multi-cluster-ingress-controller/values.yaml

@@ -3,7 +3,7 @@
 # Declare variables to be passed into your templates.
 
 # image contains information needed to fetch CIC image
-image: quay.io/citrix/citrix-k8s-ingress-controller:1.14.17
+image: quay.io/citrix/citrix-k8s-ingress-controller:1.15.12
 pullPolicy: IfNotPresent
 # openshift is set to true if charts are being deployed in OpenShift environment.
 openshift: false

citrix-cpx-with-ingress-controller/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: "1.14.17"
+appVersion: "1.15.12"
 description: A Helm chart for Citrix ADC CPX with Citrix ingress Controller running as sidecar.
 name: citrix-cpx-with-ingress-controller
-version: 1.14.17
+version: 1.15.12
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
 home: https://www.citrix.com
 sources: