From f75ad64f506d10d0057522f208dca957b2c6ec6a Mon Sep 17 00:00:00 2001
From: alexpirogovski <pirogovski@gmail.com>
Date: Thu, 29 Aug 2024 12:35:32 +0300
Subject: [PATCH] Move Jupyter extraEnv to CM to support bucket_name param

---
 charts/mlrun-ce/Chart.yaml                             |  2 +-
 .../templates/config/jupyter-env-configmap.yaml        |  5 ++++-
 charts/mlrun-ce/values.yaml                            | 10 ----------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/charts/mlrun-ce/Chart.yaml b/charts/mlrun-ce/Chart.yaml
index ab781fc..597d6d6 100644
--- a/charts/mlrun-ce/Chart.yaml
+++ b/charts/mlrun-ce/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mlrun-ce
-version: 0.6.4-rc8
+version: 0.6.4-rc9
 description: MLRun Open Source Stack
 home: https://iguazio.com
 icon: https://www.iguazio.com/wp-content/uploads/2019/10/Iguazio-Logo.png
diff --git a/charts/mlrun-ce/templates/config/jupyter-env-configmap.yaml b/charts/mlrun-ce/templates/config/jupyter-env-configmap.yaml
index 5f08ccd..00bc66c 100644
--- a/charts/mlrun-ce/templates/config/jupyter-env-configmap.yaml
+++ b/charts/mlrun-ce/templates/config/jupyter-env-configmap.yaml
@@ -9,9 +9,12 @@ data:
   MLRUN_STORAGE__AUTO_MOUNT_TYPE: s3
   S3_NON_ANONYMOUS: {{ .Values.global.infrastructure.aws.s3NonAnonymous | default "True" | quote }}
   MLRUN_FUNCTION__SPEC__SERVICE_ACCOUNT__DEFAULT: {{ .Values.mlrun.api.functionSpecServiceAccountDefault }}
+  MLRUN_FEATURE_STORE__DATA_PREFIXES__DEFAULT: s3:///{{ $bucket_name }/projects/{project}/FeatureStore/{name}/{kind}
   AWS_SECRET_ACCESS_KEY: {{ .Values.minio.rootPassword }}
   AWS_ACCESS_KEY_ID: {{ .Values.minio.rootUser }}
   MLRUN_STORAGE__AUTO_MOUNT_PARAMS: {{ .Values.mlrun.storageAutoMountParams | default "non_anonymous=True" }}
-  MLRUN_ARTIFACT_PATH: s3://{{ $bucket_name }}/projects/{{ `{{run.project}}` }}/artifacts
+  MLRUN_ARTIFACT_PATH: s3://{{ $bucket_name }}/projects/{{ `{{run.project}}` }}/artifacts{{run.uid}}
+  MLRUN_FEATURE_STORE__DATA_PREFIXES__NOSQL: ""
+  MLRUN_FEATURE_STORE__DEFAULT_TARGETS: parquet
   MLRUN_HTTPDB__REAL_PATH: s3://
 {{- end}}
diff --git a/charts/mlrun-ce/values.yaml b/charts/mlrun-ce/values.yaml
index 983b9c1..4deda66 100644
--- a/charts/mlrun-ce/values.yaml
+++ b/charts/mlrun-ce/values.yaml
@@ -190,16 +190,6 @@ jupyterNotebook:
   # use this to override mlrunUIURL, by default it will be auto-resolved to externalHostAddress and
   # mlrun UI's node port
   mlrunUIURL:
-  extraEnv:
-    - name: MLRUN_ARTIFACT_PATH
-      value: s3://mlrun/projects/{{run.project}}/artifacts/{{run.uid}}
-    - name: MLRUN_FEATURE_STORE__DATA_PREFIXES__DEFAULT
-      value: s3://mlrun/projects/{project}/FeatureStore/{name}/{kind}
-    - name: MLRUN_FEATURE_STORE__DATA_PREFIXES__NOSQL
-      value: ""
-    - name: MLRUN_FEATURE_STORE__DEFAULT_TARGETS
-      value: "parquet"
-
   extraEnvKeyValue: {}
   envFrom:
     - configMapRef: