feat: move ingress to ui

kubeshop · Sep 18, 2023 · 8a4bef8 · 8a4bef8
1 parent 3b05a32
commit 8a4bef8
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 49 deletions.
diff --git a/charts/testkube-cloud-api/Chart.yaml b/charts/testkube-cloud-api/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: testkube-cloud-api
 description: A Helm chart for Testkube Cloud API
 type: application
-version: 1.15.7
+version: 1.15.8
 appVersion: 1.4.0-dev-7db3141
 maintainers:
  - name: testkube

diff --git a/charts/testkube-cloud-api/README.md b/charts/testkube-cloud-api/README.md
@@ -1,6 +1,6 @@
 # testkube-cloud-api
 
-![Version: 1.15.4](https://img.shields.io/badge/Version-1.15.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0-dev-72a1668](https://img.shields.io/badge/AppVersion-1.4.0--dev--72a1668-informational?style=flat-square)
+![Version: 1.15.8](https://img.shields.io/badge/Version-1.15.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0-dev-7db3141](https://img.shields.io/badge/AppVersion-1.4.0--dev--7db3141-informational?style=flat-square)
 
 A Helm chart for Testkube Cloud API
 
@@ -166,10 +166,6 @@ A Helm chart for Testkube Cloud API
 | serviceAccount.create | bool | `false` | Toggle whether to create a ServiceAccount resource |
 | serviceAccount.labels | object | `{}` | Additional labels to add to the ServiceAccount resource |
 | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
-| statusPagesIngress.annotations | object | `{}` | Additional annotations to add to the WebSocket Ingress resource |
-| statusPagesIngress.enabled | bool | `true` | Toggle whether to enable the Status Pages API Ingress |
-| statusPagesIngress.host | string | `""` | Hostname for which to create rules and TLS certificates |
-| statusPagesIngress.labels | object | `{}` | Additional labels to add to the WebSocket Ingress resource |
 | tolerations | list | `[]` | |
 | websocketsIngress.annotations | object | `{}` | Additional annotations to add to the WebSocket Ingress resource |
 | websocketsIngress.enabled | bool | `true` | Toggle whether to enable the Websocket API Ingress |

diff --git a/charts/testkube-cloud-api/templates/_helpers.tpl b/charts/testkube-cloud-api/templates/_helpers.tpl
@@ -160,14 +160,3 @@ Get Websockets Ingress host
 {{- .Values.websocketsIngress.host }}
 {{- end }}
 {{- end }}
-
-{{/*
-Get Status Pages Ingress host
-*/}}
-{{- define "testkube-cloud-api.ingress.statusPagesHost" -}}
-{{- if .Values.global.domain }}
-{{- printf "%s.%s" .Values.global.statusPagesApiSubdomain .Values.global.domain }}
-{{- else }}
-{{- .Values.statusPagesIngress.host }}
-{{- end }}
-{{- end }}
diff --git a/charts/testkube-cloud-api/values.yaml b/charts/testkube-cloud-api/values.yaml
@@ -358,15 +358,3 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
-
-statusPagesIngress:
- # -- Toggle whether to enable the Status Pages API Ingress
- enabled: true
- # -- Additional labels to add to the WebSocket Ingress resource
- labels: {}
- # -- Additional annotations to add to the WebSocket Ingress resource
- annotations:
- {}
- # kubernetes.io/ingress.class: nginx
- # -- Hostname for which to create rules and TLS certificates
- host: ""
diff --git a/charts/testkube-cloud-ui/Chart.yaml b/charts/testkube-cloud-ui/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: testkube-cloud-ui
 description: A Helm chart for Testkube Cloud UI
 type: application
-version: 1.15.6
+version: 1.15.7
 appVersion: 1.3.3
 maintainers:
  - name: testkube

diff --git a/charts/testkube-cloud-ui/README.md b/charts/testkube-cloud-ui/README.md
@@ -1,6 +1,6 @@
 # testkube-cloud-ui
 
-![Version: 1.14.17](https://img.shields.io/badge/Version-1.14.17-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0-dev-84e330b](https://img.shields.io/badge/AppVersion-1.4.0--dev--84e330b-informational?style=flat-square)
+![Version: 1.15.7](https://img.shields.io/badge/Version-1.15.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.3](https://img.shields.io/badge/AppVersion-1.3.3-informational?style=flat-square)
 
 A Helm chart for Testkube Cloud UI
 
@@ -68,8 +68,13 @@ A Helm chart for Testkube Cloud UI
 | serviceAccount.create | bool | `false` | Toggle whether to create ServiceAccount resource |
 | serviceAccount.labels | object | `{}` | Additional labels to add to the ServiceAccount resource |
 | serviceAccount.name | string | `""` | The name of the ServiceAccount to use. If not set and create is true, a name is generated using the fullname template |
+| statusPagesIngress.annotations | object | `{}` | Additional annotations to add to the WebSocket Ingress resource |
+| statusPagesIngress.enabled | bool | `true` | Toggle whether to enable the Status Pages API Ingress |
+| statusPagesIngress.host | string | `""` | Hostname for which to create rules and TLS certificates |
+| statusPagesIngress.labels | object | `{}` | Additional labels to add to the WebSocket Ingress resource |
 | tolerations | list | `[]` | |
 | ui.apiServerEndpoint | string | `""` | API Server endpoint URL |
+| ui.authStrategy | string | `""` | Auth strategy to use (possible values: "" (default), "gitlab", "github"), setting to "" enables all auth strategies |
 | ui.disableTelemetry | bool | `false` | Force disabling telemetry on the UI |
 | ui.rootRoute | string | `""` | The URL on which UI is served |
 | ui.segment.secretRef | string | `""` | Segment.io write key secret ref (secret must contain key SEGMENTIO_WRITE_KEY_UI) (default is `testkube-cloud-analytics-secret`) |

diff --git a/charts/testkube-cloud-ui/templates/_helpers.tpl b/charts/testkube-cloud-ui/templates/_helpers.tpl
@@ -69,4 +69,15 @@ Get Ingress host
 {{- if .Values.global.domain }}
 {{- printf "%s.%s" .Values.global.uiSubdomain .Values.global.domain }}
 {{- end }}
-{{- end }}
+{{- end }}
+
+{{/*
+Get Status Pages Ingress host
+*/}}
+{{- define "testkube-cloud-ui.ingress.statusPagesHost" -}}
+{{- if .Values.global.domain }}
+{{- printf "%s.%s" .Values.global.statusPagesUiSubdomain .Values.global.domain }}
+{{- else }}
+{{- .Values.statusPagesIngress.host }}
+{{- end }}
+{{- end }}
diff --git a/...ud-api/templates/ingress-statuspages.yaml → ...oud-ui/templates/ingress-statuspages.yaml b/...ud-api/templates/ingress-statuspages.yaml → ...oud-ui/templates/ingress-statuspages.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.global.ingress .Values.statusPagesIngress.enabled -}}
-{{- $fullName := include "testkube-cloud-api.fullname" . -}}
+{{- $fullName := include "testkube-cloud-ui.fullname" . -}}
 {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
@@ -16,7 +16,7 @@ kind: Ingress
 metadata:
  name: {{ $fullName }}-status-pages
  labels:
- {{- include "testkube-cloud-api.labels" . | nindent 4 }}
+ {{- include "testkube-cloud-ui.labels" . | nindent 4 }}
  {{- if .Values.statusPagesIngress.labels }}
  {{- toYaml .Values.ingress.labels | nindent 4 }}
  {{- end }}
@@ -44,10 +44,10 @@ spec:
  {{- end }}
  tls:
  - hosts:
- - {{ include "testkube-cloud-api.ingress.statusPagesHost" . | quote }}
- secretName: {{ .Values.api.tls.tlsSecret }}
+ - {{ include "testkube-cloud-ui.ingress.statusPagesHost" . | quote }}
+ secretName: {{ .Values.ingress.tlsSecretName }}
  rules:
- - host: {{ include "testkube-cloud-api.ingress.statusPagesHost" . | quote }}
+ - host: {{ include "testkube-cloud-ui.ingress.statusPagesHost" . | quote }}
  http:
  paths:
  - path: /

diff --git a/charts/testkube-cloud-ui/values.yaml b/charts/testkube-cloud-ui/values.yaml
@@ -124,3 +124,15 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+statusPagesIngress:
+ # -- Toggle whether to enable the Status Pages API Ingress
+ enabled: true
+ # -- Additional labels to add to the WebSocket Ingress resource
+ labels: {}
+ # -- Additional annotations to add to the WebSocket Ingress resource
+ annotations:
+ {}
+ # kubernetes.io/ingress.class: nginx
+ # -- Hostname for which to create rules and TLS certificates
+ host: ""
diff --git a/charts/testkube-enterprise/Chart.lock b/charts/testkube-enterprise/Chart.lock
@@ -4,10 +4,10 @@ dependencies:
  version: 2.2.5
 - name: testkube-cloud-api
  repository: file://../testkube-cloud-api
- version: 1.15.7
+ version: 1.15.8
 - name: testkube-cloud-ui
  repository: file://../testkube-cloud-ui
- version: 1.15.6
+ version: 1.15.7
 - name: dex
  repository: https://charts.dexidp.io
  version: 0.14.1
@@ -17,5 +17,5 @@ dependencies:
 - name: nats
  repository: https://nats-io.github.io/k8s/helm/charts/
  version: 0.14.2
-digest: sha256:d95af8634397a6cf021f6440ee4da33256db45e7eb59d5fb5342b2672231d3d9
-generated: "2023-09-18T09:03:50.302896037Z"
+digest: sha256:61848ce8f7310bc12056e9f38f0731fb37b0ad16500992d4dab5972abc5b23d8
+generated: "2023-09-18T13:03:26.220284+02:00"
diff --git a/charts/testkube-enterprise/Chart.yaml b/charts/testkube-enterprise/Chart.yaml
@@ -2,16 +2,16 @@ apiVersion: v2
 name: testkube-enterprise
 description: A Helm chart for Testkube Enterprise
 type: application
-version: 1.12.38
+version: 1.12.39
 dependencies:
  - name: common
  version: 2.2.5
  repository: https://charts.bitnami.com/bitnami
  - name: testkube-cloud-api
- version: 1.15.7
+ version: 1.15.8
  repository: file://../testkube-cloud-api
  - name: testkube-cloud-ui
- version: 1.15.6
+ version: 1.15.7
  repository: file://../testkube-cloud-ui
  - name: dex
  version: 0.14.1

diff --git a/charts/testkube-enterprise/README.md b/charts/testkube-enterprise/README.md
@@ -1,6 +1,6 @@
 # testkube-enterprise
 
-![Version: 1.12.38](https://img.shields.io/badge/Version-1.12.38-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.12.39](https://img.shields.io/badge/Version-1.12.39-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart for Testkube Enterprise
 
@@ -21,8 +21,8 @@ A Helm chart for Testkube Enterprise
 
 | Repository | Name | Version |
 |------------|------|---------|
-| file://../testkube-cloud-api | testkube-cloud-api | 1.15.4 |
-| file://../testkube-cloud-ui | testkube-cloud-ui | 1.14.17 |
+| file://../testkube-cloud-api | testkube-cloud-api | 1.15.8 |
+| file://../testkube-cloud-ui | testkube-cloud-ui | 1.15.7 |
 | https://charts.bitnami.com/bitnami | common | 2.2.5 |
 | https://charts.bitnami.com/bitnami | mongodb | 13.10.2 |
 | https://charts.dexidp.io | dex | 0.14.1 |
@@ -125,7 +125,7 @@ A Helm chart for Testkube Enterprise
 | testkube-cloud-api.api.tls.tlsSecret | string | `"testkube-enterprise-api-tls"` | |
 | testkube-cloud-api.fullnameOverride | string | `"testkube-enterprise-api"` | |
 | testkube-cloud-api.image.repository | string | `"testkubeenterprise/testkube-enterprise-api"` | |
-| testkube-cloud-api.image.tag | string | `"1.4.0-dev-72a1668"` | |
+| testkube-cloud-api.image.tag | string | `"1.4.0-dev-7db3141"` | |
 | testkube-cloud-api.ingress | string | `nil` | |
 | testkube-cloud-api.minio.accessModes | list | `["ReadWriteOnce"]` | PVC Access Modes for Minio. The volume is mounted as read-write by a single node. |
 | testkube-cloud-api.minio.affinity | object | `{}` | Affinity for pod assignment. |
@@ -148,7 +148,7 @@ A Helm chart for Testkube Enterprise
 | testkube-cloud-api.prometheus.enabled | bool | `true` | |
 | testkube-cloud-ui.fullnameOverride | string | `"testkube-enterprise-ui"` | |
 | testkube-cloud-ui.image.repository | string | `"testkubeenterprise/testkube-enterprise-ui"` | |
-| testkube-cloud-ui.image.tag | string | `"1.4.0-dev-84e330b"` | |
+| testkube-cloud-ui.image.tag | string | `"1.3.3"` | |
 | testkube-cloud-ui.ingress.tlsSecretName | string | `"testkube-enterprise-ui-tls"` | Name of the TLS secret which contains the certificate files |
 
 ----------------------------------------------

diff --git a/charts/testkube-enterprise/charts/testkube-cloud-api-1.15.7.tgz b/charts/testkube-enterprise/charts/testkube-cloud-api-1.15.7.tgz
diff --git a/charts/testkube-enterprise/charts/testkube-cloud-api-1.15.8.tgz b/charts/testkube-enterprise/charts/testkube-cloud-api-1.15.8.tgz
diff --git a/charts/testkube-enterprise/charts/testkube-cloud-ui-1.15.6.tgz b/charts/testkube-enterprise/charts/testkube-cloud-ui-1.15.6.tgz
diff --git a/charts/testkube-enterprise/charts/testkube-cloud-ui-1.15.7.tgz b/charts/testkube-enterprise/charts/testkube-cloud-ui-1.15.7.tgz