kubeshop · dejanzele · Nov 21, 2023 · Oct 4, 2023 · Oct 4, 2023 · Oct 4, 2023
@@ -58,6 +58,10 @@ jobs:
           git --no-pager diff charts/testkube-enterprise >> $GITHUB_STEP_SUMMARY
           echo -e '```' >> $GITHUB_STEP_SUMMARY
 
+      - name: Check for changes in generated Helm docs models (helm-docs)
+        run: |
+          ./scripts/helm-docs.sh
+
       - name: Commit & push changes
         run: |
           git status

@@ -88,6 +88,10 @@ jobs:
           git --no-pager diff charts/testkube-enterprise >> $GITHUB_STEP_SUMMARY
           echo -e '```' >> $GITHUB_STEP_SUMMARY
 
+      - name: Check for changes in generated Helm docs models (helm-docs)
+        run: |
+          ./scripts/helm-docs.sh
+
       - name: Commit & push changes
         run: |
           git status

@@ -6,30 +6,6 @@ permissions:
   contents: write
 
 jobs:
-  docs-up-to-date:
-    name: Docs Up To Date
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-
-      - name: Check for changes in generated Helm docs models (helm-docs)
-        run: |
-          ./scripts/helm-docs.sh
-          changed=$(git status -s -uno | wc -l)
-          if [[ "$changed" -gt 0 ]]; then
-            echo "Updating helm-docs"
-            git config --global user.name "testkube-cloud-ci-bot"
-            git config --global user.email "testkube-cloud-ci-bot@users.noreply.github.com"
-            git add **/*README.md
-            git commit -m "Updating helm-chart versions and README files"
-            git push
-          else
-            echo  "Docs are up to date"
-          fi
-
   chart-test:
     name: Chart lint
     runs-on: ubuntu-22.04

@@ -4,5 +4,5 @@ helm:
     value: kubeshop/testkube-cloud-api
     forcestring: true
   - name: image.tag
-    value: 1.6.3-rc-cc26fc4
+    value: 1.6.7-rc-832fdf0
     forcestring: true
@@ -4,5 +4,5 @@ helm:
     value: kubeshop/testkube-cloud-api
     forcestring: true
   - name: image.tag
-    value: 1.7.0-dev-e879953
+    value: 1.7.0-dev-bf894c2
     forcestring: true
@@ -4,5 +4,5 @@ helm:
     value: kubeshop/testkube-cloud-api
     forcestring: true
   - name: image.tag
-    value: 1.6.3-rc-cc26fc4
+    value: 1.7.0-rc-37d51f3
     forcestring: true
@@ -4,5 +4,5 @@ helm:
     value: kubeshop/testkube-cloud-api
     forcestring: true
   - name: image.tag
-    value: 1.6.4
+    value: 1.6.7
     forcestring: true
@@ -2,8 +2,8 @@ apiVersion: v2
 name: testkube-cloud-api
 description: A Helm chart for Testkube Cloud API
 type: application
-version: 1.18.1
-appVersion: 1.6.4
+version: 1.22.1
+appVersion: 1.6.7
 maintainers:
   - name: testkube
     url: https://testkube.io

@@ -1,6 +1,6 @@
 # testkube-cloud-api
 
-![Version: 1.16.2](https://img.shields.io/badge/Version-1.16.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.2](https://img.shields.io/badge/AppVersion-1.6.2-informational?style=flat-square)
+![Version: 1.22.1](https://img.shields.io/badge/Version-1.22.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.7](https://img.shields.io/badge/AppVersion-1.6.7-informational?style=flat-square)
 
 A Helm chart for Testkube Cloud API
 
@@ -40,6 +40,7 @@ A Helm chart for Testkube Cloud API
 | api.email.fromName | string | `"Testkube Cloud"` |  |
 | api.inviteMode | string | `"email"` | Configure which invitation mode to use (email|auto-accept): email uses SMTP protocol to send email invites and auto-accept immediately adds them |
 | api.migrations.enabled | bool | `false` | Toggle whether to apply migrations for MongoDB |
+| api.migrations.ttlSecondsAfterFinished | int | `90` | TTL for the migration job |
 | api.migrations.useHelmHooks | bool | `true` | Toggle whether to enable pre-install & pre-upgrade hooks |
 | api.minio.accessKeyId | string | `""` | MinIO access key id |
 | api.minio.credsSecretRef | string | `""` | Credentials secret ref (secret should contain keys: MINIO_ACCESS_KEY_ID, MINIO_SECRET_ACCESS_KEY, MINIO_TOKEN) (default is `testkube-cloud-minio-secret`) |
@@ -63,7 +64,7 @@ A Helm chart for Testkube Cloud API
 | api.outputsBucket | string | `"testkube-cloud-outputs"` | S3 bucket in which outputs are stored |
 | api.sendgrid.apiKey | string | `""` | Sendgrid API key |
 | api.sendgrid.secretRef | string | `""` | Secret API key secret ref (secret must contain key SENDGRID_API_KEY) (default is `sendgrid-api-key`) |
-| api.smtp.host | string | `"smtp.sendgrid.net"` | SMTP host |
+| api.smtp.host | string | `"smtp.example.com"` | SMTP host |
 | api.smtp.password | string | `""` | SMTP password |
 | api.smtp.passwordSecretRef | string | `""` | SMTP secret ref (secret must contain key SMTP_PASSWORD), overrides password field if defined |
 | api.smtp.port | int | `587` | SMTP port |
@@ -100,15 +101,17 @@ A Helm chart for Testkube Cloud API
 | 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.storageApiSubdomain | string | `"storage"` | Storage 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 |
 | grpcIngress.enabled | bool | `true` | Toggle whether to enable the gRPC API Ingress |
-| grpcIngress.host | string | `""` | Hostname for which to create rules and TLS certificates |
+| grpcIngress.host | string | `""` | Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values) |
 | grpcIngress.labels | object | `{}` | Additional labels to add to the gRPC Ingress resource |
+| grpcIngress.maxPayloadSize | string | `"16m"` | Max payload size for proxied gRPC API |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
 | image.repository | string | `"kubeshop/testkube-cloud-api"` |  |
-| image.tag | string | `"1.6.3"` |  |
+| image.tag | string | `"1.6.7"` |  |
 | imagePullSecrets | list | `[]` |  |
 | ingress.annotations | object | `{"nginx.ingress.kubernetes.io/force-ssl-redirect":"true","nginx.ingress.kubernetes.io/preserve-trailing-slash":"true"}` | Common annotations which will be added to all Ingress resources |
 | ingress.className | string | `"nginx"` | Common Ingress class name (NGINX is the only officially supported ingress controller and should not be changed) |
@@ -120,9 +123,16 @@ A Helm chart for Testkube Cloud API
 | minio.customServiceAccountName | string | `""` | Custom service account to attach to the MinIO deployment |
 | minio.enabled | bool | `false` | Toggle whether to deploy MinIO |
 | minio.extraEnvVars | object | `{}` | Extra env vars to pass to MinIO deployment |
+| minio.fullnameOverride | string | `""` | MinIO full name override |
 | minio.image.pullPolicy | string | `"IfNotPresent"` |  |
 | minio.image.repository | string | `"minio/minio"` |  |
-| minio.image.tag | string | `"RELEASE.2023-05-04T21-44-30Z"` |  |
+| minio.image.tag | string | `"RELEASE.2023-11-06T22-26-08Z"` |  |
+| minio.ingress.annotations | object | `{}` | Additional annotations to add to the MinIO Ingress resource |
+| minio.ingress.enabled | bool | `false` | Toggle whether to enable the MinIO Ingress |
+| minio.ingress.host | string | `""` | Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values) |
+| minio.ingress.labels | object | `{}` | Additional labels to add to the MinIO Ingress resource |
+| minio.ingress.tls.tlsSecret | string | `"testkube-cloud-minio-tls"` | TLS secret name which contains the certificate files |
+| minio.nameOverride | string | `""` | MinIO name override |
 | minio.nodeSelector | object | `{}` | Node labels for pod assignment. |
 | minio.persistence.storage | string | `"10Gi"` | Size of the volume claim for MinIO data |
 | minio.podSecurityContext | object | `{}` | MinIO Pod Security Context |
@@ -134,6 +144,7 @@ A Helm chart for Testkube Cloud API
 | minio.serviceAccount.create | bool | `false` | Toggle whether to create a ServiceAccount resource |
 | minio.serviceAccount.labels | object | `{}` | Additional labels to add to the ServiceAccount resource |
 | minio.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 |
+| minio.storageClassName | string | `""` | Storage class name of MinIO PVC |
 | minio.tolerations | list | `[]` | Tolerations for pod assignment. |
 | nameOverride | string | `""` |  |
 | nodeSelector | object | `{}` |  |
@@ -155,7 +166,7 @@ A Helm chart for Testkube Cloud API
 | resources.requests.memory | string | `"128Mi"` |  |
 | restIngress.annotations | object | `{}` | Additional annotations to add to the REST Ingress resource |
 | restIngress.enabled | bool | `true` | Toggle whether to enable the REST API Ingress |
-| restIngress.host | string | `""` | Hostname for which to create rules and TLS certificates |
+| restIngress.host | string | `""` | Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values) |
 | restIngress.labels | object | `{}` | Additional labels to add to the REST Ingress resource |
 | securityContext | object | `{"readOnlyRootFilesystem":true}` | Security Context for app container |
 | service.annotations | object | `{}` | Additional annotations to add to the Service resource |
@@ -170,12 +181,12 @@ 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 | `""` | Hostname for which to create rules and TLS certificates |
+| statusPagesIngress.host | string | `""` | Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values) |
 | 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 |
-| websocketsIngress.host | string | `""` | Hostname for which to create rules and TLS certificates |
+| websocketsIngress.host | string | `""` | Hostname for which to create rules and TLS certificates (if omitted, the host will be generated using the global subdomain and `domain` values) |
 | websocketsIngress.labels | object | `{}` | Additional labels to add to the WebSocket Ingress resource |
 
 ----------------------------------------------

@@ -171,3 +171,16 @@ Get Status Pages Ingress host
 {{- .Values.statusPagesIngress.host }}
 {{- end }}
 {{- end }}
+
+{{/*
+Get MinIO Ingress host
+*/}}
+{{- define "testkube-cloud-api.ingress.minioHost" -}}
+{{- if .Values.global.domain }}
+{{- printf "%s.%s" .Values.global.storageApiSubdomain .Values.global.domain }}
+{{- else if .Values.minio.ingress.host }}
+{{- .Values.minio.ingress.host }}
+{{- else }}
+{{- .Values.api.minio.endpoint }}
+{{- end }}
+{{- end }}
@@ -84,7 +84,7 @@ spec:
                   key: SMTP_PASS
                   name: {{ .Values.api.smtp.passwordSecretRef }}
               {{- else }}
-              value: {{ .Values.api.smtp.password }}
+              value: "{{ .Values.api.smtp.password }}"
               {{- end }}
             {{- end }}
             - name: FROM_EMAIL
@@ -250,11 +250,11 @@ spec:
               value: "{{ .Values.api.outputsBucket }}"
             {{- if .Values.minio.enabled }}
             - name: MINIO_ENDPOINT
-              value: "{{ .Values.api.minio.endpoint }}"
+              value: {{ include "testkube-cloud-api.ingress.minioHost" . | quote }}
             - name: MINIO_REGION
               value: "{{ .Values.api.minio.region }}"
             - name: MINIO_SSL
-              value: "{{ .Values.api.minio.secure }}"
+              value: "{{ if .Values.minio.ingress.enabled }}true{{ else }}{{ .Values.api.minio.secure }}{{ end }}"
             - name: MINIO_EXPIRATION
               value: "{{ .Values.api.minio.expirationPeriod }}"
             - name: MINIO_ACCESS_KEY_ID
@@ -294,7 +294,7 @@ spec:
             - name: {{ $key }}
               valueFrom:
                 secretKeyRef:
-                  key: {{ $key }}
+                  key: {{ $value }}
                   name: api-external-secrets
             {{ end }}
             {{- end}}

@@ -22,7 +22,7 @@ metadata:
     {{- end }}
   annotations:
     nginx.ingress.kubernetes.io/backend-protocol: {{ if .Values.api.tls.serveHTTPS }}GRPCS{{ else }}GRPC{{ end }}
-    nginx.ingress.kubernetes.io/proxy-body-size: 8m
+    nginx.ingress.kubernetes.io/proxy-body-size: {{ .Values.grpcIngress.maxPayloadSize }}
     nginx.ingress.kubernetes.io/client-header-timeout: "10800"
     nginx.ingress.kubernetes.io/client-body-timeout: "10800"
     {{- if and (not .Values.api.tls.serveHTTPS) (eq .Values.global.certificateProvider "cert-manager") }}

@@ -0,0 +1,57 @@
+{{- if and .Values.global.ingress.enabled .Values.minio.ingress.enabled -}}
+{{- $fullName := include "testkube-cloud-api.minio.fullname" . -}}
+{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.minio.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.minio.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "testkube-cloud-api.labels" . | nindent 4 }}
+    {{- with .Values.minio.ingress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  annotations:
+    nginx.ingress.kubernetes.io/backend-protocol: HTTP
+    {{- if 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 }}
+    {{- with .Values.minio.ingress.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  tls:
+    - hosts:
+        - {{ include "testkube-cloud-api.ingress.minioHost" . | quote }}
+      secretName: {{ .Values.minio.ingress.tls.tlsSecret }}
+  rules:
+    - host: {{ include "testkube-cloud-api.ingress.minioHost" . | quote }}
+      http:
+        paths:
+          - path: /
+            {{- if semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion }}
+            pathType: Prefix
+            {{- end }}
+            backend:
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: http
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: http
+              {{- end }}
+{{- end }}
@@ -1,8 +1,8 @@
 {{- if and .Values.global.ingress .Values.statusPagesIngress.enabled -}}
 {{- $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}}
+  {{- if not (hasKey .Values.restIngress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.statusPagesIngress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
   {{- end }}
 {{- end }}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
@@ -17,12 +17,11 @@ metadata:
   name: {{ $fullName }}-status-pages
   labels:
     {{- include "testkube-cloud-api.labels" . | nindent 4 }}
-  {{- if .Values.statusPagesIngress.labels }}
-    {{- toYaml .Values.ingress.labels | nindent 4 }}
-  {{- end }}
+    {{- with .Values.statusPagesIngress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   annotations:
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
-    nginx.ingress.kubernetes.io/preserve-trailing-slash: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: {{ if .Values.api.tls.serveHTTPS }}HTTPS{{ else }}HTTP{{ end }}
     nginx.ingress.kubernetes.io/configuration-snippet: |
       add_header X-Frame-Options "sameorigin";
       add_header X-XSS-Protection "1; mode=block";
@@ -47,6 +46,7 @@ spec:
         - {{ include "testkube-cloud-api.ingress.statusPagesHost" . | quote }}
       secretName: {{ .Values.api.tls.tlsSecret }}
   rules:
+    {{- $tlsConfig := .Values.api.tls }}
     - host: {{ include "testkube-cloud-api.ingress.statusPagesHost" . | quote }}
       http:
         paths:
@@ -59,9 +59,9 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  name: http
+                  name: {{ if $tlsConfig.serveHTTPS }}https{{ else }}http{{ end }}
               {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: http
+              servicePort: {{ if $tlsConfig.serveHTTPS }}https{{ else }}http{{ end }}
               {{- end }}
 {{- end }}
@@ -24,6 +24,7 @@ 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: {{ if .Values.api.tls.serveHTTPS }}HTTPS{{ else }}HTTP{{ end }}
     {{- 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 }}