diff --git a/charts/platform-storage/templates/metrics-deployment.yaml b/charts/platform-storage/templates/metrics-deployment.yaml index 37c6e97..95bcbe3 100644 --- a/charts/platform-storage/templates/metrics-deployment.yaml +++ b/charts/platform-storage/templates/metrics-deployment.yaml @@ -35,6 +35,8 @@ spec: {{- toYaml . | nindent 10 }} {{- end }} env: + - name: SERVER_PORT + value: {{ .Values.metrics.service.port | quote }} {{- include "platformStorage.env.aws" . | nindent 10 }} {{- with .Values.imagePullSecrets }} imagePullSecrets: diff --git a/charts/platform-storage/values-dev.yaml b/charts/platform-storage/values-dev.yaml index b7ec094..02f8f68 100644 --- a/charts/platform-storage/values-dev.yaml +++ b/charts/platform-storage/values-dev.yaml @@ -5,6 +5,7 @@ keepAliveTimeout: 900 platform: clusterName: default authUrl: http://platform-auth:8080 + adminUrl: http://platform-admin:8080 token: valueFrom: secretKeyRef: diff --git a/charts/platform-storage/values.yaml b/charts/platform-storage/values.yaml index c129406..4a3de11 100644 --- a/charts/platform-storage/values.yaml +++ b/charts/platform-storage/values.yaml @@ -77,7 +77,7 @@ metrics: memory: "200Mi" service: - port: 9000 + port: 8080 serviceMonitor: enabled: true diff --git a/platform_storage_api/config.py b/platform_storage_api/config.py index 355c6e5..7c262f7 100644 --- a/platform_storage_api/config.py +++ b/platform_storage_api/config.py @@ -136,6 +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"), metrics_s3_bucket_name=self._environ["AWS_METRICS_S3_BUCKET_NAME"], )