From 06a961e1423472f8d376dff9c5989c2d4793a40c Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Sat, 16 Nov 2019 00:39:03 +0100 Subject: [PATCH] fix pipeline.yaml --- .banzaicloud/pipeline.yaml | 47 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/.banzaicloud/pipeline.yaml b/.banzaicloud/pipeline.yaml index 5e6727dd..e82dbf05 100644 --- a/.banzaicloud/pipeline.yaml +++ b/.banzaicloud/pipeline.yaml @@ -92,31 +92,30 @@ pipeline: timeout: 900 values: nameOverride: '{{ .CICD_REPO_NAME }}' - application: - image: - {{{{- if .pipeline.build_image.enabled }}}} - repository: '{{ .CICD_REPO }}' - tag: '{{ trunc 7 .CICD_COMMIT_SHA }}' - {{{{- end }}}} - pullPolicy: Always - config: - opencensus: - prometheus: - enabled: true - {{{{- if .platform.AutoDNSEnabled }}}} - ingress: - enabled: true - annotations: - kubernetes.io/ingress.class: traefik - traefik.ingress.kubernetes.io/redirect-regex: ^http://(.*) - traefik.ingress.kubernetes.io/redirect-replacement: https://$1 - traefik.ingress.kubernetes.io/redirect-permanent: "true" - hosts: - - 'app-{{ .CICD_REPO_NAME }}.{{ .CLUSTER_NAME }}.{{ .ORG_NAME }}.{{ .DOMAIN_NAME }}' - {{{{ else }}}} - service: - type: LoadBalancer + image: + {{{{- if .pipeline.build_image.enabled }}}} + repository: '{{ .CICD_REPO }}' + tag: '{{ trunc 7 .CICD_COMMIT_SHA }}' {{{{- end }}}} + pullPolicy: Always + config: + opencensus: + prometheus: + enabled: true + {{{{- if .platform.AutoDNSEnabled }}}} + ingress: + enabled: true + annotations: + kubernetes.io/ingress.class: traefik + traefik.ingress.kubernetes.io/redirect-regex: ^http://(.*) + traefik.ingress.kubernetes.io/redirect-replacement: https://$1 + traefik.ingress.kubernetes.io/redirect-permanent: "true" + hosts: + - 'app-{{ .CICD_REPO_NAME }}.{{ .CLUSTER_NAME }}.{{ .ORG_NAME }}.{{ .DOMAIN_NAME }}' + {{{{ else }}}} + service: + type: LoadBalancer + {{{{- end }}}} mysql: existingSecret: '{{ .CICD_REPO_NAME }}-mysql'