Skip to content

Commit

Permalink
mereg main
Browse files Browse the repository at this point in the history
  • Loading branch information
ypoplavs committed Nov 10, 2024
2 parents bcb8ed4 + 1caf32e commit cea3b6e
Show file tree
Hide file tree
Showing 34 changed files with 101 additions and 82 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ helm:
value: docker.io/kubeshop/testkube-cloud-api
forcestring: true
- name: image.tag
value: 1.10.78-dev-79a7c158
value: 1.10.78-dev-ff3646fb
forcestring: true
2 changes: 1 addition & 1 deletion charts/testkube-cloud-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: testkube-cloud-api
description: A Helm chart for Testkube Cloud API
type: application
version: 1.104.0
version: 1.105.0
appVersion: 1.10.78
maintainers:
- name: testkube
Expand Down
2 changes: 1 addition & 1 deletion 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.104.0](https://img.shields.io/badge/Version-1.104.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.78](https://img.shields.io/badge/AppVersion-1.10.78-informational?style=flat-square)
![Version: 1.105.0](https://img.shields.io/badge/Version-1.105.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.10.78](https://img.shields.io/badge/AppVersion-1.10.78-informational?style=flat-square)

A Helm chart for Testkube Cloud API

Expand Down
4 changes: 2 additions & 2 deletions charts/testkube-cloud-api/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ Define containerSecurityContext
*/}}
{{- define "testkube-cloud-api.containerSecurityContext" -}}
{{- if .Values.global.containerSecurityContext }}
{{- toYaml .Values.global.containerSecurityContext}}
{{- toYaml .Values.global.containerSecurityContext }}
{{- else }}
{{- toYaml .Values.securityContext }}
{{- end }}
Expand All @@ -184,7 +184,7 @@ Define containerSecurityContext for Init Container
*/}}
{{- define "init-wait-for-mongo.containerSecurityContext" -}}
{{- if .Values.global.containerSecurityContext }}
{{- toYaml .Values.global.containerSecurityContext}}
{{- toYaml .Values.global.containerSecurityContext }}
{{- else }}
{{- toYaml .Values.init.mongo.containerSecurityContext }}
{{- end }}
Expand Down
9 changes: 3 additions & 6 deletions charts/testkube-cloud-api/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,13 @@ spec:
{{- toYaml .Values.imagePullSecrets | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "testkube-cloud-api.serviceAccountName" . }}
securityContext:
{{ include "testkube-cloud-api.podSecurityContext" . | trim }}
securityContext: {{ include "testkube-cloud-api.podSecurityContext" . | nindent 8 }}
{{- if .Values.init.enabled }}
initContainers:
- name: wait-for-mongo
image: {{ include "testkube-cloud-api.init-mongo-image" . }}
imagePullPolicy: {{ .Values.init.mongo.image.pullPolicy }}
securityContext:
{{ include "init-wait-for-mongo.containerSecurityContext" . | trim }}
securityContext: {{ include "init-wait-for-mongo.containerSecurityContext" . | nindent 12 }}
command: ["/bin/sh", "-c"]
args:
- |
Expand All @@ -58,8 +56,7 @@ spec:
{{- end }}
containers:
- name: {{ .Chart.Name }}
securityContext:
{{ include "testkube-cloud-api.containerSecurityContext" . | trim }}
securityContext: {{ include "testkube-cloud-api.containerSecurityContext" . | nindent 12 }}
image: {{ include "testkube-api.image" . }}
imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.image.pullPolicy }}
env:
Expand Down
9 changes: 3 additions & 6 deletions charts/testkube-cloud-api/templates/migrations-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ spec:
{{- toYaml .Values.imagePullSecrets | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "testkube-cloud-api.serviceAccountName" . }}
securityContext:
{{ include "testkube-cloud-api.podSecurityContext" . | trim }}
securityContext: {{ include "testkube-cloud-api.podSecurityContext" . | nindent 8 }}
{{- if .Values.init.enabled }}
initContainers:
- name: wait-for-mongo
image: {{ include "testkube-cloud-api.init-mongo-image" . }}
securityContext:
{{ include "init-wait-for-mongo.containerSecurityContext" . | trim}}
securityContext: {{ include "init-wait-for-mongo.containerSecurityContext" . | nindent 12 }}
command: ["/bin/sh", "-c"]
args:
- |
Expand All @@ -62,8 +60,7 @@ spec:
containers:
- name: migrations
image: {{ include "testkube-api.image" . }}
securityContext:
{{ include "testkube-cloud-api.containerSecurityContext" . | trim }}
securityContext: {{ include "testkube-cloud-api.containerSecurityContext" . | nindent 12 }}
args: ["migrate"]
env:
- name: ENTERPRISE_MODE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
helm:
parameters:
- name: global.ai.enabled
value: "true"
forcestring: false
- name: image.name
value: docker.io/kubeshop/testkube-cloud-ui
forcestring: true
- name: image.tag
value: 2.7.2-rc.1
value: 2.7.3-rc.6
forcestring: true
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ helm:
value: docker.io/kubeshop/testkube-cloud-ui
forcestring: true
- name: image.tag
value: 2.7.2-rc.1
value: 2.7.3-rc.6
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.72.0
appVersion: 2.7.1
version: 1.76.0
appVersion: 2.7.2
maintainers:
- name: testkube
url: https://testkube.io
Expand Down
10 changes: 8 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.72.0](https://img.shields.io/badge/Version-1.72.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.1](https://img.shields.io/badge/AppVersion-2.7.1-informational?style=flat-square)
![Version: 1.76.0](https://img.shields.io/badge/Version-1.76.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.2](https://img.shields.io/badge/AppVersion-2.7.2-informational?style=flat-square)

A Helm chart for Testkube Cloud UI

Expand Down Expand Up @@ -32,6 +32,12 @@ A Helm chart for Testkube Cloud UI
| externalSecrets.keys | object | `{}` | |
| externalSecrets.refreshInterval | string | `"5m"` | |
| fullnameOverride | string | `""` | |
| global.ai | object | `{"enabled":false,"kind":"openai","model":"gpt-4o-mini","secretRef":"testkube-ai","uri":"https://ai.testkube.dev"}` | Testkube AI service settings (ALPHA - for Kubecon purpose only for now) |
| global.ai.enabled | bool | `false` | Enable Testkube AI keys for frontend |
| global.ai.kind | string | `"openai"` | LLM kind (openaai | ollama) |
| global.ai.model | string | `"gpt-4o-mini"` | LLM model - LLM need to support it |
| global.ai.secretRef | string | `"testkube-ai"` | Secret name |
| global.ai.uri | string | `"https://ai.testkube.dev"` | API URI |
| global.certManager.issuerRef | string | `""` | Certificate Issuer ref (only used if `provider` is set to `cert-manager`) |
| global.certificateProvider | string | `""` | TLS provider (possible values: "", "cert-manager") |
| global.containerSecurityContext | object | `{}` | Global security Context for all containers |
Expand All @@ -48,7 +54,7 @@ A Helm chart for Testkube Cloud UI
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.registry | string | `""` | If defined, it will prepend the registry to the image name, if not, default docker.io will be prepended |
| image.repository | string | `"kubeshop/testkube-cloud-ui"` | |
| image.tag | string | `"2.7.1"` | |
| image.tag | string | `"2.7.2"` | |
| imagePullSecrets | list | `[]` | |
| ingress.annotations | object | `{}` | Additional Ingress annotations |
| ingress.className | string | `"nginx"` | Ingress class (NGINX Controller is the only officially supported Ingress controller) |
Expand Down
2 changes: 1 addition & 1 deletion charts/testkube-cloud-ui/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Define containerSecurityContext
*/}}
{{- define "testkube-cloud-ui.containerSecurityContext" -}}
{{- if .Values.global.containerSecurityContext }}
{{- toYaml .Values.global.containerSecurityContext}}
{{- toYaml .Values.global.containerSecurityContext }}
{{- else }}
{{- toYaml .Values.securityContext }}
{{- end }}
Expand Down
21 changes: 17 additions & 4 deletions charts/testkube-cloud-ui/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ spec:
{{- toYaml .Values.imagePullSecrets | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "testkube-cloud-ui.serviceAccountName" . }}
securityContext:
{{ include "testkube-cloud-ui.podSecurityContext" . | trim }}
securityContext: {{ include "testkube-cloud-ui.podSecurityContext" . | nindent 8 }}
containers:
- name: {{ .Chart.Name }}
securityContext:
{{ include "testkube-cloud-ui.containerSecurityContext" . | trim }}
securityContext: {{ include "testkube-cloud-ui.containerSecurityContext" . | nindent 12 }}
image: {{ include "testkube-dashboard.image" . }}
imagePullPolicy: {{ .Values.global.imagePullPolicy | default .Values.image.pullPolicy }}
ports:
Expand All @@ -53,6 +51,21 @@ spec:
- name: REACT_APP_AUTH_STRATEGY
value: {{ .Values.ui.authStrategy }}
{{- end }}
{{- if .Values.global.ai.enabled }}
- name: TK_AI_URI
value: {{ .Values.global.ai.uri }}
- name: TK_AI_KIND
value: {{ .Values.global.ai.kind }}
- name: TK_AI_MODEL
value: {{ .Values.global.ai.model }}
- name: TK_AI_KEY
{{- if .Values.global.ai.secretRef }}
valueFrom:
secretKeyRef:
name: {{ .Values.global.ai.secretRef }}
key: "TK_AI_KEY"
{{- end }}
{{- end }}
{{- if .Values.sentry.enabled }}
- name: REACT_APP_SENTRY_KEY
{{- if .Values.sentry.secretRef }}
Expand Down
14 changes: 13 additions & 1 deletion charts/testkube-cloud-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ global:
containerSecurityContext: {}
# -- Global security Context for all pods
podSecurityContext: {}
# -- Testkube AI service settings (ALPHA - for Kubecon purpose only for now)
ai:
# -- Enable Testkube AI keys for frontend
enabled: false
# -- API URI
uri: "https://ai.testkube.dev"
# -- LLM kind (openaai | ollama)
kind: "openai"
# -- LLM model - LLM need to support it
model: "gpt-4o-mini"
# -- Secret name
secretRef: testkube-ai
replicaCount: 1
sentry:
# -- Toggle whether to enable Sentry.io error reporting
Expand All @@ -45,7 +57,7 @@ image:
repository: kubeshop/testkube-cloud-ui
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "2.7.1"
tag: "2.7.2"
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
Expand Down
12 changes: 6 additions & 6 deletions charts/testkube-enterprise/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ dependencies:
version: 2.13.3
- name: testkube-cloud-api
repository: file://../testkube-cloud-api
version: 1.104.0
version: 1.105.0
- name: testkube-cloud-ui
repository: file://../testkube-cloud-ui
version: 1.72.0
version: 1.76.0
- name: testkube-worker-service
repository: file://../testkube-worker-service
version: 1.45.0
version: 1.46.0
- name: testkube
repository: https://kubeshop.github.io/helm-charts
version: 2.1.75
version: 2.1.81
- name: dex
repository: file://./charts/dex
version: 0.19.1-4
version: 0.19.1-5
- name: mongodb
repository: file://./charts/mongodb
version: 16.2.1-1
- name: nats
repository: file://./charts/nats
version: 1.2.6-2
version: 1.2.6-3
- name: minio
repository: file://./charts/minio
version: 14.8.3-1
Expand Down
14 changes: 7 additions & 7 deletions charts/testkube-enterprise/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ apiVersion: v2
name: testkube-enterprise
description: A Helm chart for Testkube Enterprise
type: application
version: 2.11.0
version: 2.17.0
dependencies:
- name: common
version: 2.13.3
repository: https://charts.bitnami.com/bitnami
- name: testkube-cloud-api
version: 1.104.0
version: 1.105.0
repository: file://../testkube-cloud-api
- name: testkube-cloud-ui
version: 1.72.0
version: 1.76.0
repository: file://../testkube-cloud-ui
- name: testkube-worker-service
version: 1.45.0
version: 1.46.0
repository: file://../testkube-worker-service
- name: testkube
alias: testkube-agent
version: 2.1.75
version: 2.1.81
repository: https://kubeshop.github.io/helm-charts
condition: testkube-agent.enabled
- name: dex
version: 0.19.1-4
version: 0.19.1-5
repository: file://./charts/dex
condition: dex.enabled
- name: mongodb
Expand All @@ -31,7 +31,7 @@ dependencies:
condition: mongodb.enabled
- name: nats
condition: testkube-api.nats.enabled
version: 1.2.6-2
version: 1.2.6-3
repository: "file://./charts/nats"
- name: minio
version: 14.8.3-1
Expand Down
16 changes: 8 additions & 8 deletions charts/testkube-enterprise/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# testkube-enterprise

