Skip to content

Commit

Permalink
Refactor carto values and secrets (#49)
Browse files Browse the repository at this point in the history 
* Refactor carto values and custom client values

* rename some secrets params

* remane the google serviceaccount secret ref
  • Loading branch information
@alvarorm22
alvarorm22 authored Mar 16, 2022
1 parent 3209804 commit ada1540
Show file tree
Hide file tree
Showing 26 changed files with 109 additions and 104 deletions.
4 changes: 2 additions & 2 deletions chart/templates/_helpers.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value
{{- $defaultUrl = printf "%s%s" $host $port -}}
{{- end -}}

{{- default $defaultUrl (printf "%s" .Values.cartoConfigValues.selfHostedDomain) -}}
{{- default $defaultUrl (printf "%s" .Values.customConfigValues.selfHostedDomain) -}}
{{- end -}}

{{/*
Create gcsBucketsProjectId using the gcsBucketsProjectId config or, if not defined, selfHostedGcpProjectId
*/}}
{{- define "carto.gcsBucketsProjectId" -}}
{{ default .Values.cartoConfigValues.selfHostedGcpProjectId .Values.cartoConfigValues.gcsBucketsProjectId }}
{{ default .Values.cartoConfigValues.selfHostedGcpProjectId .Values.customConfigValues.gcsBucketsProjectId }}
{{- end -}}

{{/*
Expand Down
12 changes: 6 additions & 6 deletions chart/templates/accounts-www/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ data:
CARTO_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
CARTO_AUTH0_CUSTOM_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
CARTO_SELFHOSTED_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
LOG_LEVEL: "debug"
PORT: {{ .Values.accountsWww.containerPorts.http | quote }}
REACT_APP_ACCOUNTS_API_URL: "https://{{ .Values.cartoConfigValues.cartoAccDomain }}"
REACT_APP_ACCOUNTS_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/acc/"
REACT_APP_API_BASE_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/api"
REACT_APP_ACCOUNTS_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/acc/"
REACT_APP_API_BASE_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/api"
REACT_APP_AUTH0_AUDIENCE: "carto-cloud-native-api"
REACT_APP_AUTH0_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
REACT_APP_BIGQUERY_OAUTH: "false"
Expand All @@ -35,8 +35,8 @@ data:
REACT_APP_HUBSPOT_ID: "474999"
REACT_APP_HUBSPOT_LIMIT_FORM_ID: "cd9486fa-5766-4bac-81b9-d8c6cd029b3b"
REACT_APP_LAUNCH_DARKLY_CLIENT_SIDE_ID: {{ .Values.cartoConfigValues.reactAppLaunchDarklyClientSideId | quote }}
REACT_APP_PUBLIC_MAP_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/api/v3/maps/public"
REACT_APP_WORKSPACE_API_URL: "https://{{ .Values.cartoConfigValues.selfHostedDomain }}/workspace-api"
REACT_APP_PUBLIC_MAP_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/api/v3/maps/public"
REACT_APP_WORKSPACE_API_URL: "https://{{ .Values.customConfigValues.selfHostedDomain }}/workspace-api"
REACT_APP_WORKSPACE_URL_TEMPLATE: "https://{tenantDomain}"
SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
{{- end }}
4 changes: 2 additions & 2 deletions chart/templates/accounts-www/secret.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
{{- end }}
2 changes: 1 addition & 1 deletion chart/templates/cdn-invalidator-sub/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ data:
ACC_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }}
ACC_GCP_PROJECT_REGION: {{ .Values.cartoConfigValues.cartoAccGcpProjectRegion | quote }}
CARTO3_SELFHOSTED_VOLUMES_BASE_PATH: "./"
CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
EVENT_BUS_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }}
Expand Down
2 changes: 1 addition & 1 deletion chart/templates/cdn-invalidator-sub/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if and (include "carto.baseUrl" .) (eq .Values.cartoConfigValues.httpCacheEnabled "true") }}
{{- if and (include "carto.baseUrl" .) (eq .Values.customConfigValues.httpCacheEnabled "true") }}
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
Expand Down
4 changes: 2 additions & 2 deletions chart/templates/cdn-invalidator-sub/secret.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
VARNISH_DEBUG_SECRET: {{ .Values.cartoSecrets.varnishDebugSecret | b64enc | quote }}
VARNISH_PURGE_SECRET: {{ .Values.cartoSecrets.varnishPurgeSecret | b64enc | quote }}
VARNISH_DEBUG_SECRET: {{ .Values.cartoSecretsValues.varnishDebugSecret | b64enc | quote }}
VARNISH_PURGE_SECRET: {{ .Values.cartoSecretsValues.varnishPurgeSecret | b64enc | quote }}
{{- end }}
8 changes: 4 additions & 4 deletions ...t/templates/google-credential-secret.yaml → ...mplates/google-serviceaccount-secret.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ metadata:
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
app.kubernetes.io/component: workspace-www
namespace: {{ .Release.Namespace | quote }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
stringData:
{{ template "carto.google.secretKey" . }}: |
{{- include "common.tplvalues.render" ( dict "value" .Values.google.credentialFile "context" $ ) | nindent 4 }}
type: Opaque
data:
key.json: {{ .Values.cartoSecretsValues.googleServiceAccount }}
{{- end }}
2 changes: 1 addition & 1 deletion chart/templates/http-cache/deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if and (include "carto.baseUrl" .) (eq .Values.cartoConfigValues.httpCacheEnabled "true") }}
{{- if and (include "carto.baseUrl" .) (eq .Values.customConfigValues.httpCacheEnabled "true") }}
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
Expand Down
4 changes: 2 additions & 2 deletions chart/templates/http-cache/secret.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
VARNISH_DEBUG_SECRET: {{ .Values.cartoSecrets.varnishDebugSecret | b64enc | quote }}
VARNISH_PURGE_SECRET: {{ .Values.cartoSecrets.varnishPurgeSecret | b64enc | quote }}
VARNISH_DEBUG_SECRET: {{ .Values.cartoSecretsValues.varnishDebugSecret | b64enc | quote }}
VARNISH_PURGE_SECRET: {{ .Values.cartoSecretsValues.varnishPurgeSecret | b64enc | quote }}
{{- end }}
14 changes: 7 additions & 7 deletions chart/templates/import-api/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ data:
CARTO_AUTH0_CUSTOM_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
CARTO_SELFHOSTED_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
CARTO_SELFHOSTED_CARTO_DW_LOCATION: {{ .Values.cartoConfigValues.cartoSelfhostedDwLocation | quote }}
CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
IMPORT_BUCKET: {{ .Values.cartoConfigValues.importBucket | quote }}
IMPORT_BUCKET: {{ .Values.customConfigValues.importBucket | quote }}
IMPORT_PORT: {{ .Values.importApi.containerPorts.http | quote }}
IMPORT_PUBSUB_TENANT_BUS_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/tenant-bus-import-sub"
IMPORT_PUBSUB_TENANT_BUS_TOPIC: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/topics/tenant-bus"
Expand All @@ -37,18 +37,18 @@ data:
REDIS_CACHE_PREFIX: "onprem"
REDIS_HOST: {{ include "carto.redis.host" . }}
REDIS_PORT: {{ include "carto.redis.port" . }}
SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
SELFHOSTED_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
WORKSPACE_POSTGRES_DB: {{ include "carto.postgresql.databaseName" . }}
WORKSPACE_POSTGRES_HOST: {{ include "carto.postgresql.host" . }}
WORKSPACE_POSTGRES_PORT: {{ include "carto.postgresql.port" . }}
WORKSPACE_POSTGRES_USER: {{ include "carto.postgresql.user" . }}
IMPORT_PROVIDER: {{ .Values.cartoConfigValues.storageProvider | quote }}
{{- if eq .Values.cartoConfigValues.storageProvider "gcp" }}
IMPORT_PROVIDER: {{ .Values.customConfigValues.storageProvider | quote }}
{{- if eq .Values.customConfigValues.storageProvider "gcp" }}
IMPORT_PROJECTID: {{ include "carto.gcsBucketsProjectId" . | quote }}
{{- end }}
{{- if eq .Values.cartoConfigValues.storageProvider "s3" }}
IMPORT_REGION: {{ .Values.cartoConfigValues.awsS3Region | quote }}
{{- if eq .Values.customConfigValues.storageProvider "s3" }}
IMPORT_REGION: {{ .Values.customConfigValues.awsS3Region | quote }}
{{- end }}
{{- end }}
10 changes: 5 additions & 5 deletions chart/templates/import-api/secret.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
{{- if eq .Values.cartoConfigValues.storageProvider "s3" }}
IMPORT_ACCESSKEYID: {{ .Values.cartoSecrets.awsAccessKeyId | b64enc | quote }}
IMPORT_SECRETACCESSKEY: {{ .Values.cartoSecrets.awsAccessKeySecret | b64enc | quote }}
ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
{{- if eq .Values.customConfigValues.storageProvider "s3" }}
IMPORT_ACCESSKEYID: {{ .Values.clientSecrets.awsAccessKeyId | b64enc | quote }}
IMPORT_SECRETACCESSKEY: {{ .Values.clientSecrets.awsAccessKeySecret | b64enc | quote }}
{{- end }}
{{- end }}
12 changes: 6 additions & 6 deletions chart/templates/import-worker/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ data:
ACC_GCP_PROJECT_REGION: {{ .Values.cartoConfigValues.cartoAccGcpProjectRegion | quote }}
CARTO3_SELFHOSTED_VOLUMES_BASE_PATH: "./"
CARTO_SELFHOSTED_CARTO_DW_LOCATION: {{ .Values.cartoConfigValues.cartoSelfhostedDwLocation | quote }}
CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
DO_ENABLED: "false"
GOOGLE_APPLICATION_CREDENTIALS: "../certs/key.json"
IMPORT_BUCKET: {{ .Values.cartoConfigValues.importBucket | quote }}
IMPORT_BUCKET: {{ .Values.customConfigValues.importBucket | quote }}
IMPORT_PUBSUB_TENANT_BUS_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/tenant-bus-import-sub"
IMPORT_PUBSUB_TENANT_BUS_TOPIC: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/topics/tenant-bus"
IMPORT_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
Expand All @@ -33,11 +33,11 @@ data:
WORKSPACE_POSTGRES_HOST: {{ include "carto.postgresql.host" . }}
WORKSPACE_POSTGRES_PORT: {{ include "carto.postgresql.port" . }}
WORKSPACE_POSTGRES_USER: {{ include "carto.postgresql.user" . }}
IMPORT_PROVIDER: {{ .Values.cartoConfigValues.storageProvider | quote }}
{{- if eq .Values.cartoConfigValues.storageProvider "gcp" }}
IMPORT_PROVIDER: {{ .Values.customConfigValues.storageProvider | quote }}
{{- if eq .Values.customConfigValues.storageProvider "gcp" }}
IMPORT_PROJECTID: {{ include "carto.gcsBucketsProjectId" . | quote }}
{{- end }}
{{- if eq .Values.cartoConfigValues.storageProvider "s3" }}
IMPORT_REGION: {{ .Values.cartoConfigValues.awsS3Region | quote }}
{{- if eq .Values.customConfigValues.storageProvider "s3" }}
IMPORT_REGION: {{ .Values.customConfigValues.awsS3Region | quote }}
{{- end }}
{{- end }}
10 changes: 5 additions & 5 deletions chart/templates/import-worker/secret.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
{{- if eq .Values.cartoConfigValues.storageProvider "s3" }}
IMPORT_ACCESSKEYID: {{ .Values.cartoSecrets.awsAccessKeyId | b64enc | quote }}
IMPORT_SECRETACCESSKEY: {{ .Values.cartoSecrets.awsAccessKeySecret | b64enc | quote }}
ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
{{- if eq .Values.customConfigValues.storageProvider "s3" }}
IMPORT_ACCESSKEYID: {{ .Values.clientSecrets.awsAccessKeyId | b64enc | quote }}
IMPORT_SECRETACCESSKEY: {{ .Values.clientSecrets.awsAccessKeySecret | b64enc | quote }}
{{- end }}
{{- end }}
8 changes: 4 additions & 4 deletions chart/templates/lds-api/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
DO_ENABLED: "false"
Expand All @@ -21,15 +21,15 @@ data:
REDIS_CACHE_PREFIX: "onprem"
REDIS_HOST: {{ include "carto.redis.host" . }}
REDIS_PORT: {{ include "carto.redis.port" . }}
SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
SELFHOSTED_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
WORKSPACE_IMPORTS_BUCKET: {{ .Values.cartoConfigValues.workspaceImportsBucket | quote }}
WORKSPACE_IMPORTS_BUCKET: {{ .Values.customConfigValues.workspaceImportsBucket | quote }}
WORKSPACE_POSTGRES_DB: {{ include "carto.postgresql.databaseName" . }}
WORKSPACE_POSTGRES_HOST: {{ include "carto.postgresql.host" . }}
WORKSPACE_POSTGRES_PORT: {{ include "carto.postgresql.port" . }}
WORKSPACE_POSTGRES_USER: {{ include "carto.postgresql.user" . }}
WORKSPACE_PUBSUB_DATA_UPDATES_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/data-updates-workspace-sub"
WORKSPACE_PUBSUB_DATA_UPDATES_TOPIC: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/topics/data-updates"
WORKSPACE_THUMBNAILS_BUCKET: {{ .Values.cartoConfigValues.workspaceThumbnailsBucket | quote }}
WORKSPACE_THUMBNAILS_BUCKET: {{ .Values.customConfigValues.workspaceThumbnailsBucket | quote }}
{{- end }}
4 changes: 2 additions & 2 deletions chart/templates/lds-api/secret.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
{{- end }}
12 changes: 6 additions & 6 deletions chart/templates/maps-api/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ data:
CARTO_AUTH0_CUSTOM_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
CARTO_SELFHOSTED_AUTH0_CLIENT_ID: {{ .Values.cartoConfigValues.cartoAuth0ClientId | quote }}
CARTO_SELFHOSTED_CARTO_DW_LOCATION: {{ .Values.cartoConfigValues.cartoSelfhostedDwLocation | quote }}
CARTO_SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
DO_ENABLED: "false"
Expand All @@ -32,8 +32,8 @@ data:
GOOGLE_APPLICATION_CREDENTIALS: "../certs/key.json"
LOG_LEVEL: "debug"
MAPS_API_V3_PORT: "{{ .Values.mapsApi.containerPorts.http }}"
MAPS_API_V3_RESOURCE_URL_ALLOWED_HOSTS: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
MAPS_API_V3_RESOURCE_URL_HOST: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
MAPS_API_V3_RESOURCE_URL_ALLOWED_HOSTS: {{ .Values.customConfigValues.selfHostedDomain | quote }}
MAPS_API_V3_RESOURCE_URL_HOST: {{ .Values.customConfigValues.selfHostedDomain | quote }}
MAPS_API_V3_RESOURCE_URL_TEMPLATE_NEW: 'https://${host}/api/${path}'
MAPS_API_V3_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
PUBSUB_DATA_UPDATES_TOPICS_TEMPLATE: "projects/{project_id}/topics/data-updates"
Expand All @@ -42,10 +42,10 @@ data:
REDIS_CACHE_PREFIX: "onprem"
REDIS_HOST: {{ include "carto.redis.host" . }}
REDIS_PORT: {{ include "carto.redis.port" . }}
SELFHOSTED_DOMAIN: {{ .Values.cartoConfigValues.selfHostedDomain | quote }}
SELFHOSTED_DOMAIN: {{ .Values.customConfigValues.selfHostedDomain | quote }}
SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
SELFHOSTED_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
WORKSPACE_IMPORTS_BUCKET: {{ .Values.cartoConfigValues.workspaceImportsBucket | quote }}
WORKSPACE_IMPORTS_BUCKET: {{ .Values.customConfigValues.workspaceImportsBucket | quote }}
WORKSPACE_PORT: "{{ .Values.workspaceApi.containerPorts.http }}"
WORKSPACE_PORT: {{ .Values.workspaceApi.containerPorts.http | quote }}
WORKSPACE_POSTGRES_DB: {{ include "carto.postgresql.databaseName" . }}
Expand All @@ -55,5 +55,5 @@ data:
WORKSPACE_PUBSUB_DATA_UPDATES_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/data-updates-workspace-sub"
WORKSPACE_PUBSUB_DATA_UPDATES_TOPIC: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/topics/data-updates"
WORKSPACE_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
WORKSPACE_THUMBNAILS_BUCKET: {{ .Values.cartoConfigValues.workspaceThumbnailsBucket | quote }}
WORKSPACE_THUMBNAILS_BUCKET: {{ .Values.customConfigValues.workspaceThumbnailsBucket | quote }}
{{- end }}
4 changes: 2 additions & 2 deletions chart/templates/maps-api/secret.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ metadata:
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecrets.encryptionSecretKey | b64enc | quote }}
REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.cartoSecrets.googleMapsApiKey | b64enc | quote }}
ENCRYPTION_SECRET_KEY: {{ .Values.cartoSecretsValues.encryptionSecretKey | b64enc | quote }}
REACT_APP_GOOGLE_MAPS_API_KEY: {{ .Values.customSecretsValues.googleMapsApiKey | b64enc | quote }}
{{- end }}
Loading

0 comments on commit ada1540

Please sign in to comment.