From a3c7aaf41f147dec7fa294ddb70d28673c6b28cd Mon Sep 17 00:00:00 2001 From: melancholiai Date: Tue, 28 Nov 2023 15:32:34 +0200 Subject: [PATCH] fix(configurations): helm templates and values up to date --- .versionrc.json | 4 ++++ helm/templates/configmap.yaml | 21 ++++++++++++++------ helm/templates/secret.yaml | 2 -- helm/values.yaml | 36 ++++++++++++++++++++++++----------- package-lock.json | 19 ++++++++++++++++++ package.json | 1 + 6 files changed, 64 insertions(+), 19 deletions(-) diff --git a/.versionrc.json b/.versionrc.json index e247692..066a8f2 100644 --- a/.versionrc.json +++ b/.versionrc.json @@ -7,6 +7,10 @@ { "filename": "package-lock.json", "type": "json" + }, + { + "filename": "helm/Chart.yaml", + "updater": "node_modules/@map-colonies/standard-version-update-helm-version/src/index.js" } ] } diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml index 47a1add..c7755d7 100644 --- a/helm/templates/configmap.yaml +++ b/helm/templates/configmap.yaml @@ -1,4 +1,6 @@ {{- $chartName := include "retiler.name" . -}} +{{- $tracingUrl := include "retiler.tracingUrl" . -}} +{{- $metricsUrl := include "retiler.metricsUrl" . -}} {{- if .Values.enabled -}} apiVersion: v1 kind: ConfigMap @@ -6,9 +8,19 @@ metadata: name: {{ .Release.Name }}-{{ $chartName }}-configmap data: LOG_LEVEL: {{ .Values.env.logLevel }} + {{ if .Values.env.tracing.enabled }} + TELEMETRY_TRACING_ENABLED: 'true' + TELEMETRY_TRACING_URL: {{ $tracingUrl }} + TELEMETRY_TRACING_RATIO: {{ .Values.env.tracing.ratio | quote }} + {{ end }} + {{ if .Values.env.metrics.enabled }} + TELEMETRY_METRICS_ENABLED: 'true' + TELEMETRY_METRICS_URL: {{ $metricsUrl }} + {{ end }} {{- with .Values.dbConfig }} DB_HOST: {{ .host }} DB_NAME: {{ .database }} + DB_SCHEMA: {{ .schema }} DB_PORT: {{ .port | default 5432 | quote }} {{- end -}} {{- if .Values.dbConfig.sslAuth.enabled }} @@ -30,12 +42,9 @@ data: MAP_FORMAT: {{ .map.format }} MAP_CLIENT_TIMEOUT_MS: {{ .map.client.timeoutMs | quote }} MAP_WMS_VERSION: {{ .map.wms.version }} - MAP_WMS_LAYERS: {{ .map.wms.layers }} - MAP_WMS_STYLES: {{ .map.wms.styles }} - S3_ENDPOINT: {{ .tilesStorage.s3ClientConfig.endpoint }} - S3_REGION: {{ .tilesStorage.s3ClientConfig.region }} - S3_FORCE_PATH_STYLE: {{ .tilesStorage.s3ClientConfig.forcePathStyle | quote }} - S3_BUCKET: {{ .tilesStorage.s3Bucket }} + MAP_WMS_LAYERS: {{ .map.wms.layers | quote }} + MAP_WMS_STYLES: {{ .map.wms.styles | quote }} + TILES_STORAGE_PROVIDERS: {{ .tilesStorage.providers | quote }} TILES_STORAGE_LAYOUT_FORMAT: {{ .tilesStorage.layout.format }} TILES_STORAGE_LAYOUT_SHOULD_FLIP_Y: {{ .tilesStorage.layout.shouldFlipY | quote }} {{- end }} diff --git a/helm/templates/secret.yaml b/helm/templates/secret.yaml index dc074d3..d94c73f 100644 --- a/helm/templates/secret.yaml +++ b/helm/templates/secret.yaml @@ -17,6 +17,4 @@ type: Opaque data: DB_USERNAME: {{ .Values.dbConfig.username | b64enc }} DB_PASSWORD: {{ .Values.dbConfig.password | b64enc }} - AWS_ACCESS_KEY_ID: {{ .Values.env.tilesStorage.s3ClientConfig.accessKey | b64enc }} - AWS_SECRET_ACCESS_KEY: {{ .Values.env.tilesStorage.s3ClientConfig.secretKey | b64enc }} {{- end }} \ No newline at end of file diff --git a/helm/values.yaml b/helm/values.yaml index 8d5e97b..2d30ea8 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -54,20 +54,34 @@ env: version: 1.3.0 layers: MAP_WMS_LAYERS styles: MAP_WMS_STYLES - client: + client: timeoutMs: 60000 - tilesStorage: - s3ClientConfig: - endpoint: http://s3-domain/ - region: region - forcePathStyle: true - accessKey: accessKey - secretKey: secretKey - s3Bucket: bucket-name - layout: + tilesStorage: + providers: |- + [ + { + "kind": "s3", + "endpoint": "http://s3-domain/", + "bucketName": "bucketName", + "region": "region", + "forcePathStyle": true, + "credentials": { + "accessKeyId": "accessKeyId", + "secretAccessKey": "secret" + } + } + ] + layout: format: prefix/{z}/{x}/{y}.png shouldFlipY: true - + tracing: + enabled: false + url: http://localhost:55681/v1/trace + ratio: 1 + metrics: + enabled: false + url: http://localhost:55681/v1/metrics + resources: enabled: true value: diff --git a/package-lock.json b/package-lock.json index ba6e57a..887673c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,6 +40,7 @@ "@faker-js/faker": "^6.1.1", "@map-colonies/eslint-config": "^3.1.1", "@map-colonies/prettier-config": "0.0.1", + "@map-colonies/standard-version-update-helm-version": "^2.0.1", "@types/compression": "^1.7.2", "@types/config": "0.0.39", "@types/express": "^4.17.13", @@ -4287,6 +4288,15 @@ "type-fest": "^2.3.2" } }, + "node_modules/@map-colonies/standard-version-update-helm-version": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@map-colonies/standard-version-update-helm-version/-/standard-version-update-helm-version-2.0.1.tgz", + "integrity": "sha512-sMwTdRjdT9lToT9m+Xdm6K6cTBIbT5dDgZvXuNj3hSueF/tObrSQOJUqfvSBNClfDZqBeEN8A4rSe7ooVJ5qbw==", + "dev": true, + "dependencies": { + "js-yaml": "^4.1.0" + } + }, "node_modules/@map-colonies/telemetry": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/@map-colonies/telemetry/-/telemetry-4.2.0.tgz", @@ -21176,6 +21186,15 @@ "type-fest": "^2.3.2" } }, + "@map-colonies/standard-version-update-helm-version": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@map-colonies/standard-version-update-helm-version/-/standard-version-update-helm-version-2.0.1.tgz", + "integrity": "sha512-sMwTdRjdT9lToT9m+Xdm6K6cTBIbT5dDgZvXuNj3hSueF/tObrSQOJUqfvSBNClfDZqBeEN8A4rSe7ooVJ5qbw==", + "dev": true, + "requires": { + "js-yaml": "^4.1.0" + } + }, "@map-colonies/telemetry": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/@map-colonies/telemetry/-/telemetry-4.2.0.tgz", diff --git a/package.json b/package.json index f1a160e..21fc029 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,7 @@ "@faker-js/faker": "^6.1.1", "@map-colonies/eslint-config": "^3.1.1", "@map-colonies/prettier-config": "0.0.1", + "@map-colonies/standard-version-update-helm-version": "^2.0.1", "@types/compression": "^1.7.2", "@types/config": "0.0.39", "@types/express": "^4.17.13",