Liran's fixes

Move some values from values.yaml to ConfigMaps
mlrun · Aug 25, 2024 · bdbee3e · bdbee3e
1 parent 95e1643
commit bdbee3e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git 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-rc4
+version: 0.6.4-rc5
 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/_helpers.tpl b/charts/mlrun-ce/templates/_helpers.tpl
@@ -244,14 +244,4 @@ Model monitoring DSN
 {{- end -}}
 {{- end -}}
 
-{{/*
-TODO: Remove when dust settles, probably not needed
-serviceAccounts for AWS
-*/}}
-{{- define "aws.serviceAccounts" -}}
-mlrun-api-aws-sa
-mlrun-jobs-aws-sa
-ml-pipeline-ui-sa
-ml-pipeline-sa
-argo-sa
-{{- end -}}
+{{- $bucket_name := .Values.global.infrastructure.aws.bucketName | default "mlrun" }}
diff --git a/charts/mlrun-ce/templates/config/jupyter-env-configmap.yaml b/charts/mlrun-ce/templates/config/jupyter-env-configmap.yaml
@@ -1,10 +1,17 @@
 {{ if .Values.jupyterNotebook.enabled}}
+{{- $bucket_name := .Values.global.infrastructure.aws.bucketName | default "mlrun" }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: jupyter-common-env
 data:
   S3_ENDPOINT_URL: {{ include "mlrun-ce.minio.service.url" . }}
+  MLRUN_STORAGE__AUTO_MOUNT_TYPE: s3
+  S3_NON_ANONYMOUS: {{ .Values.global.infrastructure.aws.s3NonAnonymous | default "True" }}
+  MLRUN_FUNCTION__SPEC__SERVICE_ACCOUNT__DEFAULT: {{ .Values.mlrun.api.functionSpecServiceAccountDefault }}
   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_HTTPDB__REAL_PATH: s3://
 {{- end}}
diff --git a/charts/mlrun-ce/templates/config/mlrun-env-configmap.yaml b/charts/mlrun-ce/templates/config/mlrun-env-configmap.yaml
@@ -4,15 +4,18 @@ kind: ConfigMap
 metadata:
   name: mlrun-common-env
 data:
+  S3_NON_ANONYMOUS: {{ .Values.global.infrastructure.aws.s3NonAnonymous | default "True"}}
   MLRUN_STORAGE__AUTO_MOUNT_TYPE: s3
   MLRUN_STORAGE__AUTO_MOUNT_PARAMS: "aws_access_key=minio,aws_secret_key=minio123,endpoint_url={{ include "mlrun-ce.minio.service.url" . }}"
   MLRUN_HTTPDB__PROJECTS__FOLLOWERS: nuclio
   S3_ENDPOINT_URL: {{ include "mlrun-ce.minio.service.url" . }}
+  MLRUN_FUNCTION__SPEC__SERVICE_ACCOUNT__DEFAULT: {{ .Values.mlrun.api.functionSpecServiceAccountDefault }}
   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_HTTPDB__REAL_PATH: s3://
-  MLRUN_ARTIFACT_PATH: s3://mlrun/projects/{{ `{{run.project}}` }}/artifacts
-  MLRUN_FEATURE_STORE__DATA_PREFIXES__DEFAULT: s3://mlrun/projects/{project}/FeatureStore/{name}/{kind}
+  MLRUN_ARTIFACT_PATH: s3://{{ $bucket_name }}/projects/{{ `{{run.project}}` }}/artifacts
+  MLRUN_FEATURE_STORE__DATA_PREFIXES__DEFAULT: s3://{{ $bucket_name }}/projects/{project}/FeatureStore/{name}/{kind}
   MLRUN_FEATURE_STORE__DATA_PREFIXES__NOSQL: ""
   MLRUN_CE__MODE: {{ .Values.mlrun.ce.mode }}
   MLRUN_CE__VERSION: {{ .Chart.Version }}

diff --git a/charts/mlrun-ce/values.yaml b/charts/mlrun-ce/values.yaml
@@ -13,6 +13,9 @@ global:
     provider: ~
     inboundCidrs: ~
     loadBalancerName: ~
+    aws:
+      bucketName: ~
+      s3NonAnonymous: ~
 
 nuclio:
   # coupled with mlrun.nuclio.dashboardName template in mlrun chart
@@ -58,6 +61,7 @@ mlrun:
   # set the type of filesystem to use: filesystem, s3
   enabled: true
   storage: filesystem
+  storageAutoMountParams: ~
   secrets:
     s3:
       accessKey: ""
@@ -80,6 +84,7 @@ mlrun:
       logCollector:
         enabled: true
     fullnameOverride: mlrun-api
+    functionSpecServiceAccountDefault: ~
     service:
       type: NodePort
       nodePort: 30070