fix: update ingress name (#39)

* fix: update ingress name * ci: updates * fix: add status subdomain to all environments * fix: add subdomain to enterprise * fix: charts * fix: delete charts * updating chart testkube-cloud-api version to 1.15.3 and appVersion to v1.4.0-dev-72a1668; Updating testkube-enterprise chart version to 1.12.37. * build: automatic update of edge-testkube-cloud-api updates image kubeshop/testkube-cloud-api tag '1.4.0-dev-88d810f' to '1.4.0-dev-72a1668' * ci: pull chart in from develop * fix: remove ingress configs from enterprise --------- Co-authored-by: testkube-cloud-ci-bot <testkube-cloud-ci-bot@users.noreply.github.com> Co-authored-by: argocd-image-updater <noreply@argoproj.io>
kubeshop · Sep 14, 2023 · 220a109 · 220a109
1 parent dc384d9
commit 220a109
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 30 deletions.
diff --git a/charts/testkube-cloud-api/README.md b/charts/testkube-cloud-api/README.md
@@ -1,10 +1,6 @@
 # testkube-cloud-api
 
-<<<<<<< HEAD
-![Version: 1.14.7](https://img.shields.io/badge/Version-1.14.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.13](https://img.shields.io/badge/AppVersion-1.3.13-informational?style=flat-square)
-=======
-![Version: 1.14.12](https://img.shields.io/badge/Version-1.14.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.3.14](https://img.shields.io/badge/AppVersion-1.3.14-informational?style=flat-square)
->>>>>>> origin/develop
+![Version: 1.15.3](https://img.shields.io/badge/Version-1.15.3-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)
 
 A Helm chart for Testkube Cloud API
 
@@ -101,6 +97,7 @@ A Helm chart for Testkube Cloud API
 | global.imagePullSecrets | list | `[]` | Global image pull secrets (provided usually by a parent chart like testkube-enterprise) |
 | global.ingress.enabled | bool | `true` | Toggle whether to enable or disable all Ingress resources (if false, all Ingress resources will be disabled and cannot be overriden) |
 | global.restApiSubdomain | string | `"api"` | REST API subdomain which get prepended to the domain |
+| global.statusPagesApiSubdomain | string | `"status"` | Status Pages API subdomain which get prepended to the domain |
 | global.uiSubdomain | string | `"cloud"` | UI subdomain which get prepended to the domain |
 | global.websocketApiSubdomain | string | `"websockets"` | Websocket API subdomain which get prepended to the domain |
 | grpcIngress.annotations | object | `{}` | Additional annotations to add to the gRPC Ingress resource |
@@ -171,7 +168,7 @@ A Helm chart for Testkube Cloud API
 | 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 | `"*.status.testkube.io"` | Hostname for which to create rules and TLS certificates |
+| 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 |

diff --git a/charts/testkube-cloud-api/templates/_helpers.tpl b/charts/testkube-cloud-api/templates/_helpers.tpl
@@ -160,3 +160,14 @@ 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/templates/ingress-statuspages.yaml b/charts/testkube-cloud-api/templates/ingress-statuspages.yaml
@@ -44,10 +44,10 @@ spec:
  {{- end }}
  tls:
  - hosts:
- - {{ .Values.statusPagesIngress.host | quote }}
+ - {{ include "testkube-cloud-api.ingress.statusPagesHost" . | quote }}
  secretName: {{ .Values.ingress.tlsSecretName }}
  rules:
- - host: {{ .Values.statusPagesIngress.host | quote }}
+ - host: {{ include "testkube-cloud-api.ingress.statusPagesHost" . | quote }}
  http:
  paths:
  - path: /

diff --git a/charts/testkube-cloud-api/values.yaml b/charts/testkube-cloud-api/values.yaml
@@ -23,6 +23,8 @@ global:
  grpcApiSubdomain: "agent"
  # -- Websocket API subdomain which get prepended to the domain
  websocketApiSubdomain: "websockets"
+ # -- Status Pages API subdomain which get prepended to the domain
+ statusPagesApiSubdomain: "status"
  # -- TLS provider (possible values: "", "cert-manager")
  certificateProvider: ""
  certManager:
@@ -367,4 +369,4 @@ statusPagesIngress:
  {}
  # kubernetes.io/ingress.class: nginx
  # -- Hostname for which to create rules and TLS certificates
- host: "*.status.testkube.io"
+ host: ""
diff --git a/charts/testkube-cloud-ui/README.md b/charts/testkube-cloud-ui/README.md
@@ -1,10 +1,6 @@
 # testkube-cloud-ui
 
-<<<<<<< HEAD
-![Version: 1.14.8](https://img.shields.io/badge/Version-1.14.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0-dev-d3d68fc](https://img.shields.io/badge/AppVersion-1.4.0--dev--d3d68fc-informational?style=flat-square)
-=======
 ![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)
->>>>>>> origin/develop
 
 A Helm chart for Testkube Cloud UI
 

diff --git a/charts/testkube-enterprise/Chart.yaml b/charts/testkube-enterprise/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: testkube-enterprise
 description: A Helm chart for Testkube Enterprise
 type: application
-version: 1.12.37
+version: 1.12.38
 dependencies:
  - name: common
  version: 2.2.5

diff --git a/charts/testkube-enterprise/README.md b/charts/testkube-enterprise/README.md
@@ -1,6 +1,6 @@
 # testkube-enterprise
 
-![Version: 1.12.37](https://img.shields.io/badge/Version-1.12.37-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![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)
 
 A Helm chart for Testkube Enterprise
 
@@ -21,13 +21,8 @@ A Helm chart for Testkube Enterprise
 
 | Repository | Name | Version |
 |------------|------|---------|
-<<<<<<< HEAD
-| file://../testkube-cloud-api | testkube-cloud-api | 1.14.7 |
-| file://../testkube-cloud-ui | testkube-cloud-ui | 1.14.8 |
-=======
-| file://../testkube-cloud-api | testkube-cloud-api | 1.14.12 |
+| file://../testkube-cloud-api | testkube-cloud-api | 1.15.3 |
 | file://../testkube-cloud-ui | testkube-cloud-ui | 1.14.17 |
->>>>>>> origin/develop
 | 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 |
@@ -71,6 +66,7 @@ A Helm chart for Testkube Enterprise
 | global.imagePullSecrets | list | `[]` | Image pull secrets to use for testkube-cloud-api and testkube-cloud-ui |
 | global.ingress.enabled | bool | `true` | Global toggle whether to create Ingress resources |
 | global.restApiSubdomain | string | `"api"` | REST API subdomain which get prepended to the domain |
+| global.statusPagesApiSubdomain | string | `"status"` | Status Pages API subdomain which get prepended to the domain |
 | global.uiSubdomain | string | `"dashboard"` | UI subdomain which get prepended to the domain |
 | global.websocketApiSubdomain | string | `"websockets"` | Websocket API subdomain which get prepended to the domain |
 | mongodb.auth.enabled | bool | `false` | Toggle whether to enable MongoDB authentication |
@@ -129,11 +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"` | |
-<<<<<<< HEAD
-| testkube-cloud-api.image.tag | string | `"1.3.13"` | |
-=======
-| testkube-cloud-api.image.tag | string | `"1.3.14"` | |
->>>>>>> origin/develop
+| testkube-cloud-api.image.tag | string | `"1.4.0-dev-72a1668"` | |
 | 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. |
@@ -156,11 +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"` | |
-<<<<<<< HEAD
-| testkube-cloud-ui.image.tag | string | `"1.4.0-dev-d3d68fc"` | |
-=======
 | testkube-cloud-ui.image.tag | string | `"1.4.0-dev-84e330b"` | |
->>>>>>> origin/develop
 | 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/values.yaml b/charts/testkube-enterprise/values.yaml
@@ -23,6 +23,8 @@ global:
  grpcApiSubdomain: "agent"
  # -- Websocket API subdomain which get prepended to the domain
  websocketApiSubdomain: "websockets"
+ # -- Status Pages API subdomain which get prepended to the domain
+ statusPagesApiSubdomain: "status"
  # -- TLS provider (possible values: "", "cert-manager")
  certificateProvider: "cert-manager"
  certManager: