diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de832edcd5b576aeaabd8f13451ef5d71e524aab..a95cb4c0de471cec37a1b9f58bf69ecd36dbbf09 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 c03f069ddf86cd7c891fa9469bd3c55ebde91226..35d11111f6cab15fd3e9533fab0e84a407f1e9bb 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 a53604d4c971be8f529cc2737c4883113be16ec8..0138b9949f84b8f4eb157f096d52fc4253781054 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