From 904be33decf3a21aa069331213429bc36d0c026a Mon Sep 17 00:00:00 2001 From: Ivan Zubenko Date: Fri, 9 Aug 2024 13:45:06 +0300 Subject: [PATCH] remove minio gateway (#950) --- .../files/fluent-bit/fluent-bit.conf | 22 +--- .../templates/_helpers.tpl | 103 ++------------- .../templates/deployment.yml | 1 - .../templates/fluent-bit.yaml | 43 +----- .../templates/logs-compact-deployment.yaml | 2 +- .../templates/logs-storage-key-secret.yaml | 22 ---- .../templates/minio-gateway.yaml | 124 ------------------ charts/platform-monitoring/values-dev.yaml | 24 ++-- charts/platform-monitoring/values.yaml | 50 +------ platform_monitoring/api.py | 2 +- tests/integration/conftest.py | 4 +- tests/integration/test_api.py | 8 +- tests/unit/test_config.py | 12 +- 13 files changed, 56 insertions(+), 361 deletions(-) delete mode 100644 charts/platform-monitoring/templates/logs-storage-key-secret.yaml delete mode 100644 charts/platform-monitoring/templates/minio-gateway.yaml diff --git a/charts/platform-monitoring/files/fluent-bit/fluent-bit.conf b/charts/platform-monitoring/files/fluent-bit/fluent-bit.conf index f380aef9..ae05982e 100644 --- a/charts/platform-monitoring/files/fluent-bit/fluent-bit.conf +++ b/charts/platform-monitoring/files/fluent-bit/fluent-bit.conf @@ -49,25 +49,11 @@ [OUTPUT] Name s3 Match kube.var.log.containers.job-* -{{- if eq .Values.logs.persistence.type "aws" }} -{{- if .Values.logs.persistence.aws.endpoint }} - endpoint {{ .Values.logs.persistence.aws.endpoint }} -{{- end }} - region {{ .Values.logs.persistence.aws.region }} - bucket {{ .Values.logs.persistence.aws.bucket }} -{{- else if eq .Values.logs.persistence.type "minio" }} - endpoint {{ .Values.logs.persistence.minio.url }} - region {{ .Values.logs.persistence.minio.region }} - bucket {{ .Values.logs.persistence.minio.bucket }} -{{- else if eq .Values.logs.persistence.type "gcp" }} - endpoint {{ include "platformMonitoring.minioGateway.endpoint" . }} - region {{ .Values.logs.persistence.gcp.location }} - bucket {{ .Values.logs.persistence.gcp.bucket }} -{{- else if eq .Values.logs.persistence.type "azure" }} - endpoint {{ include "platformMonitoring.minioGateway.endpoint" . }} - region minio - bucket {{ .Values.logs.persistence.azure.bucket }} +{{- if .Values.logs.persistence.s3.endpoint }} + endpoint {{ .Values.logs.persistence.s3.endpoint }} {{- end }} + region {{ .Values.logs.persistence.s3.region }} + bucket {{ .Values.logs.persistence.s3.bucket }} total_file_size 1M upload_timeout 1m use_put_object On diff --git a/charts/platform-monitoring/templates/_helpers.tpl b/charts/platform-monitoring/templates/_helpers.tpl index 37b615da..514d5477 100644 --- a/charts/platform-monitoring/templates/_helpers.tpl +++ b/charts/platform-monitoring/templates/_helpers.tpl @@ -28,24 +28,6 @@ {{- end -}} {{- end -}} -{{- define "platformMonitoring.minioGateway.fullname" -}} -{{- if .Values.minioGateway.fullnameOverride -}} -{{- .Values.minioGateway.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default "minio-gateway" .Values.minioGateway.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{- define "platformMonitoring.minioGateway.endpoint" -}} -{{- $serviceName := include "platformMonitoring.minioGateway.fullname" . -}} -{{- printf "http://%s:%s" $serviceName (toString .Values.minioGateway.port) -}} -{{- end -}} - {{- define "platformMonitoring.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" -}} {{- end -}} @@ -57,14 +39,6 @@ heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} {{- end -}} -{{- define "platformMonitoring.logs.storage.keySecret" -}} -{{- if .Values.logs.persistence.keySecret -}} -{{ .Values.logs.persistence.keySecret }} -{{- else -}} -{{ include "platformMonitoring.fullname" . }}-logs-storage-key -{{- end -}} -{{- end -}} - {{- define "platformMonitoring.kubeAuthMountRoot" -}} {{- printf "/var/run/secrets/kubernetes.io/serviceaccount" -}} {{- end -}} @@ -130,80 +104,27 @@ release: {{ .Release.Name | quote }} {{- define "platformMonitoring.env.s3" -}} {{- $logsPersistence := .Values.logs.persistence -}} -{{- if eq $logsPersistence.type "aws" }} +{{- if eq $logsPersistence.type "s3" }} - name: NP_MONITORING_LOGS_STORAGE_TYPE value: s3 +{{- if $logsPersistence.s3.accessKeyId }} - name: NP_MONITORING_S3_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: access_key_id + {{- toYaml $logsPersistence.s3.accessKeyId | nindent 2 }} +{{- end }} +{{- if $logsPersistence.s3.secretAccessKey }} - name: NP_MONITORING_S3_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: secret_access_key -{{- if $logsPersistence.aws.region }} + {{- toYaml $logsPersistence.s3.secretAccessKey | nindent 2 }} +{{- end }} +{{- if $logsPersistence.s3.region }} - name: NP_MONITORING_S3_REGION - value: {{ $logsPersistence.aws.region | quote }} + value: {{ $logsPersistence.s3.region | quote }} {{- end }} -{{- if $logsPersistence.aws.endpoint }} +{{- if $logsPersistence.s3.endpoint }} - name: NP_MONITORING_S3_ENDPOINT_URL - value: {{ $logsPersistence.aws.endpoint | quote }} + value: {{ $logsPersistence.s3.endpoint | quote }} {{- end }} - name: NP_MONITORING_S3_JOB_LOGS_BUCKET_NAME - value: {{ $logsPersistence.aws.bucket | quote }} -{{- else if eq $logsPersistence.type "gcp" }} -- name: NP_MONITORING_LOGS_STORAGE_TYPE - value: s3 -- name: NP_MONITORING_S3_REGION - value: {{ $logsPersistence.gcp.location | quote }} -- name: NP_MONITORING_S3_ACCESS_KEY_ID - value: minio_access_key -- name: NP_MONITORING_S3_SECRET_ACCESS_KEY - value: minio_secret_key -- name: NP_MONITORING_S3_ENDPOINT_URL - value: {{ include "platformMonitoring.minioGateway.endpoint" . }} -- name: NP_MONITORING_S3_JOB_LOGS_BUCKET_NAME - value: {{ $logsPersistence.gcp.bucket | quote }} -{{- else if eq $logsPersistence.type "azure" }} -- name: NP_MONITORING_LOGS_STORAGE_TYPE - value: s3 -- name: NP_MONITORING_S3_REGION - value: minio -- name: NP_MONITORING_S3_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: account_name -- name: NP_MONITORING_S3_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: account_key -- name: NP_MONITORING_S3_ENDPOINT_URL - value: {{ include "platformMonitoring.minioGateway.endpoint" . }} -- name: NP_MONITORING_S3_JOB_LOGS_BUCKET_NAME - value: {{ $logsPersistence.azure.bucket | quote }} -{{- else if eq $logsPersistence.type "minio" }} -- name: NP_MONITORING_LOGS_STORAGE_TYPE - value: s3 -- name: NP_MONITORING_S3_ENDPOINT_URL - value: {{ $logsPersistence.minio.url | quote }} -- name: NP_MONITORING_S3_REGION - value: {{ $logsPersistence.minio.region | quote }} -- name: NP_MONITORING_S3_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: access_key -- name: NP_MONITORING_S3_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: secret_key -- name: NP_MONITORING_S3_JOB_LOGS_BUCKET_NAME - value: {{ $logsPersistence.minio.bucket | quote }} + value: {{ $logsPersistence.s3.bucket | quote }} {{- end }} {{- end -}} diff --git a/charts/platform-monitoring/templates/deployment.yml b/charts/platform-monitoring/templates/deployment.yml index a172fb0d..5df401eb 100644 --- a/charts/platform-monitoring/templates/deployment.yml +++ b/charts/platform-monitoring/templates/deployment.yml @@ -24,7 +24,6 @@ spec: release: {{ .Release.Name }} service: platform-monitoring annotations: - checksum/logs-secret: {{ include (print $.Template.BasePath "/logs-storage-key-secret.yaml") . | sha256sum }} {{- if .Values.secrets }} checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }} {{- end }} diff --git a/charts/platform-monitoring/templates/fluent-bit.yaml b/charts/platform-monitoring/templates/fluent-bit.yaml index cd39ab29..9877983d 100644 --- a/charts/platform-monitoring/templates/fluent-bit.yaml +++ b/charts/platform-monitoring/templates/fluent-bit.yaml @@ -44,48 +44,15 @@ spec: image: {{ .repository }}:{{ .tag }} {{- end }} env: - {{- if eq .Values.logs.persistence.type "aws" }} - {{- if .Values.logs.persistence.aws.accessKeyId }} + {{- if eq .Values.logs.persistence.type "s3" }} + {{- if .Values.logs.persistence.s3.accessKeyId }} - name: AWS_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: access_key_id + {{- toYaml .Values.logs.persistence.s3.accessKeyId | nindent 10 }} {{- end }} - {{- if .Values.logs.persistence.aws.secretAccessKey }} + {{- if .Values.logs.persistence.s3.secretAccessKey }} - name: AWS_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: secret_access_key + {{- toYaml .Values.logs.persistence.s3.secretAccessKey | nindent 10 }} {{- end }} - {{- else if eq .Values.logs.persistence.type "minio" }} - - name: AWS_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: access_key - - name: AWS_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: secret_key - {{- else if eq .Values.logs.persistence.type "gcp" }} - - name: AWS_ACCESS_KEY_ID - value: minio_access_key - - name: AWS_SECRET_ACCESS_KEY - value: minio_secret_key - {{- else if eq .Values.logs.persistence.type "azure" }} - - name: AWS_ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: account_name - - name: AWS_SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: account_key {{- end }} volumeMounts: - mountPath: /var/log diff --git a/charts/platform-monitoring/templates/logs-compact-deployment.yaml b/charts/platform-monitoring/templates/logs-compact-deployment.yaml index 1e1b6734..c565ad42 100644 --- a/charts/platform-monitoring/templates/logs-compact-deployment.yaml +++ b/charts/platform-monitoring/templates/logs-compact-deployment.yaml @@ -1,4 +1,4 @@ -{{- if ne .Values.logs.persistence.type "es" }} +{{- if eq .Values.logs.persistence.type "s3" }} apiVersion: apps/v1 kind: Deployment metadata: diff --git a/charts/platform-monitoring/templates/logs-storage-key-secret.yaml b/charts/platform-monitoring/templates/logs-storage-key-secret.yaml deleted file mode 100644 index f4dc140a..00000000 --- a/charts/platform-monitoring/templates/logs-storage-key-secret.yaml +++ /dev/null @@ -1,22 +0,0 @@ -{{- if and (ne .Values.logs.persistence.type "es") (not .Values.logs.persistence.keySecret) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - labels: {{ include "platformMonitoring.labels.standard" . | nindent 4 }} -data: -{{- with .Values.logs.persistence }} -{{- if eq .type "gcp" }} - key_json: {{ .gcp.serviceAccountKeyBase64 | quote }} -{{- else if eq .type "aws" }} - access_key_id: {{ .aws.accessKeyId | default "" | b64enc | quote }} - secret_access_key: {{ .aws.secretAccessKey | default "" | b64enc | quote }} -{{- else if eq .type "azure" }} - account_name: {{ .azure.storageAccountName | b64enc | quote }} - account_key: {{ .azure.storageAccountKey | b64enc | quote }} -{{- else if eq .type "minio" }} - access_key: {{ .minio.accessKey | b64enc | quote }} - secret_key: {{ .minio.secretKey | b64enc | quote }} -{{- end }} -{{- end }} -{{- end }} diff --git a/charts/platform-monitoring/templates/minio-gateway.yaml b/charts/platform-monitoring/templates/minio-gateway.yaml deleted file mode 100644 index 8f9a390e..00000000 --- a/charts/platform-monitoring/templates/minio-gateway.yaml +++ /dev/null @@ -1,124 +0,0 @@ -{{- if or (eq .Values.logs.persistence.type "gcp") (eq .Values.logs.persistence.type "azure") }} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "platformMonitoring.minioGateway.fullname" . }} - labels: {{ include "platformMonitoring.labels.standard" . | nindent 4 }} - service: minio-gateway -spec: - type: ClusterIP - ports: - - name: http - port: {{ .Values.minioGateway.port }} - targetPort: http - selector: - app: {{ include "platformMonitoring.name" . }} - release: {{ .Release.Name | quote }} - service: minio-gateway ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "platformMonitoring.minioGateway.fullname" . }} - labels: {{ include "platformMonitoring.labels.standard" . | nindent 4 }} - service: minio-gateway -spec: - replicas: {{ .Values.minioGateway.replicas }} - selector: - matchLabels: - app: {{ include "platformMonitoring.name" . }} - release: {{ .Release.Name | quote }} - service: minio-gateway - strategy: - rollingUpdate: - maxSurge: 1 - maxUnavailable: 0 - type: RollingUpdate - template: - metadata: - labels: - app: {{ include "platformMonitoring.name" . }} - release: {{ .Release.Name | quote }} - service: minio-gateway - annotations: - checksum/logs-secret: {{ include (print $.Template.BasePath "/logs-storage-key-secret.yaml") . | sha256sum }} -{{- if .Values.minioGateway.podAnnotations }} -{{ toYaml .Values.minioGateway.podAnnotations | indent 8 }} -{{- end }} - spec: - containers: - - name: gateway - {{- with .Values.minioGateway.image }} - image: {{ .repository }}:{{ .tag }} - {{- end }} - ports: - - name: http - containerPort: {{ .Values.minioGateway.port }} - protocol: TCP - {{- if .Values.minioGateway.resources }} - resources: {{ toYaml .Values.minioGateway.resources | nindent 10 }} - {{- end }} - readinessProbe: - httpGet: - path: /minio/health/ready - port: http - initialDelaySeconds: 10 - periodSeconds: 3 - successThreshold: 1 - failureThreshold: 3 - timeoutSeconds: 5 - livenessProbe: - httpGet: - path: /minio/health/live - port: http - initialDelaySeconds: 10 - periodSeconds: 3 - successThreshold: 1 - failureThreshold: 3 - timeoutSeconds: 5 - env: - {{- if eq .Values.logs.persistence.type "gcp" }} - args: - - gateway - - gcs - - {{ .Values.logs.persistence.gcp.project | quote }} - env: - - name: MINIO_ROOT_USER - value: minio_access_key - - name: MINIO_ROOT_PASSWORD - value: minio_secret_key - - name: GOOGLE_APPLICATION_CREDENTIALS - value: /etc/config/minio/gcs/key_json - volumeMounts: - - name: gcs-credentials - mountPath: /etc/config/minio/gcs - readOnly: true - {{- else if eq .Values.logs.persistence.type "azure" }} - args: - - gateway - - azure - env: - - name: MINIO_ROOT_USER - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: account_name - - name: MINIO_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ include "platformMonitoring.logs.storage.keySecret" . }} - key: account_key - {{- end }} - volumes: - {{- if eq .Values.logs.persistence.type "gcp" }} - - name: gcs-credentials - secret: - secretName: {{ include "platformMonitoring.logs.storage.keySecret" . }} - {{- end }} - {{- if .Values.imagePullSecrets }} - imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 6 }} - {{- end }} - {{- if .Values.priorityClassName }} - priorityClassName: {{ .Values.priorityClassName }} - {{- end }} -{{- end }} diff --git a/charts/platform-monitoring/values-dev.yaml b/charts/platform-monitoring/values-dev.yaml index 5c5cec23..65c12fa4 100644 --- a/charts/platform-monitoring/values-dev.yaml +++ b/charts/platform-monitoring/values-dev.yaml @@ -2,7 +2,7 @@ jobsNamespace: platform-jobs platform: clusterName: default - apiUrl: http://platform-api:8080/api/v1 + apiUrl: http://platform-api:8080 authUrl: http://platform-auth:8080 configUrl: http://platform-config:8080 registryUrl: https://registry-dev.neu.ro @@ -30,13 +30,21 @@ service: logs: persistence: - type: gcp - - keySecret: gcp-key - - gcp: - project: development-374312 - location: us-central1 + type: s3 + + s3: + region: minio + accessKeyId: + valueFrom: + secretKeyRef: + name: minio-gateway + key: root-user + secretAccessKey: + valueFrom: + secretKeyRef: + name: minio-gateway + key: root-password + endpoint: http://minio-gateway:9000 bucket: neuro-dev-logs sentry: diff --git a/charts/platform-monitoring/values.yaml b/charts/platform-monitoring/values.yaml index 74f990e5..3263d6fe 100644 --- a/charts/platform-monitoring/values.yaml +++ b/charts/platform-monitoring/values.yaml @@ -19,7 +19,7 @@ platform: clusterName: "" authUrl: https://staging.neu.ro configUrl: https://staging.neu.ro - apiUrl: https://staging.neu.ro/api/v1 + apiUrl: https://staging.neu.ro registryUrl: "" token: {} @@ -72,24 +72,6 @@ fluentbit: directory: /var/lib/platform-monitoring-fluent-bit logLevel: info -minioGateway: - nameOverride: minio-gateway - fullnameOverride: minio-gateway - image: - repository: ghcr.io/neuro-inc/minio - # minio gateway was removed from minio, we need to stick to old minio version - tag: RELEASE.2022-03-08T22-28-51Z - port: 9000 - replicas: 2 - resources: - requests: - cpu: 50m - memory: 128Mi - limits: - cpu: 100m - memory: 256Mi - podAnnotations: {} - logs: cleanup_interval_sec: 900 @@ -105,7 +87,7 @@ logs: memory: "512Mi" persistence: - type: es + type: es # Possible values: es, s3 keySecret: "" @@ -113,33 +95,11 @@ logs: host: elasticsearch port: 9200 - # aws: - # accessKeyId: access_key # optional - # secretAccessKey: access_key # optional + # s3: # region: us-east-1 + # accessKeyId: {} # optional + # secretAccessKey: {} # optional # bucket: logs # endpoint: "" - # forcePathStyle: false - - # gcp: - # serviceAccountKeyBase64: - # project: project - # location: us - # bucket: logs - - # azure: - # storageAccountName: account_name - # storageAccountKey: account_key - # bucket: logs - - ## minio is for on_prem clusters which do not have - ## any object storage service. - ## - # minio: - # url: http://minio:9000 - # accessKey: access_key - # secretKey: secret_key - # region: region - # bucket: logs priorityClassName: "" diff --git a/platform_monitoring/api.py b/platform_monitoring/api.py index df132431..b63c25f4 100644 --- a/platform_monitoring/api.py +++ b/platform_monitoring/api.py @@ -637,7 +637,7 @@ async def create_platform_api_client( platform_api_factory = PlatformClientFactory( tmp_config, trace_configs=trace_configs ) - await platform_api_factory.login_with_token(url=url, token=token) + await platform_api_factory.login_with_token(url=url / "api/v1", token=token) client = None try: client = await platform_api_factory.get() diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 47022c09..07640edc 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -118,8 +118,8 @@ async def platform_api_config( else: base_url = get_service_url("platformapi", namespace="default") assert base_url.startswith("http") - url = URL(base_url) / "api/v1" - await wait_for_service("platformapi", url / "ping", timeout_s=120) + url = URL(base_url) + await wait_for_service("platformapi", url / "api/v1/ping", timeout_s=120) return PlatformApiConfig( url=url, token=token_factory("compute"), # token is hard-coded in the yaml configuration diff --git a/tests/integration/test_api.py b/tests/integration/test_api.py index 09927ea2..298408f5 100644 --- a/tests/integration/test_api.py +++ b/tests/integration/test_api.py @@ -153,16 +153,16 @@ class PlatformApiEndpoints: url: URL @property - def endpoint(self) -> URL: - return self.url + def api_v1_endpoint(self) -> URL: + return self.url / "api/v1" @property def platform_config_url(self) -> URL: - return self.endpoint / "config" + return self.api_v1_endpoint / "config" @property def jobs_base_url(self) -> URL: - return self.endpoint / "jobs" + return self.api_v1_endpoint / "jobs" def generate_job_url(self, job_id: str) -> URL: return self.jobs_base_url / job_id diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py index ea36fd2a..1fcc77d6 100644 --- a/tests/unit/test_config.py +++ b/tests/unit/test_config.py @@ -48,11 +48,11 @@ def environ(cert_authority_path: str, token_path: str) -> dict[str, Any]: "NP_MONITORING_CONTAINER_RUNTIME_PORT": "1234", "NP_MONITORING_API_HOST": "0.0.0.0", "NP_MONITORING_API_PORT": 8080, - "NP_MONITORING_PLATFORM_API_URL": "http://platformapi/api/v1", + "NP_MONITORING_PLATFORM_API_URL": "http://platformapi", "NP_MONITORING_PLATFORM_API_TOKEN": "platform-api-token", - "NP_MONITORING_PLATFORM_AUTH_URL": "http://platformauthapi/api/v1", + "NP_MONITORING_PLATFORM_AUTH_URL": "http://platformauthapi", "NP_MONITORING_PLATFORM_AUTH_TOKEN": "platform-auth-token", - "NP_MONITORING_PLATFORM_CONFIG_URL": "http://platformconfig/api/v1", + "NP_MONITORING_PLATFORM_CONFIG_URL": "http://platformconfig", "NP_MONITORING_PLATFORM_CONFIG_TOKEN": "platform-config-token", "NP_MONITORING_ES_HOSTS": "http://es1,http://es2", "NP_MONITORING_K8S_API_URL": "https://localhost:8443", @@ -77,13 +77,13 @@ def test_create(environ: dict[str, Any], token_path: str) -> None: cluster_name="default", server=ServerConfig(host="0.0.0.0", port=8080), platform_api=PlatformApiConfig( - url=URL("http://platformapi/api/v1"), token="platform-api-token" + url=URL("http://platformapi"), token="platform-api-token" ), platform_auth=PlatformAuthConfig( - url=URL("http://platformauthapi/api/v1"), token="platform-auth-token" + url=URL("http://platformauthapi"), token="platform-auth-token" ), platform_config=PlatformConfig( - url=URL("http://platformconfig/api/v1"), token="platform-config-token" + url=URL("http://platformconfig"), token="platform-config-token" ), elasticsearch=ElasticsearchConfig(hosts=["http://es1", "http://es2"]), logs=LogsConfig(storage_type=LogsStorageType.ELASTICSEARCH),