Skip to content

Commit

Permalink
Improve naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@moicalcob
moicalcob committed Nov 18, 2024
1 parent b5d1a26 commit f5ed79a
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
6 changes: 3 additions & 3 deletions chart/templates/import-api/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ data:
{{- if and .Values.externalPostgresql.sslEnabled .Values.externalPostgresql.sslCA }}
WORKSPACE_POSTGRES_SSL_CA: {{ include "carto.postgresql.configMapMountAbsolutePath" . }}
{{- end }}
{{- if .Values.externalPostgresql.eksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.rdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.eksPodIdentityEnabled | quote }}
{{- if .Values.externalPostgresql.awsEksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.awsRdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.awsEksPodIdentityEnabled | quote }}
{{- end }}
IMPORT_AWS_CUSTOM_BUCKET_ROLE_ARN: {{ .Values.appConfigValues.importAwsRoleArn | quote }}
IMPORT_PROVIDER: {{ .Values.appConfigValues.storageProvider | quote }}
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/import-worker/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ data:
{{- if and .Values.externalPostgresql.sslEnabled .Values.externalPostgresql.sslCA }}
WORKSPACE_POSTGRES_SSL_CA: {{ include "carto.postgresql.configMapMountAbsolutePath" . }}
{{- end }}
{{- if .Values.externalPostgresql.eksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.rdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.eksPodIdentityEnabled | quote }}
{{- if .Values.externalPostgresql.awsEksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.awsRdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.awsEksPodIdentityEnabled | quote }}
{{- end }}
IMPORT_AWS_CUSTOM_BUCKET_ROLE_ARN: {{ .Values.appConfigValues.importAwsRoleArn | quote }}
IMPORT_PROVIDER: {{ .Values.appConfigValues.storageProvider | quote }}
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/lds-api/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ data:
{{- if and .Values.externalPostgresql.sslEnabled .Values.externalPostgresql.sslCA }}
WORKSPACE_POSTGRES_SSL_CA: {{ include "carto.postgresql.configMapMountAbsolutePath" . }}
{{- end }}
{{- if .Values.externalPostgresql.eksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.rdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.eksPodIdentityEnabled | quote }}
{{- if .Values.externalPostgresql.awsEksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.awsRdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.awsEksPodIdentityEnabled | quote }}
{{- end }}
LDS_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
{{- if .Values.externalProxy.enabled }}
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/maps-api/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ data:
{{- if and .Values.externalPostgresql.sslEnabled .Values.externalPostgresql.sslCA }}
WORKSPACE_POSTGRES_SSL_CA: {{ include "carto.postgresql.configMapMountAbsolutePath" . }}
{{- end }}
{{- if .Values.externalPostgresql.eksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.rdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.eksPodIdentityEnabled | quote }}
{{- if .Values.externalPostgresql.awsEksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.awsRdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.awsEksPodIdentityEnabled | quote }}
{{- end }}
{{- if .Values.externalProxy.enabled }}
HTTP_PROXY: {{ include "carto.proxy.computedConnectionString" . | quote }}
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/sql-worker/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ data:
{{- if and .Values.externalPostgresql.sslEnabled .Values.externalPostgresql.sslCA }}
WORKSPACE_POSTGRES_SSL_CA: {{ include "carto.postgresql.configMapMountAbsolutePath" . }}
{{- end }}
{{- if .Values.externalPostgresql.eksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.rdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.eksPodIdentityEnabled | quote }}
{{- if .Values.externalPostgresql.awsEksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.awsRdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.awsEksPodIdentityEnabled | quote }}
{{- end }}
WORKSPACE_TENANT_ID: {{ .Values.cartoConfigValues.selfHostedTenantId | quote }}
{{- if .Values.externalProxy.enabled }}
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/workspace-api/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ data:
{{- if and .Values.externalPostgresql.sslEnabled .Values.externalPostgresql.sslCA }}
WORKSPACE_POSTGRES_SSL_CA: {{ include "carto.postgresql.configMapMountAbsolutePath" . }}
{{- end }}
{{- if .Values.externalPostgresql.eksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.rdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.eksPodIdentityEnabled | quote }}
{{- if .Values.externalPostgresql.awsEksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.awsRdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.awsEksPodIdentityEnabled | quote }}
{{- end }}
IMPORT_AWS_CUSTOM_BUCKET_ROLE_ARN: {{ .Values.appConfigValues.importAwsRoleArn | quote }}
WORKSPACE_PUBSUB_DATA_UPDATES_SUBSCRIPTION: "projects/{{ .Values.cartoConfigValues.selfHostedGcpProjectId }}/subscriptions/data-updates-workspace-sub"
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/workspace-subscriber/configmap.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ data:
{{- if and .Values.externalPostgresql.sslEnabled .Values.externalPostgresql.sslCA }}
WORKSPACE_POSTGRES_SSL_CA: {{ include "carto.postgresql.configMapMountAbsolutePath" . }}
{{- end }}
{{- if .Values.externalPostgresql.eksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.rdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.eksPodIdentityEnabled | quote }}
{{- if .Values.externalPostgresql.awsEksPodIdentityEnabled }}
CARTO_SELFHOSTED_AWS_RDS_METADATA_REGION: {{ .Values.externalPostgresql.awsRdsRegion | quote }}
CARTO_SELFHOSTED_AWS_EKS_POD_IDENTITY_METADATA_DB_ENABLED: {{ .Values.externalPostgresql.awsEksPodIdentityEnabled | quote }}
{{- end }}
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"
Expand Down
8 changes: 4 additions & 4 deletions chart/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4875,8 +4875,8 @@ internalPostgresql:
## @param externalPostgresql.port Database port number
## @param externalPostgresql.sslEnabled Whether or not connect to CARTO Postgresql via TLS
## @param externalPostgresql.sslCA CA certificate in case CARTO Postgresql TLS cert it's selfsigned
## @param externalPostgresql.eksPodIdentityEnabled
## @param externalPostgresql.rdsRegion
## @param externalPostgresql.awsEksPodIdentityEnabled
## @param externalPostgresql.awsRdsRegion
##
externalPostgresql:
host: localhost
Expand All @@ -4894,8 +4894,8 @@ externalPostgresql:
port: 5432
sslEnabled: false
sslCA: ""
eksPodIdentityEnabled: false
rdsRegion: ""
awsEksPodIdentityEnabled: false
awsRdsRegion: ""

## @section External proxy configuration
## Configuration for an external proxy provided by the client. Only HTTP and HTTPS proxies are supported
Expand Down

0 comments on commit f5ed79a

Please sign in to comment.