From a2c6471a9971f7c0b2c2b2f138a058988f80c73d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Calzado?= Date: Mon, 22 Jul 2024 11:20:28 +0200 Subject: [PATCH] Fix replicated service domain --- chart/templates/cdn-invalidator-sub/configmap.yaml | 2 +- chart/templates/import-api/configmap.yaml | 2 +- chart/templates/import-worker/configmap.yaml | 2 +- chart/templates/maps-api/configmap.yaml | 2 +- chart/templates/sql-worker/configmap.yaml | 2 +- chart/templates/workspace-api/configmap.yaml | 2 +- chart/templates/workspace-subscriber/configmap.yaml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chart/templates/cdn-invalidator-sub/configmap.yaml b/chart/templates/cdn-invalidator-sub/configmap.yaml index 56ce9885..fdaffb27 100644 --- a/chart/templates/cdn-invalidator-sub/configmap.yaml +++ b/chart/templates/cdn-invalidator-sub/configmap.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} data: {{- if .Values.replicated.enabled }} - CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000" + CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:3000" {{- end }} CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }} EVENT_BUS_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }} diff --git a/chart/templates/import-api/configmap.yaml b/chart/templates/import-api/configmap.yaml index db2da980..e249bdab 100644 --- a/chart/templates/import-api/configmap.yaml +++ b/chart/templates/import-api/configmap.yaml @@ -16,7 +16,7 @@ data: AUTH0_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }} AUTH0_NAMESPACE: "http://app.carto.com" {{- if .Values.replicated.enabled }} - CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000" + CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:3000" {{- end }} CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }} IMPORT_ERROR_RESPONSE_STACK_TRACE: {{ .Values.cartoConfigValues.enableErrorResponseStackTrace | quote }} diff --git a/chart/templates/import-worker/configmap.yaml b/chart/templates/import-worker/configmap.yaml index 47df9331..ac844b10 100644 --- a/chart/templates/import-worker/configmap.yaml +++ b/chart/templates/import-worker/configmap.yaml @@ -14,7 +14,7 @@ metadata: data: BIGQUERY_OAUTH2_CLIENT_ID: {{ .Values.appConfigValues.bigqueryOauth2ClientId | quote }} {{- if .Values.replicated.enabled }} - CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000" + CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:3000" {{- end }} CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }} {{- if not .Values.commonBackendServiceAccount.enableGCPWorkloadIdentity }} diff --git a/chart/templates/maps-api/configmap.yaml b/chart/templates/maps-api/configmap.yaml index 9412109d..e4f8a5a2 100644 --- a/chart/templates/maps-api/configmap.yaml +++ b/chart/templates/maps-api/configmap.yaml @@ -17,7 +17,7 @@ data: AUTH0_NAMESPACE: "http://app.carto.com" BIGQUERY_OAUTH2_CLIENT_ID: {{ .Values.appConfigValues.bigqueryOauth2ClientId | quote }} {{- if .Values.replicated.enabled }} - CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000" + CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:3000" {{- end }} CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }} EVENT_BUS_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }} diff --git a/chart/templates/sql-worker/configmap.yaml b/chart/templates/sql-worker/configmap.yaml index fbb46a16..2ebc4037 100644 --- a/chart/templates/sql-worker/configmap.yaml +++ b/chart/templates/sql-worker/configmap.yaml @@ -16,7 +16,7 @@ data: AUTH0_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }} AUTH0_NAMESPACE: "http://app.carto.com" {{- if .Values.replicated.enabled }} - CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000" + CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:3000" {{- end }} CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }} EXPORTS_GCS_BUCKET_NAME: {{ .Values.appConfigValues.workspaceExportsBucket | quote }} diff --git a/chart/templates/workspace-api/configmap.yaml b/chart/templates/workspace-api/configmap.yaml index 928d648c..0584e36d 100644 --- a/chart/templates/workspace-api/configmap.yaml +++ b/chart/templates/workspace-api/configmap.yaml @@ -24,7 +24,7 @@ data: CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }} CARTO_SELFHOSTED_DEPLOYMENT: "kubernetes" {{- if .Values.replicated.enabled }} - CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000" + CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:3000" {{- end }} EVENT_BUS_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }} EVENT_BUS_TOPIC: "projects/{{ .Values.cartoConfigValues.cartoAccGcpProjectId }}/topics/{{ .Values.cartoConfigValues.cartoAccGcpProjectRegion }}-event-bus" diff --git a/chart/templates/workspace-subscriber/configmap.yaml b/chart/templates/workspace-subscriber/configmap.yaml index 72fc9c8f..5c6095d9 100644 --- a/chart/templates/workspace-subscriber/configmap.yaml +++ b/chart/templates/workspace-subscriber/configmap.yaml @@ -20,7 +20,7 @@ data: CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }} CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }} {{- if .Values.replicated.enabled }} - CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000" + CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}:3000" {{- end }} COMPUTE_PUBSUB_DATA_UPDATES_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/data-updates-compute-sub" EVENT_BUS_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }}