From 59c20c5095cf9a469e762ea22eb9f75c10ee4642 Mon Sep 17 00:00:00 2001
From: Simon Rupar <8428013+SimonRupar@users.noreply.github.com>
Date: Tue, 12 Jul 2022 19:39:36 +0200
Subject: [PATCH] [Helm] Added support for setting controller value

---
 helm/README.md                    | 4 +++-
 helm/templates/ingress-class.yaml | 6 ++++--
 helm/values.yaml                  | 2 ++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/helm/README.md b/helm/README.md
index 7d03dfb..f49abeb 100644
--- a/helm/README.md
+++ b/helm/README.md
@@ -49,6 +49,7 @@ The following table lists configurable parameters of the CodeTogether chart and
 | `ingress.annotations`              | Specify ingress class                                                          | `kubernetes.io/ingress.class: nginx`                |
 | `ingress.enabled`                  | Enable ingress controller resource                                             | `true`                                              |
 | `ingress.className`                | IngressClass used for ingress configuration                                    | `codetogether-nginx`                                |
+| `ingress.controllerValue`          | IngressClass Controller value used for ingress configuration                   | `k8s.io/ingress-nginx`                              |
 | `ingress.tls`                      | Ingress TLS configuration                                                      | `[{secretName': codetogether-tls}]`                 |
 | `license.licensee`                 | The license provided by Genuitec                                               | `Example`                                           |
 | `license.maxConnections`           | The maximum connection allowed by the license                                  | `0`                                                 |
@@ -64,7 +65,8 @@ The following table lists configurable parameters of the CodeTogether chart and
 | `locatorCentral.database.sslKey`   | Sets database SSL client key (base64 encoded)                                  |                                                     |
 | `locatorCentral.database.sslCA`    | Sets database SSL client certificate authority (base64 encoded)                |                                                     |
 | `locatorCentral.database.sslCert`  | Sets database SSL client certificate (base64 encoded)                          |                                                     |
-| `locatorEdge.locator`              | Sets JSON string configuration for `locator` mode database                     | `[sample included in the values.yaml file]`         || `locatorEdge.region`               | Sets a region in `edge-with-locator` mode so sessions can be routed out        | `default`                                           |
+| `locatorEdge.locator`              | Sets JSON string configuration for `locator` mode database                     | `[sample included in the values.yaml file]`         |
+| `locatorEdge.region`               | Sets a region in `edge-with-locator` mode so sessions can be routed out        | `default`                                           |
 | `openshift.enabled`                | Set this value to 'true' ONLY if you are deploying into OpenShift              | `false`                                             |
 | `service.type`                     | Service type                                                                   | `ClusterIP`                                         |
 | `service.port`                     | CodeTogether exposed service port                                              | `443`                                               |
diff --git a/helm/templates/ingress-class.yaml b/helm/templates/ingress-class.yaml
index 6c8fee0..7774878 100644
--- a/helm/templates/ingress-class.yaml
+++ b/helm/templates/ingress-class.yaml
@@ -1,8 +1,10 @@
+{{- if .Values.ingress.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: IngressClass
 metadata:
   labels:
     app.kubernetes.io/component: controller
-  name: codetogether-nginx
+  name: {{ .Values.ingress.className }}
 spec:
-  controller: k8s.io/ingress-nginx
\ No newline at end of file
+  controller: {{ .Values.ingress.controllerValue }}
+{{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
index f25a644..4a89253 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -132,6 +132,8 @@ ingress:
     kubernetes.io/ingress.class: nginx
   # className is a value that will be used if Kubernetes version >= 1.18
   className: codetogether-nginx
+  # Controller-value of the controller that is processing this ingressClass
+  controllerValue: k8s.io/ingress-nginx
   tls:
     - secretName: codetogether-tls