From 8aa01bf0cb2c7a9a2691cad3e4e812d445c8e170 Mon Sep 17 00:00:00 2001
From: Dawid Rusnak <dawid@drcode.pl>
Date: Tue, 12 Nov 2024 10:48:30 +0100
Subject: [PATCH] fix: add back CLI ingress

---
 charts/testkube-api/README.md   |  7 +++++++
 charts/testkube-api/values.yaml | 20 ++++++++++++++++++++
 charts/testkube/README.md       |  6 ++++++
 charts/testkube/values.yaml     | 29 +++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+)

diff --git a/charts/testkube-api/README.md b/charts/testkube-api/README.md
index be4085688..2a7637dd7 100644
--- a/charts/testkube-api/README.md
+++ b/charts/testkube-api/README.md
@@ -29,6 +29,13 @@ A Helm chart for Testkube api
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | autoscaling.targetMemoryUtilizationPercentage | int | `80` |  |
 | cdeventsTarget | string | `""` |  |
+| cliIngress.annotations | object | `{}` |  |
+| cliIngress.enabled | bool | `false` |  |
+| cliIngress.hosts | list | `[]` |  |
+| cliIngress.labels | object | `{}` |  |
+| cliIngress.path | string | `"/results/(v\\d/.*)"` |  |
+| cliIngress.tls | list | `[]` |  |
+| cliIngress.tlsenabled | bool | `false` |  |
 | cloud.envId | string | `""` |  |
 | cloud.existingSecret.envId | string | `""` |  |
 | cloud.existingSecret.key | string | `""` |  |
diff --git a/charts/testkube-api/values.yaml b/charts/testkube-api/values.yaml
index 378b4145c..1ea1db55d 100644
--- a/charts/testkube-api/values.yaml
+++ b/charts/testkube-api/values.yaml
@@ -633,6 +633,26 @@ uiIngress:
   #     - testkube.example.com
   #   secretName: testkube-cert-secret
 
+## cliIngress parameters
+cliIngress:
+  ## Use cliIngress
+  enabled: false
+  ## Labels to add to the Ingress
+  labels: {}
+  ## Annotations to add to the Ingress
+  annotations: {}
+  ## The Path to Nginx.
+  path: /results/(v\d/.*)
+  ## Hostnames must be provided if Ingress is enabled.
+  hosts: []
+  # - testkube.example.com
+  tlsenabled: false
+  # Placing a host in the TLS config will indicate a certificate should be created
+  tls: []
+  # - hosts:
+  #     - testkube.example.com
+  #   secretName: testkube-cert-secret
+
 ## Prometheus monitoring
 prometheus:
   ## Toggle whether to install ServiceMonitor
diff --git a/charts/testkube/README.md b/charts/testkube/README.md
index c00083fd7..d2af72dd2 100644
--- a/charts/testkube/README.md
+++ b/charts/testkube/README.md
@@ -219,6 +219,12 @@ kubectl label --overwrite crds scripts.tests.testkube.io app.kubernetes.io/manag
 | testkube-api.additionalVolumes | list | `[]` | Additional volumes to be added |
 | testkube-api.analyticsEnabled | bool | `true` | Enable analytics for Testkube |
 | testkube-api.cdeventsTarget | string | `""` | target for cdevents emission via http(s) |
+| testkube-api.cliIngress.annotations | object | `{}` | Additional annotations for the Ingress resource. |
+| testkube-api.cliIngress.enabled | bool | `false` | Use ingress |
+| testkube-api.cliIngress.hosts | list | `["testkube.example.com"]` | Hostnames must be provided if Ingress is enabled. |
+| testkube-api.cliIngress.path | string | `"/results/(v\\d/.*)"` |  |
+| testkube-api.cliIngress.tls | list | `[]` | Placing a host in the TLS config will indicate a certificate should be created |
+| testkube-api.cliIngress.tlsenabled | bool | `false` | Toggle whether to enable TLS on the ingress |
 | testkube-api.cloud.key | string | `""` | Testkube Clouc License Key (for Environment) |
 | testkube-api.cloud.tls.certificate.caFile | string | `"/tmp/agent-cert/ca.crt"` | Default path for ca file |
 | testkube-api.cloud.tls.certificate.certFile | string | `"/tmp/agent-cert/cert.crt"` | Default path for certificate file |
diff --git a/charts/testkube/values.yaml b/charts/testkube/values.yaml
index b874b1199..9bf44d201 100644
--- a/charts/testkube/values.yaml
+++ b/charts/testkube/values.yaml
@@ -614,6 +614,35 @@ testkube-api:
     #     - testkube.example.com
     #   secretName: testkube-cert-secret
 
+  # cliIngress parameters
+  cliIngress:
+    # -- Use ingress
+    enabled: false
+    # -- Additional annotations for the Ingress resource.
+    annotations: {}
+    # e.g. annotations for NGINX Ingress Controller:
+    #   kubernetes.io/ingress.class: nginx
+    #   nginx.ingress.kubernetes.io/rewrite-target: /$1
+    #   nginx.ingress.kubernetes.io/force-ssl-redirect: "false"
+    #   nginx.ingress.kubernetes.io/ssl-redirect: "false"
+    #   nginx.ingress.kubernetes.io/configuration-snippet: |
+    #     more_set_headers "X-CLI-Ingress: true";
+    # for websockets
+    #   nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
+    #   nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
+    path: /results/(v\d/.*)
+    # -- Hostnames must be provided if Ingress is enabled.
+    hosts:
+      - testkube.example.com
+    # -- Toggle whether to enable TLS on the ingress
+    tlsenabled: false
+    # -- Placing a host in the TLS config will indicate a certificate should be created
+    tls:
+      []
+      # - hosts:
+      #     - testkube.example.com
+    #   secretName: testkube-cert-secret
+
   # Storage for Testkube API using MinIO
   storage:
     # -- MinIO endpoint