fix

neuro-inc · Aug 8, 2024 · ff4c56b · ff4c56b
1 parent 21c2081
commit ff4c56b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/charts/platform-storage/templates/_helpers.tpl b/charts/platform-storage/templates/_helpers.tpl
@@ -75,6 +75,10 @@ release: {{ .Release.Name | quote }}
 - name: AWS_SECRET_ACCESS_KEY
   {{- toYaml .Values.aws.secretAccessKey | nindent 2 }}
 {{- end }}
+{{- if .Values.aws.s3EndpointUrl }}
+- name: AWS_S3_ENDPOINT_URL
+  value: {{ .Values.aws.s3EndpointUrl }}
+{{- end }}
 - name: AWS_METRICS_S3_BUCKET_NAME
   value: {{ .Values.aws.metricsBucketName }}
 {{- end -}}

diff --git a/charts/platform-storage/templates/service-monitor.yaml b/charts/platform-storage/templates/service-monitor.yaml
@@ -14,7 +14,7 @@ spec:
   jobLabel: job
   endpoints:
     - port: http
-      path: /metrics
+      path: /metrics/
       honorLabels: true
       interval: 15s
       relabelings:

diff --git a/charts/platform-storage/values-dev.yaml b/charts/platform-storage/values-dev.yaml
@@ -47,6 +47,7 @@ aws:
       secretKeyRef:
         name: minio-gateway
         key: root-password
+  s3EndpointUrl: http://minio-gateway:9000
   metricsBucketName: apolo-storage-metrics
 
 storageUsageCollector:

diff --git a/charts/platform-storage/values.yaml b/charts/platform-storage/values.yaml
@@ -48,7 +48,8 @@ aws: {}
   # region:
   # accessKeyId: {}
   # secretAccessKey: {}
-  # metricsBucketName: {}
+  # s3EndpointUrl:
+  # metricsBucketName:
 
 storageUsageCollector:
   schedule: "0 * * * *" # every hour

diff --git a/platform_storage_api/config.py b/platform_storage_api/config.py
@@ -136,7 +136,7 @@ def create_platform(self) -> PlatformConfig:
     def create_aws(self) -> AWSConfig:
         return AWSConfig(
             region=self._environ["AWS_REGION"],
-            s3_endpoint_url=self._environ.get("AWS_S3_ENDPOINT"),
+            s3_endpoint_url=self._environ.get("AWS_S3_ENDPOINT_URL"),
             metrics_s3_bucket_name=self._environ["AWS_METRICS_S3_BUCKET_NAME"],
         )