From 64d5fe47a397b993ad5581a45a9346134bd3f566 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Mon, 2 Sep 2019 13:06:26 +0200
Subject: [PATCH] testing variable
---
.gitlab-ci.yml | 5 +++--
chart/templates/service.yaml | 3 +--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a95cb4c..ef20c65 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,8 @@ prepare_secrets:
image: alpine:latest
script:
- cp $ENV_FILE .env # Also provide env file
- - sed -i 's/REDIS_HOST=/REDIS_HOST=$CI_COMMIT_SHA/g' .env
+ - export RHOST=$CI_JOB_STAGE-$CI_ENVIRONMENT_NAME-$CI_COMMIT_SHA
+ - sed -i "s/REDIS_HOST=/REDIS_HOST=$HELM_RELEASE_NAME/g" .env
artifacts:
paths:
- .env
@@ -85,7 +86,7 @@ review:
services:
- redis:latest
variables:
- HELM_UPGRADE_EXTRA_ARGS: --set commitSha=$CI_COMMIT_SHA --set service.externalPort=80 --set service.internalPort=80 --set service.commonName= --set ingress.tls.enabled=false --set ingress.annotations.kubernetes\.io/tls-acme="false" --set ingress.annotations.nginx\.ingress\.kubernetes\.io/ssl-redirect="false"
+ HELM_UPGRADE_EXTRA_ARGS: --set redisHost="$CI_JOB_STAGE-$CI_ENVIRONMENT_NAME-$CI_COMMIT_SHA" --set service.externalPort=80 --set service.internalPort=80 --set service.commonName= --set ingress.tls.enabled=false --set ingress.annotations.kubernetes\.io/tls-acme="false" --set ingress.annotations.nginx\.ingress\.kubernetes\.io/ssl-redirect="false"
ROLLOUT_RESOURCE_TYPE: deployment
production:
diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml
index 35d1111..3013a2e 100644
--- a/chart/templates/service.yaml
+++ b/chart/templates/service.yaml
@@ -28,7 +28,7 @@ kind: Service
metadata:
name: {{ template "fullname" . }}-redis
labels:
- app: {{ .Values.commitSha }}-redis
+ app: {{ template "appname" . }}-redis
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
@@ -37,7 +37,6 @@ spec:
- port: 6379
targetPort: 6379
protocol: TCP
- name: {{ .Values.service.name }}
selector:
app: {{ template "appname" . }}-redis
tier: "{{ .Values.application.tier }}"
--
GitLab