Releasing CIC v1.34.16 (#160)

* Releasing CIC v1.34.16 Signed-off-by: Subash Dangol <subash.dangol@citrix.com>
netscaler · Jul 25, 2023 · defe87d · defe87d
1 parent a471517
commit defe87d
Show file tree

Hide file tree

Showing 34 changed files with 84 additions and 56 deletions.
diff --git a/citrix-cloud-native/Chart.yaml b/citrix-cloud-native/Chart.yaml
@@ -14,15 +14,15 @@ maintainers:
   email: subash.dangol@cloud.com
 dependencies:
   - name: citrix-ingress-controller
-    version: "1.33.4"
+    version: "1.34.16"
     condition: cic.enabled
     alias: cic
   - name: citrix-cpx-with-ingress-controller
-    version: "1.33.4"
+    version: "1.34.16"
     condition: cpx.enabled
     alias: cpx
   - name: citrix-multi-cluster-ingress-controller
-    version: "1.33.4"
+    version: "1.34.16"
     condition: mcIngress.enabled
     alias: mcIngress
   - name: citrix-node-controller

diff --git a/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/Chart.yaml b/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.33.4"
+appVersion: "1.34.16"
 kubeVersion: ">=v1.16.0-0"
 description: A Helm chart for Citrix ADC CPX with Citrix ingress Controller running as sidecar.
 name: citrix-cpx-with-ingress-controller
-version: 1.33.4
+version: 1.34.16
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
 home: https://www.cloud.com
 sources:

diff --git a/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/README.md b/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/README.md
@@ -456,12 +456,12 @@ 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.imageRegistry                   | Mandatory  |  `quay.io`               |  The Citrix ADC CPX image registry             |  
 | cpx.imageRepository                 | Mandatory  |  `citrix/citrix-k8s-cpx-ingress`              |   The Citrix ADC CPX image repository             | 
-| cpx.imageTag                  | Mandatory  |  `13.1-30.52`               |   The Citrix ADC CPX image tag            | 
+| cpx.imageTag                  | Mandatory  |  `13.1-49.13`               |   The Citrix ADC CPX image tag            | 
 | cpx.pullPolicy | Mandatory | IfNotPresent | The Citrix ADC CPX image pull policy. |
 | cpx.daemonSet | Optional | False | Set this to true if Citrix ADC CPX needs to be deployed as DaemonSet. |
 | cpx.cic.imageRegistry                   | Mandatory  |  `quay.io`               |  The Citrix ingress controller image registry             |  
 | cpx.cic.imageRepository                 | Mandatory  |  `citrix/citrix-k8s-ingress-controller`              |   The Citrix ingress controller image repository             | 
-| cpx.cic.imageTag                  | Mandatory  |  `1.33.4`               |   The Citrix ingress controller image tag            | 
+| cpx.cic.imageTag                  | Mandatory  |  `1.34.16`               |   The Citrix ingress controller image tag            | 
 | 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.cic.resources | Optional | {} |	CPU/Memory resource requests/limits for Citrix Ingress Controller container |
@@ -529,10 +529,11 @@ The following table lists the configurable parameters of the Citrix ADC CPX with
 | cpx.exporter.required | Optional | false | Use the argument if you want to run the [Exporter for Citrix ADC Stats](https://github.com/citrix/citrix-adc-metrics-exporter) along with Citrix ingress controller to pull metrics for the Citrix ADC CPX|
 | cpx.exporter.imageRegistry                   | Optional  |  `quay.io`               |  The Exporter for Citrix ADC Stats image registry             |  
 | cpx.exporter.imageRepository                 | Optional  |  `citrix/citrix-adc-metrics-exporter`              |   The Exporter for Citrix ADC Stats image repository             | 
-| cpx.exporter.imageTag                  | Optional  |  `1.4.9`               |  The Exporter for Citrix ADC Stats image tag            | 
+| cpx.exporter.imageTag                  | Optional  |  `1.4.9`               |  The Exporter for Citrix ADC Stats image tag|
 | cpx.exporter.pullPolicy | Optional | IfNotPresent | The Exporter for Citrix ADC Stats image pull policy. |
 | cpx.exporter.resources | Optional | {} |	CPU/Memory resource requests/limits for Metrics exporter container |
 | cpx.exporter.ports.containerPort | Optional | 8888 | The Exporter for Citrix ADC Stats container port. |
+| cpx.exporter.serviceMonitorExtraLabels | Optional |  | Extra labels for service monitor whem Citrix-adc-metrics-exporter is enabled. | 
 | cpx.analyticsConfig.required | Mandatory | false | Set this to true if you want to configure Citrix ADC to send metrics and transaction records to Analytics service. |
 | cpx.analyticsConfig.distributedTracing.enable | Optional | false | Set this value to true to enable OpenTracing in Citrix ADC. |
 | cpx.analyticsConfig.distributedTracing.samplingrate | Optional | 100 | Specifies the OpenTracing sampling rate in percentage. |

diff --git a/...ud-native/charts/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml b/...ud-native/charts/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml
@@ -396,6 +396,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     servicemonitor: citrix-adc-cpx
+    {{- with .Values.exporter.serviceMonitorExtraLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   endpoints:
   - interval: 30s

diff --git a/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/values.yaml b/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/values.yaml
@@ -5,7 +5,7 @@
 # Citrix ADC CPX config details
 imageRegistry: quay.io
 imageRepository: citrix/citrix-k8s-cpx-ingress
-imageTag: 13.1-37.38
+imageTag: 13.1-49.13
 image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageTag }}"
 pullPolicy: IfNotPresent
 imagePullSecrets: []
@@ -82,7 +82,7 @@ servicePorts: []
 cic:
   imageRegistry: quay.io
   imageRepository: citrix/citrix-k8s-ingress-controller
-  imageTag: 1.33.4
+  imageTag: 1.34.16
   image: "{{ .Values.cic.imageRegistry }}/{{ .Values.cic.imageRepository }}:{{ .Values.cic.imageTag }}"
   pullPolicy: IfNotPresent
   required: true
@@ -166,7 +166,7 @@ exporter:
     # requests:
     #   cpu: 100m
     #   memory: 128Mi
-
+  serviceMonitorExtraLabels: {}
 
 # For CRDs supported by Citrix Ingress Controller
 crds:

diff --git a/citrix-cloud-native/charts/citrix-ingress-controller/Chart.yaml b/citrix-cloud-native/charts/citrix-ingress-controller/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.33.4"
+appVersion: "1.34.16"
 kubeVersion: ">=v1.16.0-0"
 description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
 name: citrix-ingress-controller
-version: 1.33.4
+version: 1.34.16
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
 home: https://www.cloud.com
 sources:

diff --git a/citrix-cloud-native/charts/citrix-ingress-controller/README.md b/citrix-cloud-native/charts/citrix-ingress-controller/README.md
@@ -323,7 +323,7 @@ The following table lists the mandatory and optional parameters that you can con
 | cic.license.accept | Mandatory | no | Set `yes` to accept the CIC end user license agreement. |
 | cic.imageRegistry                   | Mandatory  |  `quay.io`               |  The Citrix ingress controller image registry             |  
 | cic.imageRepository                 | Mandatory  |  `citrix/citrix-k8s-ingress-controller`              |   The Citrix ingress controller image repository             | 
-| cic.imageTag                  | Mandatory  |  `1.33.4`               |   The Citrix ingress controller image tag            | 
+| cic.imageTag                  | Mandatory  |  `1.34.16`               |   The Citrix ingress controller image tag            | 
 | cic.pullPolicy | Mandatory | IfNotPresent | The CIC image pull policy. |
 | cic.imagePullSecrets | Optional | N/A | Provide list of Kubernetes secrets to be used for pulling the images from a private Docker registry or repository. For more information on how to create this secret please see [Pull an Image from a Private Registry](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/). |
 | cic.nameOverride | Optional | N/A | String to partially override deployment fullname template with a string (will prepend the release name) |
@@ -373,11 +373,12 @@ The following table lists the mandatory and optional parameters that you can con
 | cic.exporter.required | Optional | false | Use the argument, if you want to run the [Exporter for Citrix ADC Stats](https://github.com/citrix/citrix-adc-metrics-exporter) along with CIC to pull metrics for the Citrix ADC VPX or MPX|
 | cic.exporter.imageRegistry                   | Optional  |  `quay.io`               |  The Exporter for Citrix ADC Stats image registry             |  
 | cic.exporter.imageRepository                 | Optional  |  `citrix/citrix-adc-metrics-exporter`              |   The Exporter for Citrix ADC Stats image repository             | 
-| cic.exporter.imageTag                  | Optional  |  `1.4.9`               |  The Exporter for Citrix ADC Stats image tag            | 
+| cic.exporter.imageTag                  | Optional  |  `1.4.9`               |  The Exporter for Citrix ADC Stats image tag            |
 | cic.exporter.pullPolicy | Optional | IfNotPresent | The Exporter image pull policy. |
 | cic.exporter.ports.containerPort | Optional | 8888 | The Exporter container port. |
 | cic.exporter.resources | Optional | {} |	CPU/Memory resource requests/limits for Metrics exporter container |
 | cic.exporter.extraVolumeMounts  |  Optional |  [] |  Specify the Additional VolumeMounts to be mounted in Exporter container. Specify the volumes in `cic.extraVolumes`  |
+| cic.exporter.serviceMonitorExtraLabels | Optional |  | Extra labels for service monitor whem Citrix-adc-metrics-exporter is enabled. |
 | cic.openshift | Optional | false | Set this argument if OpenShift environment is being used. |
 | cic.disableOpenshiftRoutes | Optional | false | By default Openshift routes are processed in openshift environment, this variable can be used to disable Ingress controller processing the openshift routes. |
 | cic.nodeSelector.key | Optional | N/A | Node label key to be used for nodeSelector option in CIC deployment. |

diff --git a/citrix-cloud-native/charts/citrix-ingress-controller/templates/citrix-k8s-ingress.yaml b/citrix-cloud-native/charts/citrix-ingress-controller/templates/citrix-k8s-ingress.yaml
@@ -248,6 +248,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     servicemonitor: citrix-adc
+    {{- with .Values.exporter.serviceMonitorExtraLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   endpoints:
   - interval: 30s

diff --git a/citrix-cloud-native/charts/citrix-ingress-controller/values.yaml b/citrix-cloud-native/charts/citrix-ingress-controller/values.yaml
@@ -5,7 +5,7 @@
 # Citrix Ingress Controller config details
 imageRegistry: quay.io
 imageRepository: citrix/citrix-k8s-ingress-controller
-imageTag: 1.33.4
+imageTag: 1.34.16
 image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageTag }}"
 pullPolicy: IfNotPresent
 imagePullSecrets: []
@@ -119,6 +119,7 @@ exporter:
   #  readOnly: true
   #- name: agent-init-scripts
   #  mountPath: /docker-entrypoint.d/
+  serviceMonitorExtraLabels: {}
 
 # For CRDs supported by Citrix Ingress Controller
 crds:

diff --git a/citrix-cloud-native/charts/citrix-multi-cluster-ingress-controller/Chart.yaml b/citrix-cloud-native/charts/citrix-multi-cluster-ingress-controller/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
-appVersion: "1.33.4"
+appVersion: "1.34.16"
 description: A Helm chart for Citrix Multi-Cluster Ingress Controller configuring MPX/VPX.
 name: citrix-multi-cluster-ingress-controller
-version: 1.33.4
+version: 1.34.16
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
 home: https://www.cloud.com
 maintainers:

diff --git a/citrix-cloud-native/charts/citrix-multi-cluster-ingress-controller/README.md b/citrix-cloud-native/charts/citrix-multi-cluster-ingress-controller/README.md
@@ -172,7 +172,7 @@ The following table lists the mandatory and optional parameters that you can con
 | mcIngress.license.accept | Mandatory | no | Set `yes` to accept the CIC end user license agreement. |
 | mcIngress.imageRegistry                   | Optional  |  `quay.io`               |  The Citrix ingress controller image registry             |  
 | mcIngress.imageRepository                 | Optional  |  `citrix/citrix-k8s-ingress-controller`              |   The Citrix ingress controller image repository             | 
-| mcIngress.imageTag                  | Optional  |  `1.33.4`               |   The Citrix ingress controller image tag            | 
+| mcIngress.imageTag                  | Optional  |  `1.34.16`               |   The Citrix ingress controller image tag            | 
 | 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. |

diff --git a/citrix-cloud-native/charts/citrix-multi-cluster-ingress-controller/values.yaml b/citrix-cloud-native/charts/citrix-multi-cluster-ingress-controller/values.yaml
@@ -5,7 +5,7 @@
 # image contains information needed to fetch CIC image
 imageRegistry: quay.io
 imageRepository: citrix/citrix-k8s-ingress-controller
-imageTag: 1.33.4
+imageTag: 1.34.16
 image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageTag }}"
 pullPolicy: IfNotPresent
 # openshift is set to true if charts are being deployed in OpenShift environment.

diff --git a/citrix-cpx-with-ingress-controller/Chart.yaml b/citrix-cpx-with-ingress-controller/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.33.4"
+appVersion: "1.34.16"
 kubeVersion: ">=v1.16.0-0"
 description: A Helm chart for Citrix ADC CPX with Citrix ingress Controller running as sidecar.
 name: citrix-cpx-with-ingress-controller
-version: 1.33.4
+version: 1.34.16
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
 home: https://www.cloud.com
 sources:

diff --git a/citrix-cpx-with-ingress-controller/README.md b/citrix-cpx-with-ingress-controller/README.md
@@ -450,12 +450,12 @@ The following table lists the configurable parameters of the Citrix ADC CPX with
 | license.accept | Mandatory | no | Set `yes` to accept the Citrix ingress controller end user license agreement. |
 | imageRegistry                   | Mandatory  |  `quay.io`               |  The Citrix ADC CPX image registry             |  
 | imageRepository                 | Mandatory  |  `citrix/citrix-k8s-cpx-ingress`              |   The Citrix ADC CPX image repository             | 
-| imageTag                  | Mandatory  |  `13.1-30.52`               |   The Citrix ADC CPX image tag            | 
+| imageTag                  | Mandatory  |  `13.1-49.13`               |   The Citrix ADC CPX image tag            | 
 | pullPolicy | Mandatory | IfNotPresent | The Citrix ADC CPX image pull policy. |
 | daemonSet | Optional | False | Set this to true if Citrix ADC CPX needs to be deployed as DaemonSet. |
 | cic.imageRegistry                   | Mandatory  |  `quay.io`               |  The Citrix ingress controller image registry             |  
 | cic.imageRepository                 | Mandatory  |  `citrix/citrix-k8s-ingress-controller`              |   The Citrix ingress controller image repository             | 
-| cic.imageTag                  | Mandatory  |  `1.33.4`               |   The Citrix ingress controller image tag            | 
+| cic.imageTag                  | Mandatory  |  `1.34.16`               |   The Citrix ingress controller image tag            | 
 | cic.pullPolicy | Mandatory | IfNotPresent | The Citrix ingress controller image pull policy. |
 | cic.required | Mandatory | true | CIC to be run as sidecar with Citrix ADC CPX |
 | cic.resources | Optional | {} |	CPU/Memory resource requests/limits for Citrix Ingress Controller container |
@@ -523,10 +523,11 @@ The following table lists the configurable parameters of the Citrix ADC CPX with
 | exporter.required | Optional | false | Use the argument if you want to run the [Exporter for Citrix ADC Stats](https://github.com/citrix/citrix-adc-metrics-exporter) along with Citrix ingress controller to pull metrics for the Citrix ADC CPX|
 | exporter.imageRegistry                   | Optional  |  `quay.io`               |  The Exporter for Citrix ADC Stats image registry             |  
 | exporter.imageRepository                 | Optional  |  `citrix/citrix-adc-metrics-exporter`              |   The Exporter for Citrix ADC Stats image repository             | 
-| exporter.imageTag                  | Optional  |  `1.4.9`               |  The Exporter for Citrix ADC Stats image tag            | 
+| exporter.imageTag                  | Optional  |  `1.4.9`               |  The Exporter for Citrix ADC Stats image tag            |
 | exporter.pullPolicy | Optional | IfNotPresent | The Exporter for Citrix ADC Stats image pull policy. |
 | exporter.resources | Optional | {} |	CPU/Memory resource requests/limits for Metrics exporter container |
 | exporter.ports.containerPort | Optional | 8888 | The Exporter for Citrix ADC Stats container port. |
+| exporter.serviceMonitorExtraLabels | Optional |  | Extra labels for service monitor whem Citrix-adc-metrics-exporter is enabled. |
 | analyticsConfig.required | Mandatory | false | Set this to true if you want to configure Citrix ADC to send metrics and transaction records to analytics service. |
 | analyticsConfig.distributedTracing.enable | Optional | false | Set this value to true to enable OpenTracing in Citrix ADC. |
 | analyticsConfig.distributedTracing.samplingrate | Optional | 100 | Specifies the OpenTracing sampling rate in percentage. |

diff --git a/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml b/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml
@@ -406,6 +406,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     servicemonitor: citrix-adc-cpx
+    {{- with .Values.exporter.serviceMonitorExtraLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   endpoints:
   - interval: 30s

diff --git a/citrix-cpx-with-ingress-controller/values.yaml b/citrix-cpx-with-ingress-controller/values.yaml
@@ -5,7 +5,7 @@
 # Citrix ADC CPX config details
 imageRegistry: quay.io
 imageRepository: citrix/citrix-k8s-cpx-ingress
-imageTag: 13.1-37.38
+imageTag: 13.1-49.13
 image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageTag }}"
 pullPolicy: IfNotPresent
 imagePullSecrets: []
@@ -82,7 +82,7 @@ servicePorts: []
 cic:
   imageRegistry: quay.io
   imageRepository: citrix/citrix-k8s-ingress-controller
-  imageTag: 1.33.4
+  imageTag: 1.34.16
   image: "{{ .Values.cic.imageRegistry }}/{{ .Values.cic.imageRepository }}:{{ .Values.cic.imageTag }}"
   pullPolicy: IfNotPresent
   required: true
@@ -167,7 +167,7 @@ exporter:
     # requests:
     #   cpu: 100m
     #   memory: 128Mi
-
+  serviceMonitorExtraLabels: {}
 
 # For CRDs supported by Citrix Ingress Controller
 crds:

diff --git a/citrix-ingress-controller/Chart.yaml b/citrix-ingress-controller/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: "1.33.4"
+appVersion: "1.34.16"
 kubeVersion: ">=v1.16.0-0"
 description: A Helm chart for Citrix Ingress Controller configuring MPX/VPX.
 name: citrix-ingress-controller
-version: 1.33.4
+version: 1.34.16
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png
 home: https://www.cloud.com
 sources:

diff --git a/citrix-ingress-controller/README.md b/citrix-ingress-controller/README.md
@@ -316,7 +316,7 @@ The following table lists the mandatory and optional parameters that you can con
 | license.accept | Mandatory | no | Set `yes` to accept the CIC end user license agreement. |
 | imageRegistry                   | Mandatory  |  `quay.io`               |  The Citrix ingress controller image registry             |  
 | imageRepository                 | Mandatory  |  `citrix/citrix-k8s-ingress-controller`              |   The Citrix ingress controller image repository             | 
-| imageTag                  | Mandatory  |  `1.33.4`               |   The Citrix ingress controller image tag            | 
+| imageTag                  | Mandatory  |  `1.34.16`               |   The Citrix ingress controller image tag            | 
 | pullPolicy | Mandatory | IfNotPresent | The CIC image pull policy. |
 | imagePullSecrets | Optional | N/A | Provide list of Kubernetes secrets to be used for pulling the images from a private Docker registry or repository. For more information on how to create this secret please see [Pull an Image from a Private Registry](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/). |
 | nameOverride | Optional | N/A | String to partially override deployment fullname template with a string (will prepend the release name) |
@@ -371,6 +371,7 @@ The following table lists the mandatory and optional parameters that you can con
 | exporter.ports.containerPort | Optional | 8888 | The Exporter container port. |
 | exporter.resources | Optional | {} |	CPU/Memory resource requests/limits for Metrics exporter container |
 | exporter.extraVolumeMounts  |  Optional |  [] |  Specify the Additional VolumeMounts to be mounted in Exporter container. Specify the volumes in `extraVolumes`  |
+| exporter.serviceMonitorExtraLabels | Optional |  | Extra labels for service monitor whem Citrix-adc-metrics-exporter is enabled. |s
 | openshift | Optional | false | Set this argument if OpenShift environment is being used. |
 | disableOpenshiftRoutes | Optional | false | By default Openshift routes are processed in openshift environment, this variable can be used to disable Ingress controller processing the openshift routes. |
 | nodeSelector.key | Optional | N/A | Node label key to be used for nodeSelector option in CIC deployment. |

diff --git a/citrix-ingress-controller/templates/citrix-k8s-ingress.yaml b/citrix-ingress-controller/templates/citrix-k8s-ingress.yaml
@@ -248,6 +248,9 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     servicemonitor: citrix-adc
+    {{- with .Values.exporter.serviceMonitorExtraLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   endpoints:
   - interval: 30s