From 31d5a646425dac93c4cc2ea83b3c57196426e8cf Mon Sep 17 00:00:00 2001 From: slisson Date: Wed, 27 Nov 2024 14:21:07 +0100 Subject: [PATCH] feat: run build jobs using modelix/mps-vnc-baseimage --- .../templates/common/workspace-client-deployment.yaml | 2 +- .../templates/common/workspace-manager-deployment.yaml | 4 ++-- helm/modelix/values.yaml | 6 +++--- versions.properties | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/helm/modelix/templates/common/workspace-client-deployment.yaml b/helm/modelix/templates/common/workspace-client-deployment.yaml index 75fd128..b04d49b 100644 --- a/helm/modelix/templates/common/workspace-client-deployment.yaml +++ b/helm/modelix/templates/common/workspace-client-deployment.yaml @@ -40,7 +40,7 @@ spec: - name: MODEL_URI value: "http://{{ include "modelix.fullname" . }}-model:28101/" - name: PRE_STARTUP_SCRIPT_URL - value: "http://{{ include "modelix.fullname" . }}-workspace-manager:28104/client/pre-startup.sh" + value: "http://{{ include "modelix.fullname" . }}-workspace-manager:28104/static/pre-startup.sh" ports: - name: "vnc" containerPort: 5800 diff --git a/helm/modelix/templates/common/workspace-manager-deployment.yaml b/helm/modelix/templates/common/workspace-manager-deployment.yaml index 9f213f5..5f70922 100644 --- a/helm/modelix/templates/common/workspace-manager-deployment.yaml +++ b/helm/modelix/templates/common/workspace-manager-deployment.yaml @@ -32,9 +32,9 @@ spec: - name: "KUBERNETES_NAMESPACE" value: {{ .Release.Namespace }} - name: "WORKSPACE_JOB_IMAGE_NAME" - value: "{{ .Values.dockerProxy.prefix }}modelix/modelix-workspace-job" + value: "{{ .Values.dockerProxy.prefix }}modelix/mps-vnc-baseimage" - name: "WORKSPACE_JOB_IMAGE_VERSION" - value: "{{ .Values.imageTags.wsJob | default .Values.versions.modelix.workspaces | default .Chart.AppVersion }}" + value: "{{ .Values.versions.modelix.vncBaseImage }}" - name: "KUBERNETES_PREFIX" value: "{{ include "modelix.fullname" . }}-" - name: MODELIX_MAX_BODY_SIZE diff --git a/helm/modelix/values.yaml b/helm/modelix/values.yaml index 2a05790..08367fe 100644 --- a/helm/modelix/values.yaml +++ b/helm/modelix/values.yaml @@ -4,10 +4,10 @@ fullnameOverride: "" versions: modelix: - workspaces: "0.4.4-pr194-1783e3b0" - core: "10.1.0-pr1190-c6ab4b78" + workspaces: "0.4.4-pr194-299426c6" + core: "10.1.0-pr1190-187b03d6" kubernetes: "0.3.1" - vncBaseImage: "0.7.0" + vncBaseImage: "0.8.0" imageTags: db: "" diff --git a/versions.properties b/versions.properties index 51d3713..07d24a9 100644 --- a/versions.properties +++ b/versions.properties @@ -1,4 +1,4 @@ # Modelix core version. -modelixCoreVersion=10.1.0-pr1190-c6ab4b78 +modelixCoreVersion=10.1.0-pr1190-187b03d6 # Modelix Workspaces versions -modelixWorkspacesVersion=0.4.4-pr194-1783e3b0 +modelixWorkspacesVersion=0.4.4-pr194-299426c6