Skip to content

Commit bd8fc9f

Browse files
subashdsubashd
authored
Merge pull request #704 from arijitr-citrix/master
Releasing NSIC 4.0.16
2 parents f84b825 + c577c87 commit bd8fc9f

58 files changed

Lines changed: 280 additions & 197 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎canary/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ GitHub has many utilities available for integrating with other tools that form p
4040

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

43-
- Netscaler ingress controller build/version: `quay.io/netscaler/netscaler-k8s-ingress-controller:3.4.4`.
43+
- Netscaler ingress controller build/version: `quay.io/netscaler/netscaler-k8s-ingress-controller:4.0.16`.
4444
- Netscaler CPX version: `quay.io/netscaler/netscaler-cpx:14.1-60.52`.
4545
- Netscaler Metrics Exporter version: `quay.io/netscaler/netscaler-adc-metrics-exporter:1.6.0`.
4646

‎canary/manifest/cic-vpx.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ spec:
88
serviceAccountName: cpx
99
containers:
1010
- name: cic-k8s-ingress-controller
11-
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:3.4.4"
11+
image: "quay.io/netscaler/netscaler-k8s-ingress-controller:4.0.16"
1212
env:
1313
# Set NetScaler NSIP/SNIP, SNIP in case of HA (mgmt has to be enabled)
1414
- name: "NS_IP"

‎canary/manifest/cpx-with-cic-sidecar.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
fieldRef:
5757
apiVersion: v1
5858
fieldPath: metadata.namespace
59-
image: quay.io/netscaler/netscaler-k8s-ingress-controller:3.4.4
59+
image: quay.io/netscaler/netscaler-k8s-ingress-controller:4.0.16
6060
imagePullPolicy: Always
6161
name: cic-k8s-ingress-controller
6262
- args:

