From 599a83975646d5d4944eed58c23afc5784f10c6d Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Mon, 2 Sep 2019 12:32:52 +0200
Subject: [PATCH] changed redis service hostname
---
.gitlab-ci.yml | 3 ++-
chart/templates/service.yaml | 2 +-
chart/values.yaml | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de832ed..a95cb4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,6 +36,7 @@ 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
artifacts:
paths:
- .env
@@ -84,7 +85,7 @@ review:
services:
- redis:latest
variables:
- HELM_UPGRADE_EXTRA_ARGS: --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 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"
ROLLOUT_RESOURCE_TYPE: deployment
production:
diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml
index c03f069..35d1111 100644
--- a/chart/templates/service.yaml
+++ b/chart/templates/service.yaml
@@ -28,7 +28,7 @@ kind: Service
metadata:
name: {{ template "fullname" . }}-redis
labels:
- app: {{ template "appname" . }}-redis
+ app: {{ .Values.commitSha }}-redis
chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
diff --git a/chart/values.yaml b/chart/values.yaml
index a53604d..0138b99 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -2,6 +2,7 @@
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
replicaCount: 1
+commitSha: 123456
image:
repository: gitlab.example.com/group/project
tag: stable
--
GitLab