persist the config for ws ingress

kubeshop · Nov 10, 2023 · 972e213 · 972e213
1 parent 580e97f
commit 972e213
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/charts/testkube-cloud-api/templates/ingress-ws.yaml b/charts/testkube-cloud-api/templates/ingress-ws.yaml
@@ -24,6 +24,8 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
     nginx.ingress.kubernetes.io/proxy-body-size: 8m
+    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
+    nginx.org/websocket-services:  {{ include "testkube-cloud-api.fullname" . }}
     {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }}
     cert-manager.io/cluster-issuer: {{ required ".Values.global.certManager.issuerRef must be provided if provider is cert-manager" .Values.global.certManager.issuerRef }}
     {{- end }}

diff --git a/charts/testkube-cloud-api/values.yaml b/charts/testkube-cloud-api/values.yaml
@@ -207,7 +207,6 @@ podSecurityContext: {}
 # -- Security Context for app container
 securityContext:
   readOnlyRootFilesystem: true
-
 service:
   # -- Service type
   type: ClusterIP
@@ -221,7 +220,6 @@ service:
   grpcPort: 8089
   # -- Metrics port
   metricsPort: 9000
-
 ingress:
   # -- Common annotations which will be added to all Ingress resources
   annotations:
@@ -236,7 +234,7 @@ restIngress:
   labels: {}
   # -- Additional annotations to add to the REST Ingress resource
   annotations: {}
-    # kubernetes.io/ingress.class: nginx
+  # kubernetes.io/ingress.class: nginx
   # -- Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values)
   host: ""
 grpcIngress:
@@ -246,7 +244,7 @@ grpcIngress:
   labels: {}
   # -- Additional annotations to add to the gRPC Ingress resource
   annotations: {}
-    # kubernetes.io/ingress.class: nginx
+  # kubernetes.io/ingress.class: nginx
   # -- Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values)
   host: ""
 websocketsIngress:
@@ -256,7 +254,7 @@ websocketsIngress:
   labels: {}
   # -- Additional annotations to add to the WebSocket Ingress resource
   annotations: {}
-    # kubernetes.io/ingress.class: nginx
+  # kubernetes.io/ingress.class: nginx
   # -- Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values)
   host: ""
 statusPagesIngress:
@@ -266,10 +264,9 @@ statusPagesIngress:
   labels: {}
   # -- Additional annotations to add to the WebSocket Ingress resource
   annotations: {}
-    # kubernetes.io/ingress.class: nginx
+  # kubernetes.io/ingress.class: nginx
   # -- Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values)
   host: ""
-
 ## MinIO parameters
 minio:
   # -- Toggle whether to deploy MinIO
@@ -340,22 +337,19 @@ minio:
   podSecurityContext: {}
   # -- MinIO Container Security Context
   securityContext: {}
-
 resources:
   requests:
     cpu: 100m
     memory: 128Mi
   # -- It is strongly recommended to set limits for both cpu and memory
   limits: {}
-
 autoscaling:
   # -- Toggle whether to enable Horizontal Pod Autoscaler
   enabled: false
   minReplicas: 1
   maxReplicas: 10
   targetCPUUtilizationPercentage: 80
   targetMemoryUtilizationPercentage: 80
-
 prometheus:
   # -- Toggle whether to create ServiceMonitor resource for Prometheus Operator
   enabled: true
@@ -367,9 +361,6 @@ prometheus:
   port: metrics
   # -- Metrics path which will be scraped
   path: /metrics
-
 nodeSelector: {}
-
 tolerations: []
-
 affinity: {}
diff --git a/charts/testkube-enterprise/values.yaml b/charts/testkube-enterprise/values.yaml
@@ -40,7 +40,6 @@ global:
   dex:
     # -- Global Dex issuer url which is configured both in Dex and API
     issuer: ""
-
 ## Testkube Cloud API chart parameters
 testkube-cloud-api:
   fullnameOverride: testkube-enterprise-api
@@ -76,7 +75,7 @@ testkube-cloud-api:
       image:
         # -- Migrations image repository
         repository: testkubeenterprise/testkube-enterprise-api-migrations
-       # -- clean up finished jobs
+        # -- clean up finished jobs
       ttlSecondsAfterFinished: 90
     mongo:
       # -- Mongo DSN connection string
@@ -187,7 +186,6 @@ testkube-cloud-api:
     enabled: false
   ingress:
     className: nginx
-
 testkube-cloud-ui:
   fullnameOverride: testkube-enterprise-ui
   image:
@@ -196,7 +194,6 @@ testkube-cloud-ui:
   ingress:
     # -- Name of the TLS secret which contains the certificate files
     tlsSecretName: testkube-enterprise-ui-tls
-
 ## NATS chart parameter
 ## For more configuration parameters of NATS chart please look here: https://docs.nats.io/running-a-nats-service/nats-kubernetes/helm-charts
 nats: