fix: allow passing public endpoint for the storage (i.e. localhost) / provide proper WebSocket server for Demo environment

charts/testkube-cloud-api/README.md

@@ -154,6 +154,9 @@ A Helm chart for Testkube Cloud API
 | global.storage.credsSecretRef | string | `""` | Credentials secret ref (secret should contain keys: root-user, root-password, token) (default is `testkube-cloud-minio-secret`) |
 | global.storage.endpoint | string | `""` | Endpoint to a S3 compatible storage service (without protocol) |
 | global.storage.outputsBucket | string | `""` | S3 bucket in which Test Artifacts & Logs will be stored |
+| global.storage.public | object | `{"endpoint":"","secure":null}` | Optional public address of the storage, that can be accessed by user |
+| global.storage.public.endpoint | string | `""` | Public endpoint to the storage service, that can be accessed by user |
+| global.storage.public.secure | string | `nil` | Toggle whether to use HTTPS when connecting to the public S3 server |
 | global.storage.region | string | `""` | S3 region |
 | global.storage.secretAccessKey | string | `""` | S3 Secret Access Key |
 | global.storage.secure | string | `nil` | Toggle whether to use HTTPS when connecting to the S3 server |

charts/testkube-cloud-api/templates/deployment.yaml

@@ -385,6 +385,10 @@ spec:
               value: "{{ .Values.api.minio.signing.hostname }}"
             - name: "AGENT_STORAGE_SSL"
               value: "{{ .Values.api.minio.signing.secure }}"
+            - name: "PUBLIC_STORAGE_HOSTNAME"
+              value: "{{ .Values.global.storage.public.endpoint }}"
+            - name: "PUBLIC_STORAGE_SSL"
+              value: "{{ .Values.global.storage.public.secure }}"
             {{- if .Values.api.minio.certSecret.enabled }}
             - name: "MINIO_CERT_FILE"
               value: "{{ .Values.api.minio.certSecret.baseMountPath }}/{{ .Values.api.minio.certSecret.certFile }}"

charts/testkube-cloud-api/values.yaml

@@ -84,6 +84,12 @@ global:
     token: ""
     # -- Credentials secret ref (secret should contain keys: root-user, root-password, token) (default is `testkube-cloud-minio-secret`)
     credsSecretRef: ""
+    # -- Optional public address of the storage, that can be accessed by user
+    public:
+      # -- Public endpoint to the storage service, that can be accessed by user
+      endpoint: ""
+      # -- Toggle whether to use HTTPS when connecting to the public S3 server
+      secure: null
   tls: {}
   # -- Toggle whether to globally skip certificate verification
   #skipVerify: false

charts/testkube-cloud-ui/README.md

@@ -83,6 +83,7 @@ A Helm chart for Testkube Cloud 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`) |
 | ui.segment.writeKey | string | `""` | Segment.io write key (overriden by `secretRef` if set) |
+| ui.wsServerEndpoint | string | `""` | WebSocket Server endpoint URL |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

charts/testkube-cloud-ui/templates/deployment.yaml

@@ -43,6 +43,10 @@ spec:
           env:
             - name: REACT_APP_API_SERVER_ENDPOINT
               value: {{ if .Values.ui.apiServerEndpoint}}{{ .Values.ui.apiServerEndpoint }}{{ else }}https://{{ .Values.global.restApiSubdomain }}.{{ .Values.global.domain }}{{ end }}
+            {{- if .Values.ui.wsServerEndpoint }}
+            - name: REACT_APP_WS_SERVER_ENDPOINT
+              value: {{ .Values.ui.wsServerEndpoint }}
+            {{- end }}
             - name: REACT_APP_API_ROOT_ROUTE
               value: {{ if .Values.ui.rootRoute}}{{ tpl .Values.ui.rootRoute $ }}{{ else }}https://{{ .Values.global.uiSubdomain }}.{{ .Values.global.domain }}{{ end }}
             {{- if .Values.ui.authStrategy }}

charts/testkube-cloud-ui/values.yaml

@@ -48,6 +48,8 @@ fullnameOverride: ""
 ui:
   # -- API Server endpoint URL
   apiServerEndpoint: ""
+  # -- WebSocket Server endpoint URL
+  wsServerEndpoint: ""
   # -- The URL on which UI is served
   rootRoute: ""
   # -- Auth strategy to use (possible values: "" (default), "gitlab", "github"), setting to "" enables all auth strategies

charts/testkube-enterprise/README.md

@@ -82,6 +82,9 @@ A Helm chart for Testkube Enterprise
 | global.storage.credsSecretRef | string | `""` | Credentials secret ref (secret should contain keys: root-user, root-password, token) (default is `testkube-cloud-minio-secret`) |
 | global.storage.endpoint | string | `"{{ .Values.global.storageApiSubdomain }}.{{ .Values.global.domain }}"` | Endpoint to a S3 compatible storage service (without protocol) |
 | global.storage.outputsBucket | string | `"testkube-cloud-outputs"` | S3 bucket in which Test Artifacts & Logs will be stored |
+| global.storage.public | object | `{"endpoint":"","secure":null}` | Optional public address of the storage, that can be accessed by user |
+| global.storage.public.endpoint | string | `""` | Public endpoint to the storage service, that can be accessed by user |
+| global.storage.public.secure | string | `nil` | Toggle whether to use HTTPS when connecting to the public S3 server |
 | global.storage.region | string | `""` | S3 region |
 | global.storage.secretAccessKey | string | `"t3stkub3-3nt3rpr1s3"` | S3 Secret Access Key |
 | global.storage.secure | bool | `true` | Toggle whether to use HTTPS when connecting to the S3 server |

charts/testkube-enterprise/profiles/values.demo.yaml

@@ -5,6 +5,10 @@ global:
     issuer: http://localhost:5556
   storage:
     endpoint: "testkube-enterprise-minio:9000"
+    region: eu-west-1
+    public:
+      endpoint: localhost:9000
+      secure: false
     credsSecretRef: testkube-minio-credentials
     secure: false
 
@@ -53,6 +57,7 @@ testkube-cloud-ui:
   ui:
     authStrategy: ""
     apiServerEndpoint: "http://localhost:8090"
+    wsServerEndpoint: "ws://localhost:8090"
     rootRoute: "http://testkube-enterprise-ui:8080"
   additionalEnv:
     REACT_APP_ENABLE_SIGNUP: "true"

charts/testkube-enterprise/values.yaml

@@ -84,6 +84,12 @@ global:
     token: ""
     # -- Credentials secret ref (secret should contain keys: root-user, root-password, token) (default is `testkube-cloud-minio-secret`)
     credsSecretRef: ""
+    # -- Optional public address of the storage, that can be accessed by user
+    public:
+      # -- Public endpoint to the storage service, that can be accessed by user
+      endpoint: ""
+      # -- Toggle whether to use HTTPS when connecting to the public S3 server
+      secure: null
   tls: {}
   # -- Toggle whether to globally skip certificate verification
   #skipVerify: true