From 08befdacad9003805ef643c57d0c7d84e3dab16b Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Mon, 2 Sep 2019 13:25:22 +0200
Subject: [PATCH] Next try to use correct hostname for redis
---
.gitlab-ci.yml | 4 +---
chart/templates/deployment.yaml | 6 ++++++
chart/values.yaml | 1 -
service-configs/start.sh | 3 +++
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef20c65..de832ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,6 @@ prepare_secrets:
image: alpine:latest
script:
- cp $ENV_FILE .env # Also provide env file
- - 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
@@ -86,7 +84,7 @@ review:
services:
- redis:latest
variables:
- 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"
+ 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"
ROLLOUT_RESOURCE_TYPE: deployment
production:
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 31f503e..0e94744 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -48,6 +48,12 @@ spec:
value: {{ .Values.gitlab.envName }}
- name: GITLAB_ENVIRONMENT_URL
value: {{ .Values.gitlab.envURL }}
+ - name: POD_NAMESPACE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
+ - name: REDIS_SERVICE_NAME
+ value: {{ template "fullname" . }}-redis
ports:
- name: "{{ .Values.service.name }}"
containerPort: {{ .Values.service.internalPort }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 0138b99..a53604d 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -2,7 +2,6 @@
# 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
diff --git a/service-configs/start.sh b/service-configs/start.sh
index 1c98575..7e57f29 100755
--- a/service-configs/start.sh
+++ b/service-configs/start.sh
@@ -1,5 +1,8 @@
#!/bin/bash
+# Set the redis hostname
+sed -i "s/REDIS_HOST=/REDIS_HOST=${REDIS_SERVICE_NAME}.${POD_NAMESPACE}/g" .env
+
/etc/init.d/php7.3-fpm start
/etc/init.d/nginx start
--
GitLab