Merge pull request #1 from modelix/mps232

Support for MPS 2023.2
modelix · Mar 5, 2024 · 61eb487 · 61eb487
2 parents 1f62139 + 1563f31
commit 61eb487
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 32 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,9 +1,8 @@
 name: Release
 on:
-  push:
-    branches:
-      - 'main'
   workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * *' # run at 2 AM UTC
 
 jobs:
   release:

diff --git a/helm/modelix/templates/common/instances-manager-deployment.yaml b/helm/modelix/templates/common/instances-manager-deployment.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       serviceAccountName: "{{ include "modelix.serviceAccountName" . }}"
       containers:
-      - image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-instances-manager:{{ .Values.imageTags.instancesManager | default .Chart.AppVersion }}"
+      - image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-instances-manager:{{ .Values.imageTags.instancesManager | default .Values.versions.modelix.workspaces }}"
         imagePullPolicy: IfNotPresent
         name: instances-manager
         env:

diff --git a/helm/modelix/templates/common/keycloak-deployment.yaml b/helm/modelix/templates/common/keycloak-deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: keycloak
-        image: "{{ .Values.dockerProxy.prefix }}modelix/keycloak:{{ .Values.imageTags.keycloak | default .Chart.Version }}"
+        image: "{{ .Values.dockerProxy.prefix }}modelix/keycloak:{{ .Values.imageTags.keycloak | default .Values.versions.modelix.kubernetes | default .Chart.Version }}"
         args: ["start-dev", "--import-realm"]
         env:
         - name: KC_LOG_LEVEL

diff --git a/helm/modelix/templates/common/model-deployment.yaml b/helm/modelix/templates/common/model-deployment.yaml
@@ -28,7 +28,7 @@ spec:
             - name: jdbc_url
               value: jdbc:postgresql://{{ include "modelix.fullname" . }}-db:5432/
             {{- include "modelix.keycloakEnv" . | nindent 12 }}
-          image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-model:{{ .Values.imageTags.model | default .Chart.AppVersion }}"
+          image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-model:{{ .Values.imageTags.model | default .Values.versions.modelix.core }}"
           imagePullPolicy: IfNotPresent
           name: model
           ports:

diff --git a/helm/modelix/templates/common/proxy-deployment.yaml b/helm/modelix/templates/common/proxy-deployment.yaml
@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: proxy
-        image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-proxy:{{ .Values.imageTags.proxy | default .Chart.Version }}"
+        image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-proxy:{{ .Values.imageTags.proxy | default .Values.versions.modelix.kubernetes | default .Chart.Version }}"
         imagePullPolicy: IfNotPresent
         env:
           - name: KUBERNETES_NAMESPACE

diff --git a/helm/modelix/templates/common/workspace-client-deployment.yaml b/helm/modelix/templates/common/workspace-client-deployment.yaml
@@ -30,7 +30,7 @@ spec:
           effect: "NoExecute"
       containers:
       - name: workspace-client
-        image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-workspace-client:{{ .Values.imageTags.wsClient | default .Chart.AppVersion }}"
+        image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-workspace-client:{{ .Values.imageTags.wsClient | default .Values.versions.modelix.workspaces }}"
         imagePullPolicy: IfNotPresent
         env:
         - name: "modelix_executionMode"
@@ -40,28 +40,37 @@ spec:
         - name: MODEL_URI
           value: "http://{{ include "modelix.fullname" . }}-model:28101/"
         ports:
-        - containerPort: 8887
-        resources: 
+        - name: "projector"
+          containerPort: 8887
+        - name: "jvmdebug"
+          containerPort: 5071
+        - name: "yourkit"
+          containerPort: 10001
+        - name: "diff"
+          containerPort: 33334
+        - name: "generator"
+          containerPort: 33335
+        resources:
           requests:
             memory: "4.0Gi" # is replaced with the value in the workspace configuration
             cpu: 500m
           limits:
             memory: "4.0Gi" # is replaced with the value in the workspace configuration
             cpu: "1.5"
-        readinessProbe:
-          httpGet:
-            path: /
-            port: 33333
-          initialDelaySeconds: 10
-          periodSeconds: 5
-          timeoutSeconds: 3
-        livenessProbe:
-          httpGet:
-            path: /
-            port: 33333
-          initialDelaySeconds: 120
-          periodSeconds: 20
-          timeoutSeconds: 10
+#        readinessProbe:
+#          httpGet:
+#            path: /
+#            port: 8887
+#          initialDelaySeconds: 10
+#          periodSeconds: 5
+#          timeoutSeconds: 3
+#        livenessProbe:
+#          httpGet:
+#            path: /
+#            port: 8887
+#          initialDelaySeconds: 120
+#          periodSeconds: 20
+#          timeoutSeconds: 10
       restartPolicy: Always
       {{- include "modelix.pullSecret" . | nindent 6 }}
 {{- end -}}
