Add CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN when Replicated is enabled (…

…#557) * Add CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN when Replicated is enabled * Fix tenant-requirements-checker when commons-sa does not exist * Fix * Update replicated sdk version * Fix * Update dependencies
CartoDB · Jun 11, 2024 · ecf6e46 · ecf6e46
1 parent c54384d
commit ecf6e46
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 4 deletions.
diff --git a/chart/Chart.lock b/chart/Chart.lock
@@ -10,6 +10,6 @@ dependencies:
   version: 16.13.2
 - name: replicated
   repository: oci://registry.replicated.com/library
-  version: 1.0.0-beta.15
-digest: sha256:08e13946b5fb3eed5caedcc405fba76a38586c1bd2c6568bad100da65c18ae10
-generated: "2024-02-19T18:23:46.443684702+01:00"
+  version: 1.0.0-beta.21
+digest: sha256:e5e9be5949b002165bed577fdbbef4b22b497542916ae544360f8b0da8394719
+generated: "2024-06-11T13:43:46.305989+02:00"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -18,7 +18,7 @@ dependencies:
     version: 16.x.x
   - name: replicated
     repository: oci://registry.replicated.com/library
-    version: 1.0.0-beta.15
+    version: 1.0.0-beta.21
     condition: replicated.enabled
 description: CARTO Location Intelligence Platform. Unlock the power of spatial analysis in the cloud
 engine: gotpl

diff --git a/chart/templates/_commonChecks.tpl b/chart/templates/_commonChecks.tpl
@@ -8,7 +8,9 @@ Return common collectors for preflights and support-bundle
       namespace: {{ .Release.Namespace | quote }}
       timeout: 180s
       podSpec:
+        {{- if lookup "v1" "ServiceAccount" .Release.Namespace (include "carto.commonSA.serviceAccountName" .) }}
         serviceAccountName: {{ template "carto.commonSA.serviceAccountName" . }}
+        {{- end }}
         restartPolicy: Never
         securityContext: {{- toYaml .Values.tenantRequirementsChecker.podSecurityContext | nindent 10 }}
         initContainers:

diff --git a/chart/templates/cdn-invalidator-sub/configmap.yaml b/chart/templates/cdn-invalidator-sub/configmap.yaml
@@ -12,6 +12,9 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 data:
+  {{- if .Values.replicated.enabled }}
+  CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000"
+  {{- end }}
   CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }}
   EVENT_BUS_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }}
   CDN_INVALIDATOR_BACKEND_ENGINE: "varnish"

diff --git a/chart/templates/import-api/configmap.yaml b/chart/templates/import-api/configmap.yaml
@@ -15,6 +15,9 @@ data:
   AUTH0_AUDIENCE: "carto-cloud-native-api"
   AUTH0_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
   AUTH0_NAMESPACE: "http://app.carto.com"
+  {{- if .Values.replicated.enabled }}
+  CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000"
+  {{- end }}
   CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }}
   IMPORT_ERROR_RESPONSE_STACK_TRACE: {{ .Values.cartoConfigValues.enableErrorResponseStackTrace | quote }}
   IMPORT_PORT: {{ .Values.importApi.containerPorts.http | quote }}

diff --git a/chart/templates/import-worker/configmap.yaml b/chart/templates/import-worker/configmap.yaml
@@ -13,6 +13,9 @@ metadata:
   {{- end }}
 data:
   BIGQUERY_OAUTH2_CLIENT_ID: {{ .Values.appConfigValues.bigqueryOauth2ClientId | quote }}
+  {{- if .Values.replicated.enabled }}
+  CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000"
+  {{- end }}
   CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }}
   {{- if not .Values.commonBackendServiceAccount.enableGCPWorkloadIdentity }}
   GOOGLE_APPLICATION_CREDENTIALS: {{ include "carto.google.secretMountAbsolutePath" . }}

diff --git a/chart/templates/maps-api/configmap.yaml b/chart/templates/maps-api/configmap.yaml
@@ -16,6 +16,9 @@ data:
   AUTH0_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
   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"
+  {{- end }}
   CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }}
   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/sql-worker/configmap.yaml b/chart/templates/sql-worker/configmap.yaml
@@ -15,6 +15,9 @@ data:
   AUTH0_AUDIENCE: "carto-cloud-native-api"
   AUTH0_DOMAIN: {{ .Values.cartoConfigValues.cartoAuth0CustomDomain | quote }}
   AUTH0_NAMESPACE: "http://app.carto.com"
+  {{- if .Values.replicated.enabled }}
+  CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000"
+  {{- end }}
   CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }}
   EXPORTS_GCS_BUCKET_NAME: {{ .Values.appConfigValues.workspaceExportsBucket | quote }}
   EXPORTS_S3_BUCKET_NAME: {{ .Values.appConfigValues.awsExportBucket | quote }}

diff --git a/chart/templates/workspace-api/configmap.yaml b/chart/templates/workspace-api/configmap.yaml
@@ -23,6 +23,9 @@ data:
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }}
   CARTO_SELFHOSTED_DEPLOYMENT: "kubernetes"
+  {{- if .Values.replicated.enabled }}
+  CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000"
+  {{- end }}
   EVENT_BUS_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }}
   EVENT_BUS_TOPIC: "projects/{{ .Values.cartoConfigValues.cartoAccGcpProjectId }}/topics/{{ .Values.cartoConfigValues.cartoAccGcpProjectRegion }}-event-bus"
   EXPORTS_GCS_BUCKET_NAME: {{ .Values.appConfigValues.workspaceExportsBucket | quote }}

diff --git a/chart/templates/workspace-subscriber/configmap.yaml b/chart/templates/workspace-subscriber/configmap.yaml
@@ -19,6 +19,9 @@ data:
   CARTO_SELFHOSTED_GCP_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
   CARTO_SELFHOSTED_NAME: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
   CARTO_SELFHOSTED_VERSION: {{ .Chart.AppVersion | quote }}
+  {{- if .Values.replicated.enabled }}
+  CARTO_SELFHOSTED_REPLICATED_SDK_DOMAIN: "replicated:3000"
+  {{- end }}
   COMPUTE_PUBSUB_DATA_UPDATES_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/data-updates-compute-sub"
   EVENT_BUS_PROJECT_ID: {{ .Values.cartoConfigValues.cartoAccGcpProjectId | quote }}
   EVENT_BUS_TOPIC: "projects/{{ .Values.cartoConfigValues.cartoAccGcpProjectId }}/topics/{{ .Values.cartoConfigValues.cartoAccGcpProjectRegion }}-event-bus"