Commit 375c5818 authored by Aleksey Vasenev's avatar Aleksey Vasenev
Browse files

Additional tls hosts

parent d33809ef

assets/auto-deploy-app/templates/ingress.yaml

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ spec: 
    - {{ template "hostname" $host }}

{{- end -}}

{{- end }}

{{- if .Values.service.gosAdditionalTlsHosts }}

{{- range $host := .Values.service.gosAdditionalTlsHosts }}

    - {{ template "hostname" $host }}

{{- end -}}

{{- end }}

{{- if not .Values.ingress.tls.useDefaultSecret }}

    secretName: {{ .Values.ingress.tls.secretName | default (printf "%s-tls" (include "fullname" .)) }}

{{- end }}

assets/auto-deploy-app/values.yaml

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ service: 
  type: ClusterIP

  url: http://my.host.com/

  additionalHosts:

  gosAdditionalTlsHosts:

  commonName:

  externalPort: 5000

  internalPort: 5000

src/bin/auto-deploy

+10 −0
Original line number Diff line number Diff line
@@ -330,6 +330,14 @@ channel 1 database.' 
    additional_hosts="{$ADDITIONAL_HOSTS}"

  fi



  local gos_additional_tls_hosts

  eval local env_GOS_ADDITIONAL_TLS_HOSTS="\$${env_slug}_GOS_ADDITIONAL_TLS_HOSTS"

  if [ -n "$env_GOS_ADDITIONAL_TLS_HOSTS" ]; then

    gos_additional_tls_hosts="{$env_GOS_ADDITIONAL_TLS_HOSTS}"

  elif [ -n "$GOS_ADDITIONAL_TLS_HOSTS" ]; then

    gos_additional_tls_hosts="{$GOS_ADDITIONAL_TLS_HOSTS}"

  fi



  local helm_values_args=()

  local helm_values_file=${HELM_UPGRADE_VALUES_FILE:-.gitlab/auto-deploy-values.yaml}

  if [[ -f "${helm_values_file}" ]]; then
@@ -379,6 +387,7 @@ channel 1 database.' 
      --set application.secretChecksum="$APPLICATION_SECRET_CHECKSUM" \

      --set service.url="$CI_ENVIRONMENT_URL" \

      --set service.additionalHosts="$additional_hosts" \

      --set service.gosAdditionalTlsHosts="$gos_additional_tls_hosts" \

      --set replicaCount="$replicas" \

      --set ingress.canary.weight="${percentage}" \

      --set postgresql.managed="$postgres_managed" \
@@ -414,6 +423,7 @@ channel 1 database.' 
    --set application.secretChecksum="$APPLICATION_SECRET_CHECKSUM" \

    --set service.url="$CI_ENVIRONMENT_URL" \

    --set service.additionalHosts="$additional_hosts" \

    --set service.gosAdditionalTlsHosts="$gos_additional_tls_hosts" \

    --set replicaCount="$replicas" \

    --set ingress.canary.weight="${percentage}" \

    --set postgresql.managed="$postgres_managed" \