Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into jacek/feat/testkub…
Browse files Browse the repository at this point in the history
…e-logs-service-chart
  • Loading branch information
exu committed Feb 22, 2024
2 parents 088e319 + ff51605 commit af6b883
Show file tree
Hide file tree
Showing 38 changed files with 695 additions and 106 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/chart-release-dispatch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@ name: Release Helm charts - main on dispatch

on:
repository_dispatch:
types: [trigger-workflow-testkube-cloud-api-main, trigger-workflow-testkube-cloud-ui-main]
types:
[
trigger-workflow-testkube-cloud-api-main,
trigger-workflow-testkube-cloud-ui-main,
trigger-workflow-testkube-worker-service-main,
]

jobs:
release-helm-charts:
name: Release Helm charts
runs-on: ubuntu-22.04
steps:

- name: Checkout
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -81,4 +85,4 @@ jobs:
charts_dir: charts
env:
CR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CR_SKIP_EXISTING: true
CR_SKIP_EXISTING: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ helm:
value: kubeshop/testkube-cloud-api
forcestring: true
- name: image.tag
value: 1.6.7-rc-832fdf0
value: 1.9.1-rc-154b7d30
forcestring: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ helm:
value: kubeshop/testkube-cloud-api
forcestring: true
- name: image.tag
value: 1.8.0-dev-6d5274ea
value: 1.9.2-dev-0b6f646d
forcestring: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ helm:
value: kubeshop/testkube-cloud-api
forcestring: true
- name: image.tag
value: 1.8.0-rc-6d5274ea
value: 1.9.1-rc-154b7d30
forcestring: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ helm:
value: kubeshop/testkube-cloud-api
forcestring: true
- name: image.tag
value: 1.6.7
value: 1.9.2
forcestring: true
4 changes: 2 additions & 2 deletions charts/testkube-cloud-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: testkube-cloud-api
description: A Helm chart for Testkube Cloud API
type: application
version: 1.22.1
appVersion: 1.6.7
version: 1.29.13
appVersion: 1.9.2
maintainers:
- name: testkube
url: https://testkube.io
Expand Down
43 changes: 4 additions & 39 deletions charts/testkube-cloud-api/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# testkube-cloud-api