![Version: 2.11.0](https://img.shields.io/badge/Version-2.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
![Version: 2.17.0](https://img.shields.io/badge/Version-2.17.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)

A Helm chart for Testkube Enterprise

Expand All @@ -16,15 +16,15 @@ A Helm chart for Testkube Enterprise

| Repository | Name | Version |
|------------|------|---------|
| file://../testkube-cloud-api | testkube-cloud-api | 1.104.0 |
| file://../testkube-cloud-ui | testkube-cloud-ui | 1.72.0 |
| file://../testkube-worker-service | testkube-worker-service | 1.45.0 |
| file://./charts/dex | dex | 0.19.1-4 |
| file://./charts/nats | nats | 1.2.6-2 |
| file://../testkube-cloud-api | testkube-cloud-api | 1.105.0 |
| file://../testkube-cloud-ui | testkube-cloud-ui | 1.76.0 |
| file://../testkube-worker-service | testkube-worker-service | 1.46.0 |
| file://./charts/dex | dex | 0.19.1-5 |
| file://./charts/nats | nats | 1.2.6-3 |
| https://charts.bitnami.com/bitnami | common | 2.13.3 |
| https://charts.bitnami.com/bitnami | minio | 14.7.0 |
| https://charts.bitnami.com/bitnami | mongodb | 15.6.16 |
| https://kubeshop.github.io/helm-charts | testkube-agent(testkube) | 2.1.75 |
| https://kubeshop.github.io/helm-charts | testkube-agent(testkube) | 2.1.81 |

## Values

Expand Down Expand Up @@ -263,7 +263,7 @@ A Helm chart for Testkube Enterprise
| testkube-cloud-ui.fullnameOverride | string | `"testkube-enterprise-ui"` | |
| testkube-cloud-ui.image.registry | string | `""` | If defined, it will prepend the registry to the image name, if not, default docker.io will be prepended |
| testkube-cloud-ui.image.repository | string | `"kubeshop/testkube-enterprise-ui"` | |
| testkube-cloud-ui.image.tag | string | `"2.7.1"` | |
| testkube-cloud-ui.image.tag | string | `"2.7.2"` | |
| testkube-cloud-ui.ingress.className | string | `"nginx"` | Ingress classname |
| testkube-cloud-ui.ingress.tlsSecretName | string | `"testkube-enterprise-ui-tls"` | Name of the TLS secret which contains the certificate files |
| testkube-cloud-ui.ingressRedirect | object | `{"enabled":false}` | Toggle whether to enable redirect Ingress which allows having a different subdomain redirecting to the actual Dashboard UI Ingress URL |
Expand Down
2 changes: 1 addition & 1 deletion charts/testkube-enterprise/charts/dex/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
type: application
name: dex
version: 0.19.1-4
version: 0.19.1-5
appVersion: "2.41.1"
kubeVersion: ">=1.14.0-0"
description: OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable connectors.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Define containerSecurityContext
*/}}
{{- define "dex.containerSecurityContext" -}}
{{- if .Values.global.containerSecurityContext }}
{{- toYaml .Values.global.containerSecurityContext}}
{{- toYaml .Values.global.containerSecurityContext }}
{{- else }}
{{- toYaml .Values.securityContext }}
{{- end }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,14 @@ spec:
{{- with .Values.priorityClassName }}
priorityClassName: {{ . | quote }}
{{- end }}
securityContext:
{{ include "dex.podSecurityContext" . | trim }}
securityContext: {{ include "dex.podSecurityContext" . | nindent 8 }}
{{- with .Values.hostAliases }}
hostAliases:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
securityContext:
{{ include "dex.containerSecurityContext" . | trim }}
securityContext: {{ include "dex.containerSecurityContext" . | nindent 12 }}
{{- include "dex.image" . | nindent 10 }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
args:
Expand Down
2 changes: 1 addition & 1 deletion charts/testkube-enterprise/charts/nats/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
- nats
- messaging
- cncf
version: 1.2.6-2
version: 1.2.6-3
home: http://github.com/nats-io/k8s
maintainers:
- email: info@nats.io
Expand Down
2 changes: 1 addition & 1 deletion charts/testkube-enterprise/charts/nats/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# nats

![Version: 1.2.6-2](https://img.shields.io/badge/Version-1.2.6--2-informational?style=flat-square) ![AppVersion: 2.10.22](https://img.shields.io/badge/AppVersion-2.10.22-informational?style=flat-square)
![Version: 1.2.6-3](https://img.shields.io/badge/Version-1.2.6--3-informational?style=flat-square) ![AppVersion: 2.10.22](https://img.shields.io/badge/AppVersion-2.10.22-informational?style=flat-square)

A Helm chart for the NATS.io High Speed Cloud Native Distributed Communications Technology.

Expand Down
Loading

0 comments on commit cea3b6e

Please sign in to comment.