diff --git a/helm/modelix/templates/common/workspace-client-service.yaml b/helm/modelix/templates/common/workspace-client-service.yaml
@@ -15,9 +15,18 @@ spec:
   - name: "modelix-ui"
     port: 33333
     targetPort: 33333
+  - name: "diff"
+    port: 33334
+    targetPort: 33334
+  - name: "generator"
+    port: 33335
+    targetPort: 33335
   - name: "debug"
     port: 5071
     targetPort: 5071
+  - name: "yourkit"
+    port: 10001
+    targetPort: 10001
   selector:
     component: workspace-client
     {{- include "modelix.selectorLabels" . | nindent 4 }}

diff --git a/helm/modelix/templates/common/workspace-manager-deployment.yaml b/helm/modelix/templates/common/workspace-manager-deployment.yaml
@@ -34,13 +34,13 @@ spec:
           - name: "WORKSPACE_JOB_IMAGE_NAME"
             value: "{{ .Values.dockerProxy.prefix }}modelix/modelix-workspace-job"
           - name: "WORKSPACE_JOB_IMAGE_VERSION"
-            value: "{{ .Values.imageTags.wsJob | default .Chart.AppVersion }}"
+            value: "{{ .Values.imageTags.wsJob | default .Values.versions.modelix.workspaces | default .Chart.AppVersion }}"
           - name: "KUBERNETES_PREFIX"
             value: "{{ include "modelix.fullname" . }}-"
           - name: MODELIX_MAX_BODY_SIZE
             value: "{{ .Values.maxBodySize }}"
           {{- include "modelix.keycloakEnv" . | nindent 10 }}
-        image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-workspace-manager:{{ .Values.imageTags.wsManager | default .Chart.AppVersion }}"
+        image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-workspace-manager:{{ .Values.imageTags.wsManager | default .Values.versions.modelix.workspaces }}"
         imagePullPolicy: IfNotPresent
         name: workspace-manager
         ports:

diff --git a/helm/modelix/values.yaml b/helm/modelix/values.yaml
@@ -2,10 +2,16 @@
 nameOverride: ""
 fullnameOverride: ""
 
+versions:
+  modelix:
+    workspaces: "0.3.2"
+    core: "4.11.5"
+    kubernetes: "0.1.2-dirty"
+
 imageTags:
   db: ""
   instancesManager: ""
-  model: "2.10.5"
+  model: ""
   oauth: ""
   proxy: ""
   keycloak: ""

diff --git a/helm/update-versions.sh b/helm/update-versions.sh
@@ -15,10 +15,11 @@ MODELIX_CORE_VERSION=$(getProperty modelixCoreVersion)
 MODELIX_WORKSPACES_VERSION=$(getProperty modelixWorkspacesVersion)
 HELM_CHART_VERSION="$(cat ../helm-chart-version.txt)"
 
-sed -i.bak -E "s/^appVersion:.*/appVersion: \"${MODELIX_WORKSPACES_VERSION}\"/" modelix/Chart.yaml
+sed -i.bak -E "s/^appVersion:.*/appVersion: \"${HELM_CHART_VERSION}\"/" modelix/Chart.yaml
 sed -i.bak -E "s/^version:.*/version: \"${HELM_CHART_VERSION}\"/" modelix/Chart.yaml
 rm modelix/Chart.yaml.bak
 
-sed -i.bak -E "s/  model: \".*\"/  model: \"${MODELIX_CORE_VERSION}\"/" modelix/values.yaml
+sed -i.bak -E "s/    core: \".*\"/    core: \"${MODELIX_CORE_VERSION}\"/" modelix/values.yaml
+sed -i.bak -E "s/    workspaces: \".*\"/    workspaces: \"${MODELIX_WORKSPACES_VERSION}\"/" modelix/values.yaml
+sed -i.bak -E "s/    kubernetes: \".*\"/    kubernetes: \"${HELM_CHART_VERSION}\"/" modelix/values.yaml
 rm modelix/values.yaml.bak
-
diff --git a/keycloak-extensions/build.gradle.kts b/keycloak-extensions/build.gradle.kts
@@ -12,3 +12,9 @@ dependencies {
 tasks.withType<Jar> {
     archiveFileName.set("keycloak-extensions.jar")
 }
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
diff --git a/versions.properties b/versions.properties
@@ -1,4 +1,4 @@
 # Modelix core version.
-modelixCoreVersion=2.10.5
+modelixCoreVersion=4.11.5
 # Modelix Workspaces versions
-modelixWorkspacesVersion=0.1.2
+modelixWorkspacesVersion=0.3.3