testing variable

.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:

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 }}"