diff --git a/charts/studio/Chart.yaml b/charts/studio/Chart.yaml index b631a6bf..5d23e0c3 100644 --- a/charts/studio/Chart.yaml +++ b/charts/studio/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: studio description: A Helm chart for Kubernetes type: application -version: 0.6.7 -appVersion: "v2.29.0" +version: 0.7.0 +appVersion: "v2.40.0" maintainers: - name: iterative email: support@iterative.ai diff --git a/charts/studio/README.md b/charts/studio/README.md index 72fb207a..75df2c1a 100644 --- a/charts/studio/README.md +++ b/charts/studio/README.md @@ -1,6 +1,6 @@ # studio -![Version: 0.6.7](https://img.shields.io/badge/Version-0.6.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.29.0](https://img.shields.io/badge/AppVersion-v2.29.0-informational?style=flat-square) +![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.29.0](https://img.shields.io/badge/AppVersion-v2.29.0-informational?style=flat-square) A Helm chart for Kubernetes @@ -125,7 +125,7 @@ A Helm chart for Kubernetes | serviceAccount.annotations | object | `{}` | | | serviceAccount.create | bool | `false` | | | serviceAccount.name | string | `""` | | -| studioBackend | object | `{"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":5,"minReplicas":1,"targetCPUUtilizationPercentage":80},"envFromSecret":"","envVars":{},"image":{"pullPolicy":"IfNotPresent","repository":"docker.iterative.ai/studio-backend"},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"1000m","memory":"2Gi"},"requests":{"cpu":"500m","memory":"1Gi"}},"securityContext":{},"service":{"port":8000,"type":"ClusterIP"},"strategy":{"rollingUpdate":{"maxSurge":"50%","maxUnavailable":0}},"tolerations":[]}` | Studio Backend settings group | +| studioBackend | object | `{"affinity":{},"autoscaling":{"enabled":false,"maxReplicas":5,"minReplicas":1,"targetCPUUtilizationPercentage":80},"envFromSecret":"","envVars":{},"image":{"pullPolicy":"IfNotPresent","repository":"docker.iterative.ai/studio-backend"},"nodeSelector":{},"podAnnotations":{},"podSecurityContext":{},"replicaCount":1,"resources":{"limits":{"cpu":"1000m","memory":"2Gi"},"requests":{"cpu":"500m","memory":"1Gi"}},"securityContext":{},"service":{"port":8000,"type":"ClusterIP"},"serviceAccount":{"annotations":{},"create":false,"name":""},"strategy":{"rollingUpdate":{"maxSurge":"50%","maxUnavailable":0}},"tolerations":[]}` | Studio Backend settings group | | studioBackend.envFromSecret | string | `""` | The name of an existing Secret that contains sensitive environment variables passed to backend pods. | | studioBackend.envVars | object | `{}` | Additional environment variables for backend pods | | studioBackend.replicaCount | int | `1` | Number of replicas of backend pods | diff --git a/charts/studio/templates/NOTES.txt b/charts/studio/templates/NOTES.txt index b4037b87..2867c6c0 100644 --- a/charts/studio/templates/NOTES.txt +++ b/charts/studio/templates/NOTES.txt @@ -1,6 +1,6 @@ Application URL: {{- if .Values.global.ingress.enabled }} - {{ include "schema" . }}://{{.Values.global.host }}/{{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}{{ include "studio.basePath" . }}{{- end }} + {{ include "scheme" . }}://{{.Values.global.host }}/{{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}{{ include "studio.basePath" . }}{{- end }} {{- else if contains "NodePort" .Values.studioUi.service.type }} Get the application URL by running these commands: export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "studio.fullname" . }}) diff --git a/charts/studio/templates/_helpers.tpl b/charts/studio/templates/_helpers.tpl index a802c1dd..81408855 100644 --- a/charts/studio/templates/_helpers.tpl +++ b/charts/studio/templates/_helpers.tpl @@ -177,7 +177,7 @@ Create the name of the service account to use {{- end }} {{- define "studio-backend.serviceAccountName" -}} -{{- if .Values.studioWorker.serviceAccount.create }} +{{- if ((.Values.studioBackend).serviceAccount).create }} {{- default (printf "%s%s" (include "studio.fullname" .) "-backend") .Values.studioWorker.serviceAccount.name }} {{- else }} {{- default "default" .Values.studioWorker.serviceAccount.name }} @@ -185,7 +185,7 @@ Create the name of the service account to use {{- end }} {{- define "studio-worker.serviceAccountName" -}} -{{- if .Values.studioWorker.serviceAccount.create }} +{{- if ((.Values.studioWorker).serviceAccount).create }} {{- default (printf "%s%s" (include "studio.fullname" .) "-worker") .Values.studioWorker.serviceAccount.name }} {{- else }} {{- default "default" .Values.studioWorker.serviceAccount.name }} @@ -193,7 +193,7 @@ Create the name of the service account to use {{- end }} {{- define "studio-dvcx-worker.serviceAccountName" -}} -{{- if .Values.studioDvcxWorker.serviceAccount.create }} +{{- if ((.Values.studioDvcxWorker).serviceAccount).create }} {{- default (printf "%s%s" (include "studio.fullname" .) "-dvcx-worker") .Values.studioDvcxWorker.serviceAccount.name }} {{- else }} {{- default "default" .Values.studioDvcxWorker.serviceAccount.name }} @@ -215,6 +215,6 @@ checksum/secret-studio: {{ include (print $.Template.BasePath "/secret-studio.ya {{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .Values.dockerServer (printf "%s:%s" .Values.dockerUsername .Values.dockerPassword | b64enc) }} {{- end }} -{{- define "schema" -}} +{{- define "scheme" -}} http{{- if $.Values.global.ingress.tlsEnabled }}s{{- end }} {{- end }} diff --git a/charts/studio/templates/configmap-studio.yaml b/charts/studio/templates/configmap-studio.yaml index ff59cbfb..58c5a2cd 100644 --- a/charts/studio/templates/configmap-studio.yaml +++ b/charts/studio/templates/configmap-studio.yaml @@ -9,8 +9,8 @@ data: {{- end }} ALLOWED_HOSTS: "*" - API_URL: "{{ include "schema" . }}://{{.Values.global.host }}{{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}/{{ include "studio.basePath" . }}{{- end }}/api" - UI_URL: "{{ include "schema" . }}://{{.Values.global.host }}/{{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}{{ include "studio.basePath" . }}{{- end }}" + API_URL: "{{ include "scheme" . }}://{{.Values.global.host }}{{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}/{{ include "studio.basePath" . }}{{- end }}/api" + UI_URL: "{{ include "scheme" . }}://{{.Values.global.host }}/{{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}{{ include "studio.basePath" . }}{{- end }}" {{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }} BASE_PATH: /{{ include "studio.basePath" . }} @@ -26,7 +26,7 @@ data: BITBUCKET_API_URL: {{ .Values.global.scmProviders.bitbucket.apiUrl | quote}} {{- end }} {{- if and .Values.global.scmProviders.bitbucket.enabled $webhookHost }} - BITBUCKET_WEBHOOK_URL: "{{ include "schema" . }}://{{ $webhookHost }}/webhook/bitbucket/" + BITBUCKET_WEBHOOK_URL: "{{ include "scheme" . }}://{{ $webhookHost }}/webhook/bitbucket/" {{- end }} ENABLE_BLOBVAULT: "True" @@ -43,8 +43,8 @@ data: {{- else }} BLOBVAULT_LOCAL_ENABLED: "True" BLOBVAULT_LOCAL_PATH: "/blobvault" - BLOBVAULT_ENDPOINT_URL: "{{ include "schema" . }}://{{.Values.global.host }}{{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}/{{ include "studio.basePath" . }}{{- end }}/blobvault" - BLOBVAULT_ENDPOINT_URL_FE: "{{ include "schema" . }}://{{.Values.global.host }}{{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}/{{ include "studio.basePath" . }}{{- end }}/blobvault" + BLOBVAULT_ENDPOINT_URL: "{{ include "scheme" . }}://{{.Values.global.host }}{{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}/{{ include "studio.basePath" . }}{{- end }}/blobvault" + BLOBVAULT_ENDPOINT_URL_FE: "{{ include "scheme" . }}://{{.Values.global.host }}{{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}/{{ include "studio.basePath" . }}{{- end }}/blobvault" {{- end }} {{- if .Values.global.celery.brokerUrl }} @@ -75,7 +75,7 @@ data: GITHUB_URL: {{ .Values.global.scmProviders.github.url | quote }} {{- end }} {{- if and .Values.global.scmProviders.github.enabled $webhookHost }} - GITHUB_WEBHOOK_URL: "{{ include "schema" . }}://{{ $webhookHost }}/webhook/github/" + GITHUB_WEBHOOK_URL: "{{ include "scheme" . }}://{{ $webhookHost }}/webhook/github/" {{- end }} {{- if .Values.global.scmProviders.github.clientId }} GITHUB_APP_CLIENT_ID: {{ .Values.global.scmProviders.github.clientId | quote }} @@ -94,7 +94,7 @@ data: GITLAB_URL: {{ .Values.global.scmProviders.gitlab.url | quote}} {{- end }} {{- if and .Values.global.scmProviders.gitlab.enabled $webhookHost }} - GITLAB_WEBHOOK_URL: "{{ include "schema" . }}://{{ $webhookHost }}/webhook/gitlab/" + GITLAB_WEBHOOK_URL: "{{ include "scheme" . }}://{{ $webhookHost }}/webhook/gitlab/" {{- end }} {{- if .Values.global.maxViews }} diff --git a/charts/studio/templates/serviceaccount-backend.yaml b/charts/studio/templates/serviceaccount-backend.yaml index eeb9e5e6..8a285f74 100644 --- a/charts/studio/templates/serviceaccount-backend.yaml +++ b/charts/studio/templates/serviceaccount-backend.yaml @@ -1,4 +1,4 @@ -{{- if .Values.studioBackend.serviceAccount.create -}} +{{- if ((.Values.studioBackend).serviceAccount).create -}} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/charts/studio/templates/serviceaccount-dvcx-worker.yaml b/charts/studio/templates/serviceaccount-dvcx-worker.yaml index 1b4e30e0..2d0acebd 100644 --- a/charts/studio/templates/serviceaccount-dvcx-worker.yaml +++ b/charts/studio/templates/serviceaccount-dvcx-worker.yaml @@ -1,4 +1,4 @@ -{{- if .Values.studioDvcxWorker.serviceAccount.create -}} +{{- if ((.Values.studioDvcxWorker).serviceAccount).create -}} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/charts/studio/templates/serviceaccount-worker.yaml b/charts/studio/templates/serviceaccount-worker.yaml index f0ac5a06..f9cf365b 100644 --- a/charts/studio/templates/serviceaccount-worker.yaml +++ b/charts/studio/templates/serviceaccount-worker.yaml @@ -1,4 +1,4 @@ -{{- if .Values.studioWorker.serviceAccount.create -}} +{{- if ((.Values.studioWorker).serviceAccount).create -}} apiVersion: v1 kind: ServiceAccount metadata: diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml index 6619a537..26fd1a80 100644 --- a/charts/studio/values.yaml +++ b/charts/studio/values.yaml @@ -427,7 +427,6 @@ studioBackend: # -- Number of replicas of backend pods replicaCount: 1 - image: repository: docker.iterative.ai/studio-backend pullPolicy: IfNotPresent @@ -677,7 +676,7 @@ studioWorker: # Specifies whether a service account should be created create: false # Annotations to add to the service account - annotations: { } + annotations: {} # The name of the service account to use. # If not set and create is true, a name is generated using the fullname template name: "" @@ -779,7 +778,7 @@ studioDvcxWorker: # Specifies whether a service account should be created create: false # Annotations to add to the service account - annotations: { } + annotations: {} # The name of the service account to use. # If not set and create is true, a name is generated using the fullname template name: ""