From 922f9dce582ef938a1be3a2d0ad859f04f337e59 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Tue, 29 Jan 2019 11:40:35 +0100
Subject: [PATCH] Removed not working date labels and use --recreate-pods
instead to force use of new images.
---
.gitlab-ci.yml | 2 +-
ops/helm/nomad/templates/api-deployment.yaml | 1 -
ops/helm/nomad/templates/gui-deployment.yml | 1 -
ops/helm/nomad/templates/worker-deployment.yaml | 1 -
4 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d2270e5755..690e24989a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,7 +209,7 @@ deploy:
--set dbname=${DBNAME}
--set volumes.files=${FILES_PATH};
else
- helm upgrade ${RELEASE_NAME} . --namespace=${STAGING_NAMESPACE};
+ helm upgrade ${RELEASE_NAME} . --namespace=${STAGING_NAMESPACE} --recreate-pods;
fi
except:
- /^dev-.*$/
diff --git a/ops/helm/nomad/templates/api-deployment.yaml b/ops/helm/nomad/templates/api-deployment.yaml
index adf19fe891..ad7c74d056 100644
--- a/ops/helm/nomad/templates/api-deployment.yaml
+++ b/ops/helm/nomad/templates/api-deployment.yaml
@@ -7,7 +7,6 @@ metadata:
helm.sh/chart: {{ include "nomad.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
- date: "{{ .Release.Time.Seconds }}"
spec:
replicas: {{ .Values.api.replicas }}
selector:
diff --git a/ops/helm/nomad/templates/gui-deployment.yml b/ops/helm/nomad/templates/gui-deployment.yml
index b50d7adadb..6aba8995e6 100644
--- a/ops/helm/nomad/templates/gui-deployment.yml
+++ b/ops/helm/nomad/templates/gui-deployment.yml
@@ -7,7 +7,6 @@ metadata:
helm.sh/chart: {{ include "nomad.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
- date: "{{ .Release.Time.Seconds }}"
data:
nginx.conf: |
server {
diff --git a/ops/helm/nomad/templates/worker-deployment.yaml b/ops/helm/nomad/templates/worker-deployment.yaml
index b20cf94a6d..92dd0546ba 100644
--- a/ops/helm/nomad/templates/worker-deployment.yaml
+++ b/ops/helm/nomad/templates/worker-deployment.yaml
@@ -7,7 +7,6 @@ metadata:
helm.sh/chart: {{ include "nomad.chart" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
- date: "{{ .Release.Time.Seconds }}"
spec:
replicas: {{ .Values.worker.replicas }}
selector:
--
GitLab