Skip to content
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

Jump to bottom

breaking change: update .Values.tlsCerts and ingress resources #544

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

breaking change: update .Values.tlsCerts and ingress resources #544

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
504917c
breaking change: update tlsCerts values and remove ingress resources
alvarorm22 Jun 3, 2024
280837c
update tls and ingress resources
alvarorm22 Jun 4, 2024
0fd5334
update tlsCerts and ingress config values
alvarorm22 Jun 4, 2024
03fa061
move ingress template out from router
alvarorm22 Jun 4, 2024
04a1da5
Merge branch 'main' of github.com:CartoDB/carto-selfhosted-helm into …
alvarorm22 Jun 4, 2024
b0ed534
add notes
alvarorm22 Jun 4, 2024
5118202
update NOTES.txt
alvarorm22 Jun 5, 2024
fdb974d
revert router deployment with baseUrl
alvarorm22 Jun 5, 2024
22cb042
Merge branch 'main' of github.com:CartoDB/carto-selfhosted-helm into …
alvarorm22 Jun 5, 2024
6123a64
update NOTES.txt
alvarorm22 Jun 5, 2024
642f384
update router deployment
alvarorm22 Jun 5, 2024
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
86 changes: 43 additions & 43 deletions chart/README.md
View file
Open in desktop

Large diffs are not rendered by default.

129 changes: 0 additions & 129 deletions chart/templates/NOTES.txt
View file
Open in desktop
alvarorm22 marked this conversation as resolved.
Show resolved Hide resolved

This file was deleted.

33 changes: 10 additions & 23 deletions chart/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,17 +941,13 @@ Return the absolute path where the Google Secret will be mounted

{{/*
Return the proper Carto TLS Secret name
FIXME: Deprecated in favor of router.tlsCertificates and gateway.tlsCertificates
TODO: We have to regenerate the secret if the private key changes
*/}}
{{- define "carto.tlsCerts.secretName" -}}
{{- include "carto.tlsCerts.duplicatedValueValidator" . -}}
{{- if .Values.tlsCerts.existingSecret.name -}}
{{- .Values.tlsCerts.existingSecret.name -}}
{{- define "carto.router.tlsCertificates.secretName" -}}
{{- include "carto.router.tlsCertificates.duplicatedValueValidator" . -}}
{{- if .Values.router.tlsCertificates.existingSecret.name -}}
{{- .Values.router.tlsCertificates.existingSecret.name -}}
{{- else if (empty .Values.router.tlsCertificates.certificateValueBase64) -}}
{{/*
Preserved the original behaviour in case someone use the default secret name without explicitly define that parameter
*/}}
{{- printf "%s-tls" (include "common.names.fullname" .) -}}
{{- else -}}
{{- printf "%s-tls-%s" (include "common.names.fullname" .) (.Values.router.tlsCertificates.certificateValueBase64 | sha256sum | substr 0 5) -}}
Expand All @@ -960,35 +956,26 @@ TODO: We have to regenerate the secret if the private key changes

{{/*
Return the proper Carto TLS secret key for the TLS cert
FIXME: Deprecated in favor of router.tlsCertificates and gateway.tlsCertificates
*/}}
{{- define "carto.tlsCerts.secretCertKey" -}}
{{- if .Values.tlsCerts.existingSecret.name -}}
{{- .Values.tlsCerts.existingSecret.certKey -}}
{{- define "carto.router.tlsCertificates.secretCertKey" -}}
{{- if .Values.router.tlsCertificates.existingSecret.name -}}
{{- .Values.router.tlsCertificates.existingSecret.certKey -}}
{{- else -}}
{{- print "tls.crt" -}}
{{- end -}}
{{- end -}}

{{/*
Return the proper Carto TLS secret key for the TLS key
FIXME: Deprecated in favor of router.tlsCertificates and gateway.tlsCertificates
*/}}
{{- define "carto.tlsCerts.secretKeyKey" -}}
{{- if .Values.tlsCerts.existingSecret.name -}}
{{- .Values.tlsCerts.existingSecret.keyKey -}}
{{- define "carto.router.tlsCertificates.secretKeyKey" -}}
{{- if .Values.router.tlsCertificates.existingSecret.name -}}
{{- .Values.router.tlsCertificates.existingSecret.keyKey -}}
{{- else -}}
{{- print "tls.key" -}}
{{- end -}}
{{- end -}}

{{/*
Return the proper Carto Router TLS Secret name
*/}}
{{- define "carto.router.tlsCertificates.secretName" -}}
{{- printf "%s-tls-%s" (include "common.names.fullname" .) (.Values.router.tlsCertificates.certificateValueBase64 | sha256sum | substr 0 5) -}}
{{- end -}}

