Skip to content
Snippets Groups Projects
Commit 08befdac authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Next try to use correct hostname for redis

parent 64d5fe47
No related branches found
No related tags found
1 merge request!12Resolve "Include Redis into deployment"
......@@ -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:
......
......@@ -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 }}
......
......@@ -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
......
#!/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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment