Skip to content

fix(configurations): helm templates and values up to date #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
melancholiai merged 1 commit into from
Dec 4, 2023
Merged

fix(configurations): helm templates and values up to date #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .versionrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
}
21 changes: 15 additions & 6 deletions helm/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
{{- $chartName := include "retiler.name" . -}}
{{- $tracingUrl := include "retiler.tracingUrl" . -}}
{{- $metricsUrl := include "retiler.metricsUrl" . -}}
{{- if .Values.enabled -}}
apiVersion: v1
kind: ConfigMap
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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 0 additions & 2 deletions helm/templates/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
36 changes: 25 additions & 11 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
19 changes: 19 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down