{{/*
Return the proper Carto Gateway custom TLS Secret name
*/}}
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/_validators.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- define "carto.tlsCerts.duplicatedValueValidator" -}}
{{- if and (.Values.tlsCerts.existingSecret.name) (not (empty .Values.router.tlsCertificates.certificateValueBase64)) -}}
{{- fail "You cannot define both tlsCerts.existingSecret.name and router.tlsCertificates.certificateValueBase64" -}}
{{- define "carto.router.tlsCertificates.duplicatedValueValidator" -}}
{{- if and (.Values.router.tlsCertificates.existingSecret.name) (not (empty .Values.router.tlsCertificates.certificateValueBase64)) -}}
{{- fail "You cannot define both router.tlsCertificates.existingSecret.name and router.tlsCertificates.certificateValueBase64" -}}
{{- end -}}
{{- end -}}
20 changes: 0 additions & 20 deletions chart/templates/auto-tls-secret.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion chart/templates/gateway/gateway-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ spec:
value: {{ .Values.gateway.path }}
backendRefs:
- name: {{ template "carto.router.fullname" . }}
{{- if .Values.tlsCerts.httpsEnabled }}
{{- if .Values.router.httpsEnabled }}
port: {{ .Values.router.service.ports.https }}
{{- else }}
port: {{ .Values.router.service.ports.http }}
Expand Down
6 changes: 3 additions & 3 deletions chart/templates/router/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ data:
ROUTER_MAPS_API_INTERNAL_URL: {{ include "carto.mapsApi.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
# If required, is going to be generated by Helm and inyected as secret
ROUTER_SSL_AUTOGENERATE: "0"
ROUTER_SSL_CERTIFICATE_KEY_PATH: /usr/src/certs/{{ template "carto.tlsCerts.secretKeyKey" . }}
ROUTER_SSL_CERTIFICATE_PATH: /usr/src/certs/{{ template "carto.tlsCerts.secretCertKey" . }}
ROUTER_SSL_CERTIFICATE_KEY_PATH: /usr/src/certs/{{ template "carto.router.tlsCertificates.secretKeyKey" . }}
ROUTER_SSL_CERTIFICATE_PATH: /usr/src/certs/{{ template "carto.router.tlsCertificates.secretCertKey" . }}
ROUTER_WORKSPACE_API_INTERNAL_URL: {{ include "carto.workspaceApi.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
ROUTER_WORKSPACE_WWW_INTERNAL_URL: {{ include "carto.workspaceWww.fullname" . }}.{{ .Release.Namespace }}.svc.{{ .Values.clusterDomain }}
ROUTER_ENABLE_HTTPS: {{ .Values.tlsCerts.httpsEnabled | quote }}
ROUTER_ENABLE_HTTPS: {{ .Values.router.httpsEnabled | quote }}
ROUTER_METRICS_PUBSUB_PROJECT_ID: {{ .Values.cartoConfigValues.selfHostedGcpProjectId | quote }}
ROUTER_METRICS_PUBSUB_TOPIC: "data-updates"
ROUTER_METRICS_HOST: "localhost"
Expand Down
8 changes: 4 additions & 4 deletions chart/templates/router/custom-tls-secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{- if (and .Values.tlsCerts.httpsEnabled (not (empty .Values.router.tlsCertificates.certificateValueBase64))) }}
{{- if (and .Values.router.httpsEnabled (not (empty .Values.router.tlsCertificates.certificateValueBase64))) }}
apiVersion: v1
kind: Secret
metadata:
name: {{ include "carto.tlsCerts.secretName" . }}
name: {{ include "carto.router.tlsCertificates.secretName" . }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
Expand All @@ -12,6 +12,6 @@ metadata:
{{- end }}
type: kubernetes.io/tls
data:
{{ template "carto.tlsCerts.secretCertKey" . }}: {{ .Values.router.tlsCertificates.certificateValueBase64 | nindent 4 }}
{{ template "carto.tlsCerts.secretKeyKey" . }}: {{ .Values.router.tlsCertificates.privateKeyValueBase64 | nindent 4 }}
{{ template "carto.router.tlsCertificates.secretCertKey" . }}: {{ .Values.router.tlsCertificates.certificateValueBase64 | nindent 4 }}
{{ template "carto.router.tlsCertificates.secretKeyKey" . }}: {{ .Values.router.tlsCertificates.privateKeyValueBase64 | nindent 4 }}
{{- end }}
16 changes: 7 additions & 9 deletions chart/templates/router/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{{- if (include "carto.baseUrl" .) }}
apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
kind: Deployment
metadata:
Expand Down Expand Up @@ -147,13 +146,13 @@ spec:
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.router.lifecycleHooks "context" $) | nindent 12 }}
{{- end }}
volumeMounts:
{{- if .Values.tlsCerts.httpsEnabled }}
{{- if .Values.router.httpsEnabled }}
- name: tls-secret
mountPath: /usr/src/certs/{{ template "carto.tlsCerts.secretCertKey" . }}
subPath: {{ template "carto.tlsCerts.secretCertKey" . }}
mountPath: /usr/src/certs/{{ template "carto.router.tlsCertificates.secretCertKey" . }}
subPath: {{ template "carto.router.tlsCertificates.secretCertKey" . }}
- name: tls-secret
mountPath: /usr/src/certs/{{ template "carto.tlsCerts.secretKeyKey" . }}
subPath: {{ template "carto.tlsCerts.secretKeyKey" . }}
mountPath: /usr/src/certs/{{ template "carto.router.tlsCertificates.secretKeyKey" . }}
subPath: {{ template "carto.router.tlsCertificates.secretKeyKey" . }}
{{- end }}
{{- if .Values.router.extraVolumeMounts }}
{{- include "common.tplvalues.render" (dict "value" .Values.router.extraVolumeMounts "context" $) | nindent 12 }}
Expand Down Expand Up @@ -240,10 +239,10 @@ spec:
{{- include "common.tplvalues.render" ( dict "value" .Values.router.sidecars "context" $) | nindent 8 }}
{{- end }}
volumes:
{{- if .Values.tlsCerts.httpsEnabled }}
{{- if .Values.router.httpsEnabled }}
- name: tls-secret
secret:
secretName: {{ include "carto.tlsCerts.secretName" . }}
secretName: {{ include "carto.router.tlsCertificates.secretName" . }}
{{- end }}
- name: gcp-default-service-account-key
secret:
Expand All @@ -254,4 +253,3 @@ spec:
{{- if .Values.router.extraVolumes }}
{{- include "common.tplvalues.render" (dict "value" .Values.router.extraVolumes "context" $) | nindent 8 }}
{{- end }}
{{- end }}
34 changes: 17 additions & 17 deletions chart/templates/router/ingress.yaml
View file
Open in desktop
alvarorm22 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- if .Values.router.ingress.enabled }}
{{- if .Values.ingress.enabled }}
apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
kind: Ingress
metadata:
Expand All @@ -9,31 +9,31 @@ metadata:
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
annotations:
{{- if .Values.router.ingress.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.router.ingress.annotations "context" $) | nindent 4 }}
{{- if .Values.ingress.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingress.annotations "context" $) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
{{- if and .Values.router.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
ingressClassName: {{ .Values.router.ingress.ingressClassName | quote }}
{{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
{{- end }}
rules:
{{- if .Values.appConfigValues.selfHostedDomain }}
- host: {{ .Values.appConfigValues.selfHostedDomain }}
http:
paths:
- path: {{ .Values.router.ingress.path }}
- path: {{ .Values.ingress.path }}
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.router.ingress.pathType }}
pathType: {{ .Values.ingress.pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "carto.router.fullname" .) "servicePort" "http" "context" $) | nindent 14 }}
{{- if .Values.router.ingress.extraPaths }}
{{- toYaml .Values.router.ingress.extraPaths | nindent 10 }}
{{- if .Values.ingress.extraPaths }}
{{- toYaml .Values.ingress.extraPaths | nindent 10 }}
{{- end }}
{{- end }}
{{- range (coalesce .Values.router.ingress.extraHosts .Values.router.ingress.hosts) }}
{{- range (coalesce .Values.ingress.extraHosts .Values.ingress.hosts) }}
- host: {{ .name | quote }}
http:
paths:
Expand All @@ -43,18 +43,18 @@ spec:
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "carto.router.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- if .Values.router.ingress.extraRules }}
{{- include "common.tplvalues.render" (dict "value" .Values.router.ingress.extraRules "context" $) | nindent 4 }}
{{- if .Values.ingress.extraRules }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraRules "context" $) | nindent 4 }}
{{- end }}
{{- if or .Values.router.ingress.tls .Values.router.ingress.extraTls }}
{{- if or .Values.ingress.tls .Values.ingress.extraTls }}
tls:
{{- if .Values.router.ingress.tls }}
{{- if .Values.ingress.tls }}
- hosts:
- {{ .Values.appConfigValues.selfHostedDomain | quote }}
secretName: {{ .Values.tlsCerts.existingSecret.name }}
secretName: {{ .Values.ingress.existingSecret.name }}
{{- end }}
{{- if .Values.router.ingress.extraTls }}
{{- include "common.tplvalues.render" (dict "value" .Values.router.ingress.extraTls "context" $) | nindent 4 }}
{{- if .Values.ingress.extraTls }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}
Loading
Loading