Skip to content

Commit

Permalink
Releasing NSIC v1.42.12 and IPAM v1.2.0 (#186)
Browse files Browse the repository at this point in the history
Signed-off-by: Subash Dangol <subash.dangol@citrix.com>
  • Loading branch information
subashd committed Jul 1, 2024
1 parent 0d14e3f commit 639519c
Show file tree
Hide file tree
Showing 57 changed files with 135 additions and 87 deletions.
8 changes: 4 additions & 4 deletions citrix-cloud-native/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ maintainers:
email: subash.dangol@cloud.com
dependencies:
- name: citrix-ingress-controller
version: "1.41.5"
version: "1.42.12"
condition: cic.enabled
alias: cic
- name: citrix-cpx-with-ingress-controller
version: "1.41.5"
version: "1.42.12"
condition: cpx.enabled
alias: cpx
- name: citrix-gslb-controller
version: "1.41.5"
version: "1.42.12"
condition: gslb.enabled
alias: gslb
- name: citrix-node-controller
Expand All @@ -34,7 +34,7 @@ dependencies:
condition: coe.enabled
alias: coe
- name: citrix-ipam-controller
version: "1.1.3"
version: "1.2.0"
condition: ipam.enabled
alias: ipam
- name: citrix-adc-istio-ingress-gateway
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
appVersion: "1.41.5"
appVersion: "1.42.12"
kubeVersion: ">=v1.16.0-0"
description: A Helm chart for NetScaler CPX with NetScaler ingress Controller running as sidecar.
name: citrix-cpx-with-ingress-controller
version: 1.41.5
version: 1.42.12
icon: https://raw.githubusercontent.com/netscaler/netscaler-helm-charts/gh-pages/netscaler.png
home: https://www.cloud.com
sources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,11 @@ The following table lists the configurable parameters of the NetScaler CPX with
| cpx.imageRepository | Mandatory | `citrix/citrix-k8s-cpx-ingress` | The NetScaler CPX image repository |
| cpx.imageTag | Mandatory | `14.1-17.101` | The NetScaler CPX image tag |
| cpx.pullPolicy | Mandatory | IfNotPresent | The NetScaler CPX image pull policy. |
| cpx.hostName | Optional | N/A | This entity will be used to set Hostname of the CPX |
| cpx.daemonSet | Optional | False | Set this to true if NetScaler CPX needs to be deployed as DaemonSet. |
| cpx.cic.imageRegistry | Mandatory | `quay.io` | The NetScaler ingress controller image registry |
| cpx.cic.imageRepository | Mandatory | `citrix/citrix-k8s-ingress-controller` | The NetScaler ingress controller image repository |
| cpx.cic.imageTag | Mandatory | `1.41.5` | The NetScaler ingress controller image tag |
| cpx.cic.imageTag | Mandatory | `1.42.12` | The NetScaler ingress controller image tag |
| cpx.cic.pullPolicy | Mandatory | IfNotPresent | The NetScaler ingress controller image pull policy. |
| cpx.cic.required | Mandatory | true | NSIC to be run as sidecar with NetScaler CPX |
| cpx.cic.resources | Optional | {} | CPU/Memory resource requests/limits for NetScaler Ingress Controller container |
Expand All @@ -630,7 +631,7 @@ The following table lists the configurable parameters of the NetScaler CPX with
| cpx.fullNameOverride | Optional | N/A | String to fully override deployment fullname template with a string |
| cpx.resources | Optional | {} | CPU/Memory resource requests/limits for NetScaler CPX container |
| cpx.nitroReadTimeout | Optional | 20 | The nitro Read timeout in seconds, defaults to 20 |
| cpx.logLevel | Optional | INFO | The loglevel to control the logs generated by NSIC. The supported loglevels are: CRITICAL, ERROR, WARNING, INFO, DEBUG and TRACE. For more information, see [Logging](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
| cpx.logLevel | Optional | INFO | The loglevel to control the logs generated by NSIC. The supported loglevels are: CRITICAL, ERROR, WARNING, INFO, DEBUG, TRACE and NONE. For more information, see [Logging](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
| cpx.jsonLog | Optional | false | Set this argument to true if log messages are required in JSON format |
| cpx.nsConfigDnsRec | Optional | false | To enable/disable DNS address Record addition in NetScaler through Ingress |
| cpx.nsSvcLbDnsRec | Optional | false | To enable/disable DNS address Record addition in NetScaler through Type Load Balancer Service |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ spec:
labels:
app: {{ include "citrix-cpx-ingress-controller.fullname" . }}
adc: "citrix"
{{- if .Values.analyticsConfig.timeseries.metrics.enableNativeScrape }}
annotations:
{{- if .Values.analyticsConfig.timeseries.metrics.enableNativeScrape }}
netscaler.prometheus/scrape: "true"
netscaler.prometheus/port: {{ .Values.mgmtHttpPort | quote }}
{{- end }}
Expand All @@ -32,6 +32,9 @@ spec:
serviceAccountName: {{ include "citrix-cpx-ingress-controller.serviceAccountName" . }}
{{- if .Values.cpxBgpRouter }}
hostNetwork: true
{{- end }}
{{- if .Values.hostName }}
hostname: {{ .Values.hostName }}-{{ .Release.Namespace }}
{{- end }}
containers:
- name: cpx-ingress
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ nsEnableLabel: true
optimizeEndpointBinding:
routeLabels:
namespaceLabels:
hostName: ""

# Service Type LoadBalancer and ingress support with CPX through BGP advertisement
# If you enable this, CPX is run as DaemonSet. Please edit the bgpSettings for configuring
Expand Down Expand Up @@ -83,7 +84,7 @@ servicePorts: []
cic:
imageRegistry: quay.io
imageRepository: citrix/citrix-k8s-ingress-controller
imageTag: 1.41.5
imageTag: 1.42.12
image: "{{ .Values.cic.imageRegistry }}/{{ .Values.cic.imageRepository }}:{{ .Values.cic.imageTag }}"
pullPolicy: IfNotPresent
required: true
Expand Down
4 changes: 2 additions & 2 deletions citrix-cloud-native/charts/citrix-gslb-controller/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
appVersion: "1.41.5"
appVersion: "1.42.12"
description: A Helm chart for NetScaler GSLB Controller configuring MPX/VPX.
name: citrix-gslb-controller
version: 1.41.5
version: 1.42.12
icon: https://raw.githubusercontent.com/netscaler/netscaler-helm-charts/gh-pages/netscaler.png
home: https://www.cloud.com
maintainers:
Expand Down
4 changes: 2 additions & 2 deletions citrix-cloud-native/charts/citrix-gslb-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ The following table lists the mandatory and optional parameters that you can con
| gslb.license.accept | Mandatory | no | Set `yes` to accept the NSIC end user license agreement. |
| gslb.imageRegistry | Optional | `quay.io` | The NetScaler ingress controller image registry |
| gslb.imageRepository | Optional | `citrix/citrix-k8s-ingress-controller` | The NetScaler ingress controller image repository |
| gslb.imageTag | Optional | `1.41.5` | The NetScaler ingress controller image tag |
| gslb.imageTag | Optional | `1.42.12` | The NetScaler ingress controller image tag |
| gslb.pullPolicy | Optional | Always | The NSIC image pull policy. |
| gslb.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/). |
| gslb.adcCredentialSecret | Optional | N/A | The kubernetes secret containing login credentials for the NetScaler VPX or MPX. For information on how to create the secret keys, see [Prerequisites](#prerequistes). |
Expand All @@ -210,7 +210,7 @@ The following table lists the mandatory and optional parameters that you can con
| gslb.nsPort | Optional | 443 | The port used by NSIC to communicate with NetScaler. You can use port 80 for HTTP. |
| gslb.nsProtocol | Optional | HTTPS | The protocol used by NSIC to communicate with NetScaler. You can also use HTTP on port 80. |
| gslb.nitroReadTimeout | Optional | 20 | The nitro Read timeout in seconds, defaults to 20 |
| gslb.logLevel | Optional | INFO | The loglevel to control the logs generated by NSIC. The supported loglevels are: CRITICAL, ERROR, WARNING, INFO, DEBUG and TRACE. For more information, see [Logging](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
| gslb.logLevel | Optional | INFO | The loglevel to control the logs generated by NSIC. The supported loglevels are: CRITICAL, ERROR, WARNING, INFO, DEBUG, TRACE and NONE. For more information, see [Logging](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
| gslb.disableAPIServerCertVerify | Optional | False | Set this parameter to True for disabling API Server certificate verification. |
| gslb.kubernetesURL | Optional | N/A | The kube-apiserver url that NSIC uses to register the events. If the value is not specified, NSIC uses the [internal kube-apiserver IP address](https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod). |
| gslb.entityPrefix | Optional | k8s | The prefix for the resources on the NetScaler VPX/MPX. |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# image contains information needed to fetch NSIC image
imageRegistry: quay.io
imageRepository: citrix/citrix-k8s-ingress-controller
imageTag: 1.41.5
imageTag: 1.42.12
image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageTag }}"
pullPolicy: IfNotPresent
imagePullSecrets: []
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
appVersion: "1.41.5"
appVersion: "1.42.12"
kubeVersion: ">=v1.16.0-0"
description: A Helm chart for NetScaler Ingress Controller configuring MPX/VPX.
name: citrix-ingress-controller
version: 1.41.5
version: 1.42.12
icon: https://raw.githubusercontent.com/netscaler/netscaler-helm-charts/gh-pages/netscaler.png
home: https://www.cloud.com
sources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ The following table lists the mandatory and optional parameters that you can con
| cic.license.accept | Mandatory | no | Set `yes` to accept the NSIC end user license agreement. |
| cic.imageRegistry | Mandatory | `quay.io` | The NetScaler ingress controller image registry |
| cic.imageRepository | Mandatory | `citrix/citrix-k8s-ingress-controller` | The NetScaler ingress controller image repository |
| cic.imageTag | Mandatory | `1.41.5` | The NetScaler ingress controller image tag |
| cic.imageTag | Mandatory | `1.42.12` | The NetScaler ingress controller image tag |
| cic.pullPolicy | Mandatory | IfNotPresent | The NSIC 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) |
Expand All @@ -369,7 +369,7 @@ The following table lists the mandatory and optional parameters that you can con
| cic.nsProtocol | Optional | HTTPS | The protocol used by NSIC to communicate with NetScaler. You can also use HTTP on port 80. |
| cic.nsEnableLabel | Optional | True | Set to true for plotting Servicegraph. Ensure ``analyticsConfig` are set. |
| cic.nitroReadTimeout | Optional | 20 | The nitro Read timeout in seconds, defaults to 20 |
| cic.logLevel | Optional | INFO | The loglevel to control the logs generated by NSIC. The supported loglevels are: CRITICAL, ERROR, WARNING, INFO, DEBUG and TRACE. For more information, see [Logging](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
| cic.logLevel | Optional | INFO | The loglevel to control the logs generated by NSIC. The supported loglevels are: CRITICAL, ERROR, WARNING, INFO, DEBUG, TRACE and NONE. For more information, see [Logging](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
| cic.jsonLog | Optional | false | Set this argument to true if log messages are required in JSON format |
| cic.nsConfigDnsRec | Optional | false | To enable/disable DNS address Record addition in NetScaler through Ingress |
| cic.nsSvcLbDnsRec | Optional | false | To enable/disable DNS address Record addition in NetScaler through Type Load Balancer Service |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ spec:
{{- else }}
app: {{ include "citrix-ingress-controller.fullname" . }}
{{- end }}
{{- with .Values.podAnnotations }}
annotations:
{{- with .Values.podAnnotations }}
{{- toYaml . | nindent 8 }}
{{- end }}
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# NetScaler Ingress Controller config details
imageRegistry: quay.io
imageRepository: citrix/citrix-k8s-ingress-controller
imageTag: 1.41.5
imageTag: 1.42.12
image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageTag }}"
pullPolicy: IfNotPresent
imagePullSecrets: []
Expand Down
4 changes: 2 additions & 2 deletions citrix-cloud-native/charts/citrix-ipam-controller/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
name: citrix-ipam-controller
description: A Helm chart for NetScaler IPAM Controller which automatically allocate an IP address to the service of type LoadBalancer.
version: 1.1.3
appVersion: "1.1.3"
version: 1.2.0
appVersion: "1.2.0"
type: application
icon: https://raw.githubusercontent.com/netscaler/netscaler-helm-charts/gh-pages/netscaler.png
home: https://www.cloud.com
Expand Down
6 changes: 5 additions & 1 deletion citrix-cloud-native/charts/citrix-ipam-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ NetScaler provides a controller called IPAM controller for IP address management
## Introduction
This Helm chart deploys a NetScaler IPAM controller in the [Kubernetes](https://kubernetes.io/) or in the [Openshift](https://www.openshift.com) cluster using the [Helm](https://helm.sh/) package manager.

IPAM controller has the ability to either allocate the same IP for all ingresses (default behaviour) or it can allocate unique IP until the IP range is exhausted. This behaviour can be controlled using the `reuseIngressVip` parameter of the helm chart.
Please note that for services of type LoadBalancer, distinct IPs are allocated from the specified IP range until all available addresses are exhausted.

### Prerequisites

- The [Kubernetes](https://kubernetes.io/) version is 1.6 or later if using Kubernetes environment.
Expand Down Expand Up @@ -49,9 +52,10 @@ The following table lists the configurable parameters of the NetScaler CPX with
| ---------- | --------------------- | ------------- | ----------- |
| ipam.imageRegistry | Mandatory | `quay.io` | The NetScaler IPAM Contoller image registry |
| ipam.imageRepository | Mandatory | `citrix/citrix-ipam-controller` | The NetScaler IPAM Contoller image repository |
| ipam.imageTag | Mandatory | `1.1.3` | The NetScaler IPAM Contoller image tag |
| ipam.imageTag | Mandatory | `1.2.0` | The NetScaler IPAM Contoller image tag |
| ipam.pullPolicy | Mandatory | `IfNotPresent` | The NetScaler IPAM Contoller image pull policy. |
| ipam.vipRange | Mandatory | N/A | This variable allows you to define the IP address range. You can either define IP address range or an IP address range associated with a unique name. NetScaler IPAM controller assigns the IP address from this IP address range to the service of type LoadBalancer. |
| reuseIngressVip| Optional | True | This variable allows you to use same IP for all ingresses using the same vipRange. |

Alternatively, you can define a YAML file with the values for the parameters and pass the values while installing the chart.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,7 @@ spec:
value: {{ required "Provide IPs or IP range for NetScaler IPAM Controller" .Values.vipRange | squote }}
# The IPAM controller can also be configured with name spaces for which it would work through the environment variable
# VIP_NAMESPACES, This expects a set of namespaces passed as space separated string
{{- if .Values.reuseIngressVip | squote }}
- name: "REUSE_INGRESS_VIP"
value: {{ .Values.reuseIngressVip | squote }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

imageRegistry: quay.io
imageRepository: citrix/citrix-ipam-controller
imageTag: 1.1.3
imageTag: 1.2.0
image: "{{ .Values.imageRegistry }}/{{ .Values.imageRepository }}:{{ .Values.imageTag }}"
pullPolicy: IfNotPresent

vipRange:
nameOverride: ""
fullnameOverride: ""
reuseIngressVip: "True"

serviceAccount:
# Specifies whether a service account should be created
Expand Down
4 changes: 2 additions & 2 deletions citrix-cpx-with-ingress-controller/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
apiVersion: v2
appVersion: "1.41.5"
appVersion: "1.42.12"
kubeVersion: ">=v1.16.0-0"
description: A Helm chart for NetScaler CPX with NetScaler ingress Controller running as sidecar.
name: citrix-cpx-with-ingress-controller
version: 1.41.5
version: 1.42.12
icon: https://raw.githubusercontent.com/netscaler/netscaler-helm-charts/gh-pages/netscaler.png
home: https://www.cloud.com
sources:
Expand Down
5 changes: 3 additions & 2 deletions citrix-cpx-with-ingress-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -610,10 +610,11 @@ The following table lists the configurable parameters of the NetScaler CPX with
| imageRepository | Mandatory | `citrix/citrix-k8s-cpx-ingress` | The NetScaler CPX image repository |
| imageTag | Mandatory | `14.1-17.101` | The NetScaler CPX image tag |
| pullPolicy | Mandatory | IfNotPresent | The NetScaler CPX image pull policy. |
| hostName | Optional | N/A | This entity will be used to set Hostname of the CPX |
| daemonSet | Optional | False | Set this to true if NetScaler CPX needs to be deployed as DaemonSet. |
| cic.imageRegistry | Mandatory | `quay.io` | The NetScaler ingress controller image registry |
| cic.imageRepository | Mandatory | `citrix/citrix-k8s-ingress-controller` | The NetScaler ingress controller image repository |
| cic.imageTag | Mandatory | `1.41.5` | The NetScaler ingress controller image tag |
| cic.imageTag | Mandatory | `1.42.12` | The NetScaler ingress controller image tag |
| cic.pullPolicy | Mandatory | IfNotPresent | The NetScaler ingress controller image pull policy. |
| cic.required | Mandatory | true | NSIC to be run as sidecar with NetScaler CPX |
| cic.resources | Optional | {} | CPU/Memory resource requests/limits for NetScaler Ingress Controller container |
Expand All @@ -624,7 +625,7 @@ The following table lists the configurable parameters of the NetScaler CPX with
| fullNameOverride | Optional | N/A | String to fully override deployment fullname template with a string |
| resources | Optional | {} | CPU/Memory resource requests/limits for NetScaler CPX container |
| nitroReadTimeout | Optional | 20 | The nitro Read timeout in seconds, defaults to 20 |
| logLevel | Optional | INFO | The loglevel to control the logs generated by NSIC. The supported loglevels are: CRITICAL, ERROR, WARNING, INFO, DEBUG and TRACE. For more information, see [Logging](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
| logLevel | Optional | INFO | The loglevel to control the logs generated by NSIC. The supported loglevels are: CRITICAL, ERROR, WARNING, INFO, DEBUG, TRACE and NONE. For more information, see [Logging](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
| jsonLog | Optional | false | Set this argument to true if log messages are required in JSON format |
| nsConfigDnsRec | Optional | false | To enable/disable DNS address Record addition in NetScaler through Ingress |
| nsSvcLbDnsRec | Optional | false | To enable/disable DNS address Record addition in NetScaler through Type Load Balancer Service |
Expand Down
Loading

0 comments on commit 639519c

Please sign in to comment.