‎cd/canary-azure-devops/kubernetes_configs/cic_helm/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ The following table lists the mandatory and optional parameters that you can con
291291
| Parameters | Mandatory or Optional | Default value | Description |
292292
| --------- | --------------------- | ------------- | ----------- |
293293
| license.accept | Mandatory | no | Set `yes` to accept the CIC end user license agreement. |
294-
| image | Mandatory | `quay.io/netscaler/netscaler-k8s-ingress-controller:3.4.4` | The CIC image. |
294+
| image | Mandatory | `quay.io/netscaler/netscaler-k8s-ingress-controller:4.0.16` | The CIC image. |
295295
| pullPolicy | Mandatory | IfNotPresent | The CIC image pull policy. |
296296
| 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). |
297297
| nsIP | Mandatory | N/A | The IP address of the Netscaler device. For details, see [Prerequisites](#prerequistes). |

‎cd/canary-azure-devops/kubernetes_configs/cic_helm/templates/cic_crds.yaml‎

Lines changed: 147 additions & 64 deletions
Large diffs are not rendered by default.

‎cd/canary-azure-devops/kubernetes_configs/cic_helm/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Declare variables to be passed into your templates.
44

55
# Netscaler ingress controller config details
6-
image: quay.io/netscaler/netscaler-k8s-ingress-controller:3.4.4
6+
image: quay.io/netscaler/netscaler-k8s-ingress-controller:4.0.16
77
pullPolicy: IfNotPresent
88
openshift: false
99
adcCredentialSecret:

‎crd/appqoe/appqoe-crd.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ metadata:
55
spec:
66
group: citrix.com
77
names:
8-
kind: appqoepolicy
8+
kind: appqoepolicy
99
plural: appqoepolicies
10-
singular: appqoepolicy
10+
singular: appqoepolicy
1111
scope: Namespaced
12-
versions:
12+
versions:
1313
- name: v1
1414
served: true
1515
storage: true

‎crd/auth/auth-crd.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
properties:
4141
ingressclass:
4242
type: string
43-
description: "Ingress class, if not specified then all Netscaler ingress controllers in the cluster will process the resource otherwise only the controller with that ingress class will process this resource"
43+
description: "Ingress class, if not specified then all NetScaler Ingress Controllers in the cluster will process the resource otherwise only the controller with that ingress class will process this resource"
4444
servicenames:
4545
description: |+
4646
'Name of the services for which the policies applied'
@@ -70,7 +70,7 @@ spec:
7070
description: |+
7171
'Fully qualified domain name (FQDN) for authentication.
7272
This FQDN should be unique and should resolve to frontend IP of
73-
ADC with Ingress/service type LoadBalancer (or) vip of Listener CRD'
73+
NetScaler with Ingress/service type LoadBalancer (or) vip of Listener CRD'
7474
type: string
7575
maxLength: 255
7676
authentication_host_cert:
@@ -87,8 +87,8 @@ spec:
8787
type: string
8888
maxLength: 63
8989
description: |+
90-
'Preconfigured SSL certkey name on ADC with the
91-
certificate and key already added on ADC'
90+
'Preconfigured SSL certkey name on NetScaler with the
91+
certificate and key already added on NetScaler'
9292
oneOf:
9393
- properties:
9494
required: [tls_secret]
@@ -215,7 +215,7 @@ spec:
215215
user_field:
216216
description: |+
217217
'Attribute in the token from which username should be extracted.
218-
by default, ADC looks at email attribute for user id'
218+
by default, NetScaler looks at email attribute for user id'
219219
type: string
220220
maxLength: 127
221221
default_group:
@@ -278,13 +278,13 @@ spec:
278278
type: string
279279
login_name:
280280
description: |+
281-
'LDAP login name attribute. The Netscaler uses the LDAP login name
281+
'LDAP login name attribute. The NetScaler uses the LDAP login name
282282
to query external LDAP servers or Active Directories'
283283
type: string
284284
maxLength: 127
285285
security_type:
286286
description: |+
287-
'Type of security used for communications between the Netscaler
287+
'Type of security used for communications between the NetScaler
288288
and the LDAP server. Default is TLS'
289289
type: string
290290
enum: ['PLAINTEXT', 'TLS', 'SSL']
@@ -318,7 +318,7 @@ spec:
318318
maxLength: 255
319319
auth_timeout:
320320
description: |+
321-
'Number of seconds the Netscaler waits for a response from the server
321+
'Number of seconds the NetScaler waits for a response from the server
322322
Default is 3'
323323
type: integer
324324
minimum: 1
@@ -330,7 +330,7 @@ spec:
330330
attributes_to_save:
331331
description: |+
332332
'List of attribute names separated by comma which needs to be fetched
333-
from LDAP server and stored as key-value pair for the session on ADC'
333+
from LDAP server and stored as key-value pair for the session on NetScaler'
334334
type: string
335335
maxLength: 2047
336336
oneOf:
@@ -368,8 +368,8 @@ spec:
368368
type: string
369369
maxLength: 63
370370
description: |+
371-
'Preconfigured SSL certkey name on ADC with the
372-
certificate and key already added on ADC'
371+
'Preconfigured SSL certkey name on NetScaler with the
372+
certificate and key already added on NetScaler'
373373
oneOf:
374374
- properties:
375375
required: [tls_secret]
@@ -380,7 +380,7 @@ spec:
380380
type: string
381381
maxLength: 127
382382
issuer_name:
383-
description: 'The name to be used in requests sent from SP to IDP to identify Netscaler'
383+
description: 'The name to be used in requests sent from SP to IDP to identify NetScaler'
384384
type: string
385385
maxLength: 63
386386
binding:
@@ -420,7 +420,7 @@ spec:
420420
attributes_to_save:
421421
description: |+
422422
'List of attribute names separated by comma which needs to be extracted
423-
and stored as key-value pair for the session on ADC'
423+
and stored as key-value pair for the session on NetScaler'
424424
type: string
425425
maxLength: 2047
426426
required:
@@ -429,11 +429,11 @@ spec:
429429
basic_local_db:
430430
type: object
431431
description: |+
432-
'Basic HTTP authentication supported by ADC, user data in local DB of ADC.
433-
Users needs to be added on ADC'
432+
'Basic HTTP authentication supported by NetScaler, user data in local DB of NetScaler.
433+
Users needs to be added on NetScaler'
434434
properties:
435435
use_local_auth:
436-
description: 'Use ADC authentication'
436+
description: 'Use NetScaler authentication'
437437
type: string
438438
enum: ['YES']
439439

@@ -465,7 +465,7 @@ spec:
465465
required:
466466
- path
467467
expression:
468-
description: 'ADC syntax expression for authentication'
468+
description: 'NetScaler syntax expression for authentication'
469469
type: string
470470
maxLength: 1229
471471
provider:
@@ -525,7 +525,7 @@ spec:
525525
required:
526526
- claims
527527
expression:
528-
description: 'ADC syntax expression for authorization'
528+
description: 'NetScaler syntax expression for authorization'
529529
type: string
530530
maxLength: 1229
531531
oneOf:

‎crd/bot/bot-crd.yaml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
properties:
4242
ingressclass:
4343
type: string
44-
description: "Ingress class, if not specified then all Netscaler ingress controllers in the cluster will process the resource otherwise only the controller with that ingress class will process this resource"
44+
description: "Ingress class, if not specified then all NetScaler Ingress Controllers in the cluster will process the resource otherwise only the controller with that ingress class will process this resource"
4545
servicenames:
4646
description: 'Name of the services to which the bot policies are applied.'
4747
type: array
@@ -89,7 +89,7 @@ spec:
8989
device_fingerprint:
9090
type: string
9191
enum: ['ON', 'OFF']
92-
device_fingerprint_action:
92+
device_fingerprint_action:
9393
type: object
9494
x-kubernetes-preserve-unknown-fields: true
9595
headless_browser:
@@ -131,6 +131,7 @@ spec:
131131
expression:
132132
type: object
133133
x-kubernetes-preserve-unknown-fields: true
134+
134135
block_list:
135136
type: array
136137
items:
@@ -144,10 +145,10 @@ spec:
144145
x-kubernetes-preserve-unknown-fields: true
145146
ipv6:
146147
type: object
147-
x-kubernetes-preserve-unknown-fields: true
148+
x-kubernetes-preserve-unknown-fields: true
148149
ipv6_subnet:
149150
type: object
150-
x-kubernetes-preserve-unknown-fields: true
151+
x-kubernetes-preserve-unknown-fields: true
151152
expression:
152153
type: object
153154
x-kubernetes-preserve-unknown-fields: true
@@ -164,7 +165,7 @@ spec:
164165
x-kubernetes-preserve-unknown-fields: true
165166
cookie:
166167
type: object
167-
x-kubernetes-preserve-unknown-fields: true
168+
x-kubernetes-preserve-unknown-fields: true
168169
geolocation:
169170
type: object
170171
x-kubernetes-preserve-unknown-fields: true
@@ -206,4 +207,4 @@ spec:
206207
x-kubernetes-preserve-unknown-fields: true
207208
trapinsertion:
208209
type: object
209-
x-kubernetes-preserve-unknown-fields: true
210+
x-kubernetes-preserve-unknown-fields: true

‎crd/contentrouting/HTTPRoute.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
properties:
3232
ingressclass:
3333
type: string
34-
description: "Ingress class, if not specified then all Netscaler ingress controllers in the cluster will process the resource otherwise only the controller with that ingress class will process this resource"
34+
description: "Ingress class, if not specified then all NetScaler Ingress Controllers in the cluster will process the resource otherwise only the controller with that ingress class will process this resource"
3535
hostname:
3636
type: array
3737
description: "List of domain names that share the same route, default is '*'"
@@ -49,7 +49,7 @@ spec:
4949
properties:
5050
name:
5151
type: string
52-
description: "A name to represent the rule, this is used as an identifier in content routing policy name in ADC"
52+
description: "A name to represent the rule, this is used as an identifier in content routing policy name in NetScaler"
5353
minLength: 1
5454
maxLength: 20
5555
pattern: '^[a-z0-9]([-a-z0-9]*[a-z0-9])?$'
@@ -194,7 +194,7 @@ spec:
194194
description: "HTTP method for content routing eg: POST, PUT, DELETE etc"
195195
policyExpression:
196196
type: string
197-
description: "Netscaler policy expressions; refer: https://docs.citrix.com/en-us/netscaler/media/expression-prefix.pdf"
197+
description: "NetScaler policy expressions; refer: https://developer-docs.netscaler.com/en-us/adc-nitro-api/current-release/configuration/policy/policyexpression.html"
198198
action:
199199
type: object
200200
description: "Action for the matched rule"
@@ -225,12 +225,12 @@ spec:
225225
description: "Use Secure communications to the backends"
226226
type: boolean
227227
lbConfig:
228-
description: "Netscaler LB vserver configurations for the backend. Refer: https://developer-docs.citrix.com/projects/netscaler-nitro-api/en/12.0/configuration/load-balancing/lbvserver/lbvserver/ for all configurations"
228+
description: "NetScaler LB vserver configurations for the backend. Refer: https://developer-docs.netscaler.com/en-us/adc-nitro-api/current-release/configuration/lb/lbvserver.html for all configurations"
229229
type: object
230230
additionalProperties:
231231
type: string
232232
servicegroupConfig:
233-
description: "Netscaler service group configurations for the backend; Refer: https://developer-docs.citrix.com/projects/netscaler-nitro-api/en/12.0/configuration/basic/servicegroup/servicegroup/ for all configurations"
233+
description: "NetScaler service group configurations for the backend; Refer: https://developer-docs.netscaler.com/en-us/adc-nitro-api/current-release/configuration/basic/servicegroup.html for all configurations"
234234
type: object
235235
additionalProperties:
236236
type: string
@@ -248,7 +248,7 @@ spec:
248248
description: "Host name specified is used for redirection with URL intact"
249249
type: string
250250
targetExpression:
251-
description: "A target can be specified using Netscaler policy expression"
251+
description: "A target can be specified using NetScaler policy expression"
252252
type: string
253253
responseCode:
254254
description: "Default response code is 302, which can be customised using this attribute"

0 commit comments

Comments
 (0)