![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)
![Version: 1.29.13](https://img.shields.io/badge/Version-1.29.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.2](https://img.shields.io/badge/AppVersion-1.9.2-informational?style=flat-square)

A Helm chart for Testkube Cloud API

Expand Down Expand Up @@ -43,7 +43,7 @@ A Helm chart for Testkube Cloud API
| 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`) |
| api.minio.credsSecretRef | string | `""` | Credentials secret ref (secret should contain keys: root-user, root-password, token) (default is `testkube-cloud-minio-secret`) |
| api.minio.endpoint | string | `"minio.testkube.svc.cluster.local:9000"` | MinIO endpoint |
| api.minio.expirationPeriod | int | `0` | Expiration period in days |
| api.minio.region | string | `""` | S3 region |
Expand All @@ -62,6 +62,7 @@ A Helm chart for Testkube Cloud API
| api.oauth.redirectUri | string | `""` | if oauth.secretRef is empty (""), then oauth.redirectUri field will be used for the OAuth redirect URI |
| api.oauth.secretRef | string | `""` | OAuth secret ref for OAuth configuration (secret must contain keys: OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET, OAUTH_ISSUER_URL, OAUTH_REDIRECT_URI) (default is `testkube-cloud-oauth-secret`) |
| api.outputsBucket | string | `"testkube-cloud-outputs"` | S3 bucket in which outputs are stored |
| api.redirectSubdomain | string | `""` | Different UI subdomain which gets prepended to the domain. May be used for the redirect from your actual uiSubdomain endpoint. Works is ingressRedirect option is enabled. |
| 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.example.com"` | SMTP host |
Expand Down Expand Up @@ -100,7 +101,6 @@ 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.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 |
Expand All @@ -111,41 +111,10 @@ A Helm chart for Testkube Cloud API
| 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.7"` | |
| image.tag | string | `"1.9.2"` | |
| 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) |
| minio.accessModes | list | `["ReadWriteOnce"]` | PVC Access Modes for Minio. The volume is mounted as read-write by a single node. |
| minio.affinity | object | `{}` | Affinity for pod assignment (note: podAffinityPreset, podAntiAffinityPreset, and nodeAffinityPreset will be ignored when it's set) |
| minio.credentials.accessKeyId | string | `""` | MinIO access key |
| minio.credentials.secretAccessKey | string | `""` | MinIO secret key |
| minio.credentials.secretRef | string | `""` | MinIO credentials secret ref (secret must contain keys ACCESS_KEY_ID and SECRET_ACCESS_KEY) |
| 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-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 |
| minio.resources.limits | object | `{}` | It is strongly recommended to set limits for both cpu and memory |
| minio.resources.requests.cpu | string | `"100m"` | |
| minio.resources.requests.memory | string | `"128Mi"` | |
| minio.securityContext | object | `{}` | MinIO Container Security Context |
| minio.serviceAccount.annotations | object | `{}` | Additional annotations to add to the ServiceAccount resource |
| 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 | `{}` | |
| payments.apiKey | string | `""` | Payments API key (currently only Stripe is supported) |
Expand Down Expand Up @@ -179,10 +148,6 @@ A Helm chart for Testkube Cloud API
| serviceAccount.create | bool | `false` | Toggle whether to create a ServiceAccount resource |
| serviceAccount.labels | object | `{}` | Additional labels to add to the ServiceAccount resource |
| 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 (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 |
Expand Down
7 changes: 7 additions & 0 deletions charts/testkube-cloud-api/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,10 @@ Get Websockets Ingress host
{{- .Values.websocketsIngress.host }}
{{- end }}
{{- end }}

{{/*
THIS IS A HACK TO WORKAROUND LET'S ENCRYPT RATE LIMITS
*/}}
{{- define "testkube-cloud-api.ingress.hackHost" -}}
{{- printf "health.%s" .Values.global.domain }}
{{- end }}
1 change: 1 addition & 0 deletions charts/testkube-cloud-api/templates/certificate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ spec:
{{- if .Values.websocketsIngress.enabled }}
- {{ include "testkube-cloud-api.ingress.websocketsHost" . | quote }}
{{- end }}
- {{ include "testkube-cloud-api.ingress.hackHost" . | quote }}
issuerRef:
name: {{ required ".Values.global.certManager.issuerRef must be set when provider is cert-manager" .Values.global.certManager.issuerRef }}
kind: {{ .Values.api.tls.certManager.issuerKind }}
Expand Down
6 changes: 0 additions & 6 deletions charts/testkube-cloud-api/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,22 +259,19 @@ websocketsIngress:
# 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: ""

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
Expand All @@ -286,9 +283,6 @@ prometheus:
port: metrics
# -- Metrics path which will be scraped
path: /metrics

nodeSelector: {}

tolerations: []

affinity: {}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ helm:
value: kubeshop/testkube-cloud-ui
forcestring: true
- name: image.tag
value: 1.6.2-rc-d6ebde3
value: 1.8.0-rc-4ad06c7
forcestring: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ helm:
value: kubeshop/testkube-cloud-ui
forcestring: true
- name: image.tag
value: 1.8.0-dev-8513f33
value: 1.8.0-dev-d226617
forcestring: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ helm:
value: kubeshop/testkube-cloud-ui
forcestring: true
- name: image.tag
value: 1.6.2
value: 1.7.8
forcestring: true
4 changes: 2 additions & 2 deletions charts/testkube-cloud-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: testkube-cloud-ui
description: A Helm chart for Testkube Cloud UI
type: application
version: 1.21.0
appVersion: 1.6.2
version: 1.24.5
appVersion: 1.7.8
maintainers:
- name: testkube
url: https://testkube.io
Expand Down
6 changes: 4 additions & 2 deletions charts/testkube-cloud-ui/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# testkube-cloud-ui

![Version: 1.21.0](https://img.shields.io/badge/Version-1.21.0-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.24.5](https://img.shields.io/badge/Version-1.24.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.7.8](https://img.shields.io/badge/AppVersion-1.7.8-informational?style=flat-square)

A Helm chart for Testkube Cloud UI

Expand Down Expand Up @@ -37,10 +37,11 @@ A Helm chart for Testkube Cloud UI
| global.enterpriseMode | bool | `false` | Toggle whether UI is installed in Enterprise mode |
| global.imagePullSecrets | list | `[]` | Global image pull secrets (provided usually by a parent chart like testkube-enterprise) |
| global.ingress.enabled | bool | `true` | Global toggle whether to create Ingress resources |
| global.redirectSubdomain | string | `"app"` | Different UI subdomain which gets prepended to the domain. May be used for the redirect from your actual uiSubdomain endpoint. Works is ingressRedirect option is enabled. |
| global.uiSubdomain | string | `"cloud"` | UI subdomain which get prepended to the domain |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"kubeshop/testkube-cloud-ui"` | |
| image.tag | string | `"1.6.2"` | |
| image.tag | string | `"1.7.8"` | |
| imagePullSecrets | list | `[]` | |
| ingress.annotations | object | `{}` | Additional Ingress annotations |
| ingress.className | string | `"nginx"` | Ingress class (NGINX Controller is the only officially supported Ingress controller) |
Expand All @@ -49,6 +50,7 @@ A Helm chart for Testkube Cloud UI
| ingress.labels | object | `{}` | Additional Ingress labels |
| ingress.tls.provider | string | `"cert-manager"` | TLS provider (possible values: "", "cert-manager") |
| ingress.tlsSecretName | string | `"testkube-cloud-ui-tls"` | Name of the TLS secret which contains the certificate files |
| ingressRedirect | object | `{"annotations":{},"enabled":false,"labels":{}}` | Toggle whether to enable redirect Ingress which allows having a different subdomain redirecting to the actual Dashboard UI Ingress URL |
| nameOverride | string | `""` | |
| nodeSelector | object | `{}` | |
| podAnnotations | object | `{}` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ helm:
value: testkubeenterprise/testkube-enterprise-ui
forcestring: true
- name: testkube-cloud-api.image.tag
value: 1.8.0-rc-6d5274ea
value: 1.9.1-rc-154b7d30
forcestring: true
- name: testkube-cloud-ui.image.tag
value: 1.8.0-rc-a366199
value: 1.8.0-rc-4ad06c7
forcestring: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ helm:
value: testkubeenterprise/testkube-enterprise-ui
forcestring: true
- name: testkube-cloud-api.image.tag
value: 1.8.0-dev-6d5274ea
value: 1.9.2-dev-3fd37505
forcestring: true
- name: testkube-cloud-ui.image.tag
value: 1.8.0-dev-8513f33
value: 1.8.0-dev-d226617
forcestring: true
11 changes: 7 additions & 4 deletions charts/testkube-enterprise/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ dependencies:
version: 2.13.3
- name: testkube-cloud-api
repository: file://../testkube-cloud-api
version: 1.22.1
version: 1.29.13
- name: testkube-cloud-ui
repository: file://../testkube-cloud-ui
version: 1.21.0
version: 1.24.5
- name: testkube-worker-service
repository: file://../testkube-worker-service
version: 1.29.0
- name: testkube-logs-service
repository: file://../testkube-logs-service
version: 1.0.0
Expand All @@ -23,5 +26,5 @@ dependencies:
- name: minio
repository: https://charts.bitnami.com/bitnami
version: 12.10.2
digest: sha256:13b45da7009f9cdff76e3b99dadc251bceb6dfd921db3c6d96e191182f111eb5
generated: "2024-02-19T10:42:28.967638+01:00"
digest: sha256:df3d279139cbf3b74597e512f193af47750aa9982c1a96b2285ee34e08e5db3c
generated: "2024-02-15T14:44:27.748188+01:00"
9 changes: 6 additions & 3 deletions charts/testkube-enterprise/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@ apiVersion: v2
name: testkube-enterprise
description: A Helm chart for Testkube Enterprise
type: application
version: 1.34.1
version: 1.43.9
dependencies:
- name: common
version: 2.13.3
repository: https://charts.bitnami.com/bitnami
- name: testkube-cloud-api
version: 1.22.1
version: 1.29.13
repository: file://../testkube-cloud-api
- name: testkube-cloud-ui
version: 1.21.0
version: 1.24.5
repository: file://../testkube-cloud-ui
- name: testkube-logs-service
version: 1.0.0
repository: file://../testkube-logs-service
condition: global.features.logsV2
- name: testkube-worker-service
version: 1.29.0
repository: file://../testkube-worker-service
- name: dex
version: 0.16.0
repository: https://charts.dexidp.io
Expand Down
Loading

0 comments on commit af6b883

Please sign in to comment.