Skip to content

Commit

Permalink
Merge pull request #662 from arijitr-citrix/master
Browse files Browse the repository at this point in the history
Release of NSIC 1.42.12 and IPAM 1.2.0
  • Loading branch information
subashd authored Jul 1, 2024
2 parents 8dd042f + b967363 commit 39e930f
Show file tree
Hide file tree
Showing 52 changed files with 61 additions and 61 deletions.
2 changes: 1 addition & 1 deletion canary/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ GitHub has many utilities available for integrating with other tools that form p

Following Citrix software versions are required for Citrix-Integrated Canary Deployment Solution:

- Netscaler ingress controller build/version: `quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5`.
- Netscaler ingress controller build/version: `quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12`.
- Netscaler CPX version: `quay.io/netscaler/netscaler-cpx:14.1-17.101`.
- Netscaler Metrics Exporter version: `quay.io/netscaler/netscaler-adc-metrics-exporter:1.4.9`.

Expand Down
2 changes: 1 addition & 1 deletion canary/manifest/cic-vpx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
serviceAccountName: cpx
containers:
- name: cic-k8s-ingress-controller
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
env:
# Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
- name: "NS_IP"
Expand Down
2 changes: 1 addition & 1 deletion canary/manifest/cpx-with-cic-sidecar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
imagePullPolicy: Always
name: cic-k8s-ingress-controller
- args:
Expand Down
4 changes: 2 additions & 2 deletions cd/canary-azure-devops/kubernetes_configs/cic_helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -291,15 +291,15 @@ The following table lists the mandatory and optional parameters that you can con
| Parameters | Mandatory or Optional | Default value | Description |
| --------- | --------------------- | ------------- | ----------- |
| license.accept | Mandatory | no | Set `yes` to accept the CIC end user license agreement. |
| image | Mandatory | `quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5` | The CIC image. |
| image | Mandatory | `quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12` | The CIC image. |
| pullPolicy | Mandatory | IfNotPresent | The CIC image pull policy. |
| adcCredentialSecret | Mandatory | N/A | The secret key to log on to the Netscaler VPX or MPX. For information on how to create the secret keys, see [Prerequisites](#prerequistes). |
| nsIP | Mandatory | N/A | The IP address of the Netscaler device. For details, see [Prerequisites](#prerequistes). |
| nsVIP | Optional | N/A | The Virtual IP address on the Netscaler device. |
| nsSNIPS | Optional | N/A | The list of subnet IPAddresses on the Netscaler device, which will be used to create PBR Routes instead of Static Routes [PBR support](https://github.com/netscaler/netscaler-k8s-ingress-controller/tree/master/docs/how-to/pbr.md) |
| nsPort | Optional | 443 | The port used by CIC to communicate with Netscaler. You can use port 80 for HTTP. |
| nsProtocol | Optional | HTTPS | The protocol used by CIC to communicate with Netscaler. You can also use HTTP on port 80. |
| 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/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
| logLevel | Optional | INFO | The loglevel to control the logs generated by CIC. The supported loglevels are: CRITICAL, ERROR, WARNING, INFO, DEBUG, NONE and TRACE. For more information, see [Logging](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/log-levels.md).|
| kubernetesURL | Optional | N/A | The kube-apiserver url that CIC uses to register the events. If the value is not specified, CIC uses the [internal kube-apiserver IP address](https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod). |
| clusterName | Optional | N/A | The unique identifier of the kubernetes cluster on which the CIC is deployed. Used in gslb deployments. |
| ingressClass | Optional | N/A | If multiple ingress load balancers are used to load balance different ingress resources. You can use this parameter to specify CIC to configure Netscaler associated with specific ingress class. For more information on Ingress class, see [Ingress class support](https://developer-docs.citrix.com/projects/citrix-k8s-ingress-controller/en/latest/configure/ingress-classes/). For Kubernetes version >= 1.19, this will create an IngressClass object with the name specified here |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Declare variables to be passed into your templates.

# Netscaler ingress controller config details
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
pullPolicy: IfNotPresent
openshift: false
adcCredentialSecret:
Expand Down
2 changes: 1 addition & 1 deletion deployment/anthos/manifest/dual-tiered-ingress/cic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
serviceAccountName: cic-k8s-role
containers:
- name: cic-k8s-ingress-controller
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
env:
# Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
- name: "NS_IP"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
2 changes: 1 addition & 1 deletion deployment/anthos/manifest/service-type-lb/cic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
serviceAccountName: cic-k8s-role
containers:
- name: cic-k8s-ingress-controller
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
env:
# Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
- name: "NS_IP"
Expand Down
2 changes: 1 addition & 1 deletion deployment/anthos/manifest/service-type-lb/cpx-cic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
2 changes: 1 addition & 1 deletion deployment/aws/manifest/all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
4 changes: 2 additions & 2 deletions deployment/aws/manifest/citrix-ingress-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ spec:
serviceAccountName: cic-k8s-role
containers:
- name: cic-k8s-ingress-controller-1
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
env:
# Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
- name: "NS_IP"
Expand Down Expand Up @@ -117,7 +117,7 @@ spec:
serviceAccountName: cic-k8s-role
containers:
- name: cic-k8s-ingress-controller-2
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
env:
# Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
- name: "NS_IP"
Expand Down
2 changes: 1 addition & 1 deletion deployment/aws/manifest/standalone_cpx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
2 changes: 1 addition & 1 deletion deployment/azure/manifest/all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
2 changes: 1 addition & 1 deletion deployment/azure/manifest/standalone_cpx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
2 changes: 1 addition & 1 deletion deployment/baremetal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ Perform the following steps to deploy the Netscaler ingress controller as a stan
This command pulls the latest image and brings up the Netscaler ingress controller.
The official Netscaler ingress controller docker image is available at: <span style="color:red"> `quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5` </span>
The official Netscaler ingress controller docker image is available at: <span style="color:red"> `quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12` </span>
2. Configure reachability to the pod network using one of the following.
Expand Down
2 changes: 1 addition & 1 deletion deployment/baremetal/citrix-k8s-cpx-ingress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
2 changes: 1 addition & 1 deletion deployment/baremetal/citrix-k8s-ingress-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
serviceAccountName: cic-k8s-role
containers:
- name: cic-k8s-ingress-controller
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
env:
# Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
- name: "NS_IP"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ spec:
name: cpx-volume2
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
args:
- --ingress-classes
citrix
Expand Down
4 changes: 2 additions & 2 deletions deployment/dual-tier/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Perform the following:
| NS_IP | Mandatory | The IP address of the Netscaler appliance. For more details, see [Prerequisites](/docs/deploy/deploy-cic-yaml.md#prerequisites). |
| NS_USER and NS_PASSWORD | Mandatory | The user name and password of the Netscaler VPX or MPX appliance used as the Ingress device. For more details, see [Prerequisites](/docs/deploy/deploy-cic-yaml.md#prerequisites). |
| EULA | Mandatory | The End User License Agreement. Specify the value as `Yes`.|
| LOGLEVEL | Optional | The log levels to control the logs generated by Netscaler ingress controller. By default, the value is set to DEBUG. The supported values are: CRITICAL, ERROR, WARNING, INFO, and DEBUG. For more information, see [Log Levels](../configure/log-levels.md)|
| LOGLEVEL | Optional | The log levels to control the logs generated by Netscaler ingress controller. By default, the value is set to INFO. The supported values are: CRITICAL, ERROR, WARNING, INFO, NONE and DEBUG. For more information, see [Log Levels](../configure/log-levels.md)|
| NS_PROTOCOL and NS_PORT | Optional | Defines the protocol and port that must be used by Netscaler ingress controller to communicate with Netscaler. By default, Netscaler ingress controller uses HTTPS on port 443. You can also use HTTP on port 80. |
| ingress-classes | Optional | If multiple ingress load balancers are used to load balance different ingress resources. You can use this environment variable to specify Netscaler ingress controller to configure Netscaler associated with specific ingress class. For information on Ingress classes, see [Ingress class support](../configure/ingress-classes.md)|
| NS_VIP | Optional | Netscaler ingress controller uses the IP address provided in this environment variable to configure a virtual IP address to the Netscaler that receives Ingress traffic. **Note:** NS_VIP acts as a fallback when the [frontend-ip](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/annotations.md) annotation is not provided in Ingress yaml. Not supported for Type Loadbalancer service. |
Expand Down Expand Up @@ -111,7 +111,7 @@ Perform the following:
| NS_IP | Mandatory | The IP address of the Netscaler appliance. For more details, see [Prerequisites](/docs/deploy/deploy-cic-yaml.md#prerequisites). |
| NS_USER and NS_PASSWORD | Mandatory | The user name and password of the Netscaler VPX or MPX appliance used as the Ingress device. For more details, see [Prerequisites](/docs/deploy/deploy-cic-yaml.md#prerequisites). |
| EULA | Mandatory | The End User License Agreement. Specify the value as `Yes`.|
| LOGLEVEL | Optional | The log levels to control the logs generated by Netscaler ingress controller. By default, the value is set to DEBUG. The supported values are: CRITICAL, ERROR, WARNING, INFO, and DEBUG. For more information, see [Log Levels](../configure/log-levels.md)|
| LOGLEVEL | Optional | The log levels to control the logs generated by Netscaler ingress controller. By default, the value is set to INFO. The supported values are: CRITICAL, ERROR, WARNING, INFO, NONE and DEBUG. For more information, see [Log Levels](../configure/log-levels.md)|
| NS_PROTOCOL and NS_PORT | Optional | Defines the protocol and port that must be used by Netscaler ingress controller to communicate with Netscaler. By default, Netscaler ingress controller uses HTTPS on port 443. You can also use HTTP on port 80. |
| ingress-classes | Optional | If multiple ingress load balancers are used to load balance different ingress resources. You can use this environment variable to specify Netscaler ingress controller to configure Netscaler associated with specific ingress class. For information on Ingress classes, see [Ingress class support](../configure/ingress-classes.md)|
| NS_VIP | Optional | Netscaler ingress controller uses the IP address provided in this environment variable to configure a virtual IP address to the Netscaler that receives Ingress traffic. **Note:** NS_VIP acts as a fallback when the [frontend-ip](https://github.com/netscaler/netscaler-k8s-ingress-controller/blob/master/docs/configure/annotations.md) annotation is not provided in Ingress yaml. Not Supported for Type Loadbalancer service. |
Expand Down
4 changes: 2 additions & 2 deletions deployment/dual-tier/manifest/all-in-one-dual-tier-demo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down Expand Up @@ -346,7 +346,7 @@ spec:
serviceAccountName: cic-k8s-role
containers:
- name: cic-k8s-ingress-controller
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
env:
# Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
- name: "NS_IP"
Expand Down
2 changes: 1 addition & 1 deletion deployment/dual-tier/manifest/tier-1-vpx-cic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ spec:
serviceAccountName: cic-k8s-role
containers:
- name: cic-k8s-ingress-controller
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
env:
# Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
- name: "NS_IP"
Expand Down
2 changes: 1 addition & 1 deletion deployment/dual-tier/manifest/tier-2-cpx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
2 changes: 1 addition & 1 deletion deployment/gcp/manifest/all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
2 changes: 1 addition & 1 deletion deployment/gcp/manifest/standalone_cpx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ spec:
name: cpx-volume-conf
# Add cic as a sidecar
- name: cic
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5
image: quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
2 changes: 1 addition & 1 deletion deployment/openshift/manifest/cic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ spec:
serviceAccount: citrix
containers:
- name: cic
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
securityContext:
privileged: true
env:
Expand Down
2 changes: 1 addition & 1 deletion deployment/openshift/manifest/cpx_cic_side_car.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ spec:
imagePullPolicy: IfNotPresent
# Add cic as a sidecar
- name: cic
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
volumeMounts:
- mountPath: /var/deviceinfo
name: shared-data
Expand Down
2 changes: 1 addition & 1 deletion docs/canary/canary.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ GitHub has many utilities available for integrating with other tools that form p

Following Citrix software versions are required for Citrix-Integrated Canary Deployment Solution:

- Netscaler ingress controller build/version: `quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5`.
- Netscaler ingress controller build/version: `quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12`.
- Netscaler CPX version: `quay.io/netscaler/netscaler-cpx:14.1-17.101`.
- Netscaler Metrics Exporter version: `quay.io/netscaler/netscaler-adc-metrics-exporter:1.4.9`.

Expand Down
4 changes: 2 additions & 2 deletions docs/configure/config-map.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The Netscaler ingress controller supports the configuration command line argumen

The values for the following environment variables in the Netscaler ingress controller can be specified in a ConfigMap.

- LOGLEVEL: Specifies the log levels to control the logs generated by the Netscaler ingress controller (debug, info, critical, and so on). The default value is `debug`.
- LOGLEVEL: Specifies the log levels to control the logs generated by the Netscaler ingress controller (debug, info, critical, and so on). The default value is `info`.

- NS_HTTP2_SERVER_SIDE: Enables HTTP2 for Netscaler service group configurations with possible values as ON or OFF.

Expand Down Expand Up @@ -97,7 +97,7 @@ Perform the following to configure ConfigMap support for the Netscaler ingress c
serviceAccountName: cic-k8s-role
containers:
- name: cic-k8s-ingress-controller
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
env:
# Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
- name: "NS_IP"
Expand Down
2 changes: 1 addition & 1 deletion docs/configure/cpx-bgp-router/citrix-k8s-cpx-ingress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.41.5"
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:1.42.12"
imagePullPolicy: Always
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
Expand Down
Loading

0 comments on commit 39e930f

Please sign in to comment.