Merge branch 'integ_3.5' of github.com:v3io/helm-charts into lc-time-…

…update
v3io · Oct 19, 2023 · 69eaf4d · 69eaf4d
2 parents 367ec78 + 36d2da6
commit 69eaf4d
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 16 deletions.
diff --git a/stable/mlrun/Chart.yaml b/stable/mlrun/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: mlrun
-version: 0.8.26
-appVersion: 1.1.0
+version: 0.8.30
+appVersion: 1.4.0
 description: Machine Learning automation and tracking
 sources:
   - https://github.com/mlrun/mlrun

diff --git a/stable/mlrun/templates/api-chief-deployment.yaml b/stable/mlrun/templates/api-chief-deployment.yaml
@@ -107,7 +107,12 @@ spec:
             value: {{ .Values.api.sidecars.logCollector.getLogsBufferSizeBytes | quote }}
           {{- end }}
           {{- if .Values.api.extraEnv }}
-          {{ toYaml .Values.api.extraEnv | nindent 10 }}
+          {{- range .Values.api.extraEnv }}
+          {{- if not (hasKey $.Values.api.extraEnvKeyValue .name) }}
+          - name: {{ .name }}
+            value: {{ .value }}
+          {{- end }}
+          {{- end }}
           {{- end }}
           {{- if .Values.api.extraEnvKeyValue }}
           {{- range $name, $value := .Values.api.extraEnvKeyValue }}

diff --git a/stable/mlrun/templates/api-worker-deployment.yaml b/stable/mlrun/templates/api-worker-deployment.yaml
@@ -101,7 +101,12 @@ spec:
             value: {{ .Values.api.sidecars.logCollector.getLogsBufferSizeBytes | quote }}
           {{- end }}
           {{- if .Values.api.extraEnv }}
-          {{ toYaml .Values.api.extraEnv | nindent 10 }}
+          {{- range .Values.api.extraEnv }}
+          {{- if not (hasKey $.Values.api.extraEnvKeyValue .name) }}
+          - name: {{ .name }}
+            value: {{ .value }}
+          {{- end }}
+          {{- end }}
           {{- end }}
           {{- if .Values.api.extraEnvKeyValue }}
           {{- range $name, $value := .Values.api.extraEnvKeyValue }}

diff --git a/stable/mlrun/templates/db-configmap-init.yaml b/stable/mlrun/templates/db-configmap-init.yaml
@@ -12,4 +12,7 @@ data:
     GRANT ALL PRIVILEGES ON *.* TO 'root'@'%';
     FLUSH PRIVILEGES;
     CREATE DATABASE IF NOT EXISTS mlrun;
+    {{- if not .Values.modelMonitoring.dsn }}
+    CREATE DATABASE IF NOT EXISTS mlrun_model_monitoring;
+    {{- end }}
 {{- end }}
diff --git a/stable/mlrun/templates/mlrun-api-pvc.yaml b/stable/mlrun/templates/mlrun-api-pvc.yaml
@@ -6,7 +6,8 @@ metadata:
   labels:
     {{- include "mlrun.api.labels" . | nindent 4 }}
 {{- with .Values.api.persistence.annotations }}
-annotations: {{ toYaml . | nindent 4 }}
+  annotations:
+{{ toYaml . | nindent 4 }}
 {{- end }}
 spec:
   accessModes:

diff --git a/stable/mlrun/templates/mlrun-db-pvc.yaml b/stable/mlrun/templates/mlrun-db-pvc.yaml
@@ -1,12 +1,13 @@
-{{- if .Values.db.persistence.enabled -}}
+{{- if and (.Values.db.persistence.enabled) (eq "mysql" .Values.httpDB.dbType) }}
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ .Values.db.volumes.storageOverride.persistentVolumeClaim.claimName }}
   labels:
     {{- include "mlrun.db.labels" . | nindent 4 }}
 {{- with .Values.db.persistence.annotations }}
-annotations: {{ toYaml . | nindent 4 }}
+  annotations:
+{{ toYaml . | nindent 4 }}
 {{- end }}
 spec:
   accessModes:

diff --git a/stable/mlrun/values.yaml b/stable/mlrun/values.yaml
@@ -9,7 +9,7 @@ api:
   persistence:
     enabled: false
     existingClaim:
-    storageClass: nfs-client
+    storageClass:
     accessMode: "ReadWriteOnce"
     size: "8Gi"
     annotations: ~
@@ -62,7 +62,7 @@ api:
 
   image:
     repository: mlrun/mlrun-api
-    tag: 1.0.4
+    tag: 1.4.0
     pullPolicy: IfNotPresent
     pullSecrets: []
 
@@ -288,7 +288,7 @@ api:
 
       image:
         repository: mlrun/log-collector
-        tag: 1.3.0
+        tag: 1.4.0
         pullPolicy: IfNotPresent
         pullSecrets: []
 
@@ -323,7 +323,7 @@ db:
   persistence:
     enabled: false
     existingClaim:
-    storageClass: nfs-client
+    storageClass:
     accessMode: "ReadWriteOnce"
     size: "8Gi"
     annotations: ~
@@ -504,7 +504,7 @@ ui:
 
   image:
     repository: mlrun/mlrun-ui
-    tag: 1.0.4
+    tag: 1.4.0
     pullPolicy: IfNotPresent
     pullSecrets: []
 
@@ -601,6 +601,11 @@ httpDB:
   # dsn: "mysql+pymysql://root@mlrun-db:3306/mlrun"
   # oldDsn: "sqlite:////mlrun/db/mlrun.db?check_same_thread=false"
 
+modelMonitoring:
+  # If no dsn has been provided, will initiate monitoring database under mlrun-db service:
+  # mysql+pymysql://root@mlrun-db:3306/mlrun_model_monitoring
+  dsn:
+
 defaultDockerRegistryURL: ""
 defaultDockerRegistrySecretName: ""
 

diff --git a/stable/pipelines/Chart.yaml b/stable/pipelines/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 appVersion: ">=1.8.1"
-version: 0.9.3
+version: 0.9.5
 name: pipelines
 description: Kubeflow pipelines framework for machine learning
 home: https://www.kubeflow.org/

diff --git a/stable/pipelines/templates/mysql/pvc-mysql.yaml b/stable/pipelines/templates/mysql/pvc-mysql.yaml
@@ -6,7 +6,8 @@ metadata:
   labels:
 {{ include "pipelines.commonLabels" . | indent 4 }}
 {{- with .Values.storage.metadata.persistence.annotations }}
-annotations: {{ toYaml . | nindent 4 }}
+  annotations:
+{{ toYaml . | nindent 4 }}
 {{- end }}
 spec:
   accessModes:
@@ -21,4 +22,4 @@ spec:
   storageClassName: "{{ .Values.storage.metadata.persistence.storageClass }}"
 {{- end }}
 {{- end }}
-{{- end -}}
+{{- end -}}
diff --git a/stable/pipelines/values.yaml b/stable/pipelines/values.yaml
@@ -15,7 +15,7 @@ storage:
     persistence:
       enabled: false
       existingClaim:
-      storageClass: nfs-client
+      storageClass:
       accessMode: "ReadWriteOnce"
       size: "8Gi"
       annotations: ~