diff --git a/charts/testkube-cloud-ui/templates/ingress-statuspages.yaml b/charts/testkube-cloud-api/templates/ingress-statuspages.yaml similarity index 90% rename from charts/testkube-cloud-ui/templates/ingress-statuspages.yaml rename to charts/testkube-cloud-api/templates/ingress-statuspages.yaml index 29976c414..102262dd7 100644 --- a/charts/testkube-cloud-ui/templates/ingress-statuspages.yaml +++ b/charts/testkube-cloud-api/templates/ingress-statuspages.yaml @@ -1,5 +1,5 @@ {{- if and .Values.global.ingress .Values.statusPagesIngress.enabled -}} -{{- $fullName := include "testkube-cloud-ui.fullname" . -}} +{{- $fullName := include "testkube-cloud-api.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-ui.labels" . | nindent 4 }} + {{- include "testkube-cloud-api.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-ui.statusPagesIngress.host" . | quote }} + - {{ include "testkube-cloud-api.statusPagesIngress.host" . | quote }} secretName: {{ .Values.ingress.tlsSecretName }} rules: - - host: {{ include "testkube-cloud-ui.statusPagesIngress.host" . | quote }} + - host: {{ include "testkube-cloud-api.statusPagesIngress.host" . | quote }} http: paths: - path: / diff --git a/charts/testkube-cloud-api/values.yaml b/charts/testkube-cloud-api/values.yaml index d76b03369..9982124db 100644 --- a/charts/testkube-cloud-api/values.yaml +++ b/charts/testkube-cloud-api/values.yaml @@ -350,3 +350,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: "*.status.testkube.io" diff --git a/charts/testkube-cloud-ui/values.yaml b/charts/testkube-cloud-ui/values.yaml index 16fc6e401..bbd946751 100644 --- a/charts/testkube-cloud-ui/values.yaml +++ b/charts/testkube-cloud-ui/values.yaml @@ -116,15 +116,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: "*.status.testkube.io"