Revert "CEML-257: Suppress s3 creds if NonAnonymous is True" (#138)

mlrun · Oct 7, 2024 · ccf71aa · ccf71aa
1 parent 7592880
commit ccf71aa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 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-rc17
+version: 0.6.4-rc18
 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
@@ -5,17 +5,15 @@ kind: ConfigMap
 metadata:
   name: jupyter-common-env
 data:
-{{- if .Values.global.infrastructure.aws.s3NonAnonymous }}
   S3_ENDPOINT_URL: {{ include "mlrun-ce.minio.service.url" . }}
-  AWS_SECRET_ACCESS_KEY: {{ .Values.minio.rootPassword }}
-  AWS_ACCESS_KEY_ID: {{ .Values.minio.rootUser }}
-{{- end }}
   MLRUN_STORAGE__AUTO_MOUNT_TYPE: s3
   S3_NON_ANONYMOUS: {{ .Values.global.infrastructure.aws.s3NonAnonymous | quote | default "\"True\"" }}
   MLRUN_CE__MODE: {{ .Values.jupyterNotebook.ce.mode | default "full" }}
   MLRUN_CE__VERSION: {{ .Chart.Version }}
   MLRUN_FUNCTION__SPEC__SERVICE_ACCOUNT__DEFAULT: {{ .Values.mlrun.api.functionSpecServiceAccountDefault | default "" | quote }}
   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: {{ include "mlrun.storage.auto.mount.params" . }}
   MLRUN_ARTIFACT_PATH: s3://{{ $bucket_name }}/projects/{{ `{{run.project}}` }}/artifacts{{ `{{run.uid}}` }}
   MLRUN_FEATURE_STORE__DATA_PREFIXES__NOSQL: ""

diff --git a/charts/mlrun-ce/templates/config/mlrun-env-configmap.yaml b/charts/mlrun-ce/templates/config/mlrun-env-configmap.yaml
@@ -10,12 +10,10 @@ data:
   MLRUN_STORAGE__AUTO_MOUNT_TYPE: s3
   MLRUN_STORAGE__AUTO_MOUNT_PARAMS: {{ include "mlrun.storage.auto.mount.params" . }}
   MLRUN_HTTPDB__PROJECTS__FOLLOWERS: nuclio
-{{- if .Values.global.infrastructure.aws.s3NonAnonymous }}
-  AWS_SECRET_ACCESS_KEY: {{ .Values.minio.rootPassword }}
-  AWS_ACCESS_KEY_ID: {{ .Values.minio.rootUser }}
   S3_ENDPOINT_URL: {{ include "mlrun-ce.minio.service.url" . }}
-{{- end }}
   MLRUN_FUNCTION__SPEC__SERVICE_ACCOUNT__DEFAULT: {{ .Values.mlrun.api.functionSpecServiceAccountDefault | default "" | quote }}
+  AWS_SECRET_ACCESS_KEY: {{ .Values.minio.rootPassword }}
+  AWS_ACCESS_KEY_ID: {{ .Values.minio.rootUser }}
   MLRUN_HTTPDB__REAL_PATH: s3://
   MLRUN_ARTIFACT_PATH: s3://{{ $bucket_name }}/projects/{{ `{{run.project}}` }}/artifacts
   MLRUN_FEATURE_STORE__DATA_PREFIXES__DEFAULT: s3://{{ $bucket_name }}/projects/{project}/FeatureStore/{name}/{kind}