diff --git a/citrix-cloud-native/Chart.yaml b/citrix-cloud-native/Chart.yaml index 13a36f7..16327f6 100644 --- 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 index b87b1e3..fc0dd64 100644 --- 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 index 208a7ec..1a6fa4f 100644 --- 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/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml b/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml index c18f35e..77e0127 100644 --- a/citrix-cloud-native/charts/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml +++ b/citrix-cloud-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 index 9577f99..e9aba50 100644 --- 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 index 26edd9d..3a9df3c 100644 --- 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 index 885c134..ba282ae 100644 --- 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 index ac0ba09..45d14b6 100644 --- 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 index 50f405c..f11c977 100644 --- 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 index 62ed98a..f73a110 100644 --- 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 index 2edffaa..5ba13bc 100644 --- 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 index ec7b2c7..d43e327 100644 --- 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 index b87b1e3..fc0dd64 100644 --- 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 index e055688..478a451 100644 --- 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 index d7d610e..f265d4e 100644 --- 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 index 9f20aa0..bb9e1f9 100644 --- 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 index 26edd9d..3a9df3c 100644 --- 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 index c2f193f..e70970a 100644 --- 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 index ac0ba09..45d14b6 100644 --- 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 diff --git a/citrix-ingress-controller/values.yaml b/citrix-ingress-controller/values.yaml index 1a2f8bf..fa2551f 100644 --- a/citrix-ingress-controller/values.yaml +++ b/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: [] @@ -14,7 +14,7 @@ fullnameOverride: "" openshift: false adcCredentialSecret: # K8s Secret Name # Enable secretStore to implement CSI Secret Provider classes for holding the nslogin credentials -secretStore: +secretStore: enabled: false username: {} #valueFrom: @@ -115,6 +115,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-multi-cluster-ingress-controller/Chart.yaml b/citrix-multi-cluster-ingress-controller/Chart.yaml index 62ed98a..b6b3ba6 100644 --- a/citrix-multi-cluster-ingress-controller/Chart.yaml +++ b/citrix-multi-cluster-ingress-controller/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 -appVersion: "1.33.4" +appVersion: "1.32.7" 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-multi-cluster-ingress-controller/README.md b/citrix-multi-cluster-ingress-controller/README.md index 9439f52..aaf4898 100644 --- a/citrix-multi-cluster-ingress-controller/README.md +++ b/citrix-multi-cluster-ingress-controller/README.md @@ -172,7 +172,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 | Optional | `quay.io` | The Citrix ingress controller image registry | | imageRepository | Optional | `citrix/citrix-k8s-ingress-controller` | The Citrix ingress controller image repository | -| imageTag | Optional | `1.33.4` | The Citrix ingress controller image tag | +| imageTag | Optional | `1.34.16` | The Citrix ingress controller image tag | | pullPolicy | Optional | Always | The CIC image pull policy. | | nsPort | Optional | 443 | The port used by CIC to communicate with Citrix ADC. You can use port 80 for HTTP. | | 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-multi-cluster-ingress-controller/values.yaml b/citrix-multi-cluster-ingress-controller/values.yaml index e6b3ab5..bce5d15 100644 --- a/citrix-multi-cluster-ingress-controller/values.yaml +++ b/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_cloud_native_values.yaml b/citrix_cloud_native_values.yaml index b7215e2..a7b3dc8 100644 --- a/citrix_cloud_native_values.yaml +++ b/citrix_cloud_native_values.yaml @@ -3,7 +3,7 @@ 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 imagePullSecrets: [] @@ -82,7 +82,6 @@ cic: # sack: 'ENABLED' # nagle: 'ENABLED' - exporter: required: false @@ -112,6 +111,7 @@ cic: # readOnly: true #- name: agent-init-scripts # mountPath: /docker-entrypoint.d/ + serviceMonitorExtraLabels: {} crds: install: false @@ -178,7 +178,7 @@ mcIngress: imageRegistry: quay.io imageRepository: citrix/citrix-k8s-ingress-controller - imageTag: 1.33.4 + imageTag: 1.34.16 image: "{{ .Values.mcIngress.imageRegistry }}/{{ .Values.mcIngress.imageRepository }}:{{ .Values.mcIngress.imageTag }}" pullPolicy: IfNotPresent openshift: false @@ -207,7 +207,7 @@ cpx: imageRegistry: quay.io imageRepository: citrix/citrix-k8s-cpx-ingress - imageTag: 13.1-37.38 + imageTag: 13.1-49.13 image: "{{ .Values.cpx.imageRegistry }}/{{ .Values.cpx.imageRepository }}:{{ .Values.cpx.imageTag }}" pullPolicy: IfNotPresent @@ -266,7 +266,7 @@ cpx: cic: imageRegistry: quay.io imageRepository: citrix/citrix-k8s-ingress-controller - imageTag: 1.33.4 + imageTag: 1.34.16 image: "{{ .Values.cpx.cic.imageRegistry }}/{{ .Values.cpx.cic.imageRepository }}:{{ .Values.cpx.cic.imageTag }}" pullPolicy: IfNotPresent required: true @@ -298,7 +298,7 @@ cpx: cpxCores: analyticsServerPort: 5557 licenseEdition: PLATINUM - + exporter: required: false imageRegistry: quay.io @@ -309,6 +309,7 @@ cpx: ports: containerPort: 8888 resources: {} + serviceMonitorExtraLabels: {} crds: install: false diff --git a/examples/Servicemesh_with_GSLB_and_WAF/manifest/multicluster1.yaml b/examples/Servicemesh_with_GSLB_and_WAF/manifest/multicluster1.yaml index 066c67f..94b0fb3 100644 --- a/examples/Servicemesh_with_GSLB_and_WAF/manifest/multicluster1.yaml +++ b/examples/Servicemesh_with_GSLB_and_WAF/manifest/multicluster1.yaml @@ -4,7 +4,7 @@ nsProtocol: HTTPS entityPrefix: gslb 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 license: diff --git a/examples/Servicemesh_with_GSLB_and_WAF/manifest/multicluster2.yaml b/examples/Servicemesh_with_GSLB_and_WAF/manifest/multicluster2.yaml index 7a3cbaa..7529ff6 100644 --- a/examples/Servicemesh_with_GSLB_and_WAF/manifest/multicluster2.yaml +++ b/examples/Servicemesh_with_GSLB_and_WAF/manifest/multicluster2.yaml @@ -4,7 +4,7 @@ nsProtocol: HTTPS entityPrefix: gslb 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 license: diff --git a/examples/citrix-cpx-with-ingress-controller/Chart.yaml b/examples/citrix-cpx-with-ingress-controller/Chart.yaml index b87b1e3..fc0dd64 100644 --- a/examples/citrix-cpx-with-ingress-controller/Chart.yaml +++ b/examples/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/examples/citrix-cpx-with-ingress-controller/README.md b/examples/citrix-cpx-with-ingress-controller/README.md index 0da172d..d025a88 100644 --- a/examples/citrix-cpx-with-ingress-controller/README.md +++ b/examples/citrix-cpx-with-ingress-controller/README.md @@ -87,11 +87,11 @@ 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. | | 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 | @@ -161,6 +161,7 @@ bels | Optional | N/A | You can use this parameter to provide the route labels s | exporter.pullPolicy | Optional | IfNotPresent | The Exporter for Citrix ADC Stats image pull policy. | | exporter.ports.containerPort | Optional | 8888 | The Exporter for Citrix ADC Stats container port. | | analyticsConfig.required | Mandatory | false | Set this to true if you want to configure Citrix ADC to send metrics and transaction records to analytics service. | +| exporter.serviceMonitorExtraLabels | Optional | | Extra labels for service monitor whem Citrix-adc-metrics-exporter is enabled. | | 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. | | analyticsConfig.endpoint.server | Optional | N/A | Set this value as the IP address or DNS address of the analytics server. | diff --git a/examples/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml b/examples/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml index d32bc0b..11bae9b 100644 --- a/examples/citrix-cpx-with-ingress-controller/templates/citrix-k8s-cpx-ingress.yaml +++ b/examples/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/examples/citrix-cpx-with-ingress-controller/values.yaml b/examples/citrix-cpx-with-ingress-controller/values.yaml index 6c295ce..2fda4ed 100644 --- a/examples/citrix-cpx-with-ingress-controller/values.yaml +++ b/examples/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: [] @@ -84,7 +84,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/examples/citrix-ingress-controller/Chart.yaml b/examples/citrix-ingress-controller/Chart.yaml index 26edd9d..3a9df3c 100644 --- a/examples/citrix-ingress-controller/Chart.yaml +++ b/examples/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/examples/citrix-ingress-controller/README.md b/examples/citrix-ingress-controller/README.md index 772b320..6fce69d 100644 --- a/examples/citrix-ingress-controller/README.md +++ b/examples/citrix-ingress-controller/README.md @@ -90,7 +90,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) | @@ -146,6 +146,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. | | 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/examples/citrix-ingress-controller/templates/citrix-k8s-ingress.yaml b/examples/citrix-ingress-controller/templates/citrix-k8s-ingress.yaml index 9f0db3d..b7ce322 100644 --- a/examples/citrix-ingress-controller/templates/citrix-k8s-ingress.yaml +++ b/examples/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/examples/citrix-ingress-controller/values.yaml b/examples/citrix-ingress-controller/values.yaml index 7f5aca8..3ca3cdc 100644 --- a/examples/citrix-ingress-controller/values.yaml +++ b/examples/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: [] @@ -115,6 +115,7 @@ exporter: # readOnly: true #- name: agent-init-scripts # mountPath: /docker-entrypoint.d/ + serviceMonitorExtraLabels: {} # For CRDs supported by Citrix Ingress Controller crds: