Merge pull request #78 from apoorva-05/master

cncRouterImage support in CNC
netscaler · May 13, 2021 · 130484d · 130484d
2 parents c87c5a3 + dba2be8
commit 130484d
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 13 deletions.
diff --git a/citrix-cloud-native/Chart.yaml b/citrix-cloud-native/Chart.yaml
@@ -26,7 +26,7 @@ dependencies:
     condition: mcIngress.enabled
     alias: mcIngress
   - name: citrix-node-controller
-    version: "2.2.3"
+    version: "2.2.4"
     condition: cnc.enabled
     alias: cnc
   - name: citrix-observability-exporter

diff --git a/citrix-cloud-native/charts/citrix-node-controller/Chart.yaml b/citrix-cloud-native/charts/citrix-node-controller/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "2.2.3"
+appVersion: "2.2.4"
 description: A Helm chart for Citrix k8s node controller
 home: https://www.citrix.com
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png 
@@ -9,4 +9,4 @@ maintainers:
 name: citrix-node-controller
 sources:
 - https://github.com/citrix/citrix-k8s-node-controller
-version: 2.2.3
+version: 2.2.4
diff --git a/citrix-cloud-native/charts/citrix-node-controller/README.md b/citrix-cloud-native/charts/citrix-node-controller/README.md
@@ -7,7 +7,7 @@ In Kubernetes environments, sometimes the services are exposed for external acce
 ```
    helm repo add citrix https://citrix.github.io/citrix-helm-charts/
 
-   helm install cnc citrix/citrix-cloud-native --set cnc.enabled=true,cnc.license.accept=yes,cnc.nsIP=<NSIP>,cnc.vtepIP=<Citrix ADC SNIP>,cnc.vxlan.id=<VXLAN ID>,cnc.vlan.port=<VXLAN PORT>,cnc.network=<IP-address-range-for-VTEP-overlay>,cnc.adcCredentialSecret=<Secret-for-ADC-credentials>
+   helm install cnc citrix/citrix-cloud-native --set cnc.enabled=true,cnc.license.accept=yes,cnc.nsIP=<NSIP>,cnc.vtepIP=<Citrix ADC SNIP>,cnc.vxlan.id=<VXLAN ID>,cnc.vxlan.port=<VXLAN PORT>,cnc.network=<IP-address-range-for-VTEP-overlay>,cnc.adcCredentialSecret=<Secret-for-ADC-credentials>,cnc.cniType=<CNI-overlay-name>
 ```
 
 > **Important:**
@@ -112,17 +112,18 @@ The following table lists the mandatory and optional parameters that you can con
 | --------- | --------------------- | ------------- | ----------- |
 | cnc.enabled | Mandatory | False | Set to "True" for deploying Citrix Node Controller. |
 | cnc.license.accept | Mandatory | no | Set `yes` to accept the CNC end user license agreement. |
-| cnc.image | Mandatory | `quay.io/citrix/citrix-k8s-node-controller:2.2.3` | The CNC image. |
+| cnc.image | Mandatory | `quay.io/citrix/citrix-k8s-node-controller:2.2.4` | The CNC image. |
 | cnc.pullPolicy | Mandatory | IfNotPresent | The CNC image pull policy. |
 | cnc.adcCredentialSecret | Mandatory | N/A | The secret key to log on to the Citrix ADC VPX or MPX. For information on how to create the secret keys, see [Prerequisites](#prerequistes). |
-| cnc.nsIP | Mandatory | N/A | The IP address of the Citrix ADC device. For details, see [Prerequisites](#prerequistes). |
+| cnc.nsIP | Mandatory | N/A | The IPaddress or Hostname of the Citrix ADC device. For details, see [Prerequisites](#prerequistes). |
 | cnc.vtepIP | Mandatory | N/A | The Citrix ADC SNIP. |
 | cnc.network | Mandatory | N/A | The IP address range that CNC uses to configure the VTEP overlay end points on the Kubernetes nodes. |
 | cnc.vxlan.id | Mandatory | N/A | A unique VXLAN VNID to create a VXLAN overlay between Kubernetes cluster and the ingress devices. |
 | cnc.vxlan.port | Mandatory | N/A | The VXLAN port that you want to use for the overlay. |
 | cniType | Mandatory | N/A | The CNI used in k8s cluster. Valid values: flannel,calico,canal,weave,cilium |
 | cnc.dsrIPRange | Optional | N/A | This IP address range is used for DSR Iptable configuration on nodes. Both IP and subnet must be specified in format : "xx.xx.xx.xx/xx"  |
 | cnc.clusterName | Optional | N/A | Unique identifier for the kubernetes cluster on which CNC is deployed. If Provided CNC will configure PolicyBasedRoutes instead of static Routes. For details, see [CNC-PBR-SUPPORT](https://github.com/citrix/citrix-k8s-ingress-controller/tree/master/docs/how-to/pbr.md#configure-pbr-using-the-citrix-node-controller) |
+| cnc.cncRouterImage | Optional | N/A | The Internal Repo Image to be used for kube-cnc-router helper pods when internet access is disabled on cluster nodes. For more details, see [running-cnc-without-internet-access](https://github.com/citrix/citrix-k8s-node-controller/blob/master/deploy/README.md#running-citrix-node-controller-without-internet-access) |
 
 Alternatively, you can define a YAML file with the values for the parameters and pass the values while installing the chart.
 

diff --git a/citrix-cloud-native/charts/citrix-node-controller/templates/deployment.yaml b/citrix-cloud-native/charts/citrix-node-controller/templates/deployment.yaml
@@ -53,3 +53,7 @@ spec:
         - name: "CLUSTER_NAME"
           value: {{ .Values.clusterName | quote }}
 {{- end }}
+{{- if .Values.cncRouterImage }}
+        - name: "CNC_ROUTER_IMAGE"
+          value: {{ .Values.cncRouterImage | quote }}
+{{- end }}
diff --git a/citrix-cloud-native/charts/citrix-node-controller/values.yaml b/citrix-cloud-native/charts/citrix-node-controller/values.yaml
@@ -2,7 +2,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-image: quay.io/citrix/citrix-k8s-node-controller:2.2.3
+image: quay.io/citrix/citrix-k8s-node-controller:2.2.4
 pullPolicy: IfNotPresent
 license:
   accept: no
@@ -16,6 +16,7 @@ vxlan:
 cniType:
 dsrIPRange:
 clusterName:
+cncRouterImage:
 
 serviceAccount:
   # Specifies whether a ServiceAccount should be created

diff --git a/citrix-node-controller/Chart.yaml b/citrix-node-controller/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "2.2.3"
+appVersion: "2.2.4"
 description: A Helm chart for Citrix k8s node controller
 home: https://www.citrix.com
 icon: https://raw.githubusercontent.com/citrix/citrix-helm-charts/gh-pages/icon.png 
@@ -9,4 +9,4 @@ maintainers:
 name: citrix-node-controller
 sources:
 - https://github.com/citrix/citrix-k8s-node-controller
-version: 2.2.3
+version: 2.2.4
diff --git a/citrix-node-controller/README.md b/citrix-node-controller/README.md
@@ -111,17 +111,18 @@ 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 CNC end user license agreement. |
-| image | Mandatory | `quay.io/citrix/citrix-k8s-node-controller:2.2.3` | The CNC image. |
+| image | Mandatory | `quay.io/citrix/citrix-k8s-node-controller:2.2.4` | The CNC image. |
 | pullPolicy | Mandatory | IfNotPresent | The CNC image pull policy. |
 | adcCredentialSecret | Mandatory | N/A | The secret key to log on to the Citrix ADC VPX or MPX. For information on how to create the secret keys, see [Prerequisites](#prerequistes). |
-| nsIP | Mandatory | N/A | The IP address of the Citrix ADC device. For details, see [Prerequisites](#prerequistes). |
+| nsIP | Mandatory | N/A | The IPaddress or Hostname of the Citrix ADC device. For details, see [Prerequisites](#prerequistes). |
 | vtepIP | Mandatory | N/A | The Citrix ADC SNIP. |
 | network | Mandatory | N/A | The IP address range that CNC uses to configure the VTEP overlay end points on the Kubernetes nodes. |
 | vxlan.id | Mandatory | N/A | A unique VXLAN VNID to create a VXLAN overlay between Kubernetes cluster and the ingress devices. |
 | vxlan.port | Mandatory | N/A | The VXLAN port that you want to use for the overlay. |
 | cniType | Mandatory | N/A | The CNI used in k8s cluster. Valid values: flannel,calico,canal,weave,cilium |
 | dsrIPRange | Optional | N/A | This IP address range is used for DSR Iptable configuration on nodes. Both IP and subnet must be specified in format : "xx.xx.xx.xx/xx"  |
 | clusterName | Optional | N/A | Unique identifier for the kubernetes cluster on which CNC is deployed. If Provided CNC will configure PolicyBasedRoutes instead of static Routes. For details, see [CNC-PBR-SUPPORT](https://github.com/citrix/citrix-k8s-ingress-controller/tree/master/docs/how-to/pbr.md#configure-pbr-using-the-citrix-node-controller) |
+| cncRouterImage | Optional | N/A | The Internal Repo Image to be used for kube-cnc-router helper pods when internet access is disabled on cluster nodes. For more details, see [running-cnc-without-internet-access](https://github.com/citrix/citrix-k8s-node-controller/blob/master/deploy/README.md#running-citrix-node-controller-without-internet-access) |
 Alternatively, you can define a YAML file with the values for the parameters and pass the values while installing the chart.
 
 > **Note:**

diff --git a/citrix-node-controller/templates/deployment.yaml b/citrix-node-controller/templates/deployment.yaml
@@ -53,3 +53,7 @@ spec:
         - name: "CLUSTER_NAME"
           value: {{ .Values.clusterName | quote }}
 {{- end }}
+{{- if .Values.cncRouterImage }}
+        - name: "CNC_ROUTER_IMAGE"
+          value: {{ .Values.cncRouterImage | quote }}
+{{- end }}
diff --git a/citrix-node-controller/values.yaml b/citrix-node-controller/values.yaml
@@ -2,7 +2,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-image: quay.io/citrix/citrix-k8s-node-controller:2.2.3
+image: quay.io/citrix/citrix-k8s-node-controller:2.2.4
 pullPolicy: IfNotPresent
 license:
   accept: no
@@ -16,6 +16,7 @@ vxlan:
 cniType:
 dsrIPRange:
 clusterName:
+cncRouterImage:
 
 serviceAccount:
   # Specifies whether a ServiceAccount should be created

diff --git a/citrix_cloud_native_values.yaml b/citrix_cloud_native_values.yaml
@@ -405,7 +405,7 @@ iaSidecar:
 
 cnc:
   enabled: False
-  image: quay.io/citrix/citrix-k8s-node-controller:2.2.3
+  image: quay.io/citrix/citrix-k8s-node-controller:2.2.4
   pullPolicy: IfNotPresent
   license:
     accept: no
@@ -419,6 +419,7 @@ cnc:
   cniType:
   dsrIPRange:
   clusterName:
+  cncRouterImage:
 
   serviceAccount:
     create: true