From 950dacc8087c522ece9300c04f4c547e50756584 Mon Sep 17 00:00:00 2001
From: Thomas MENARD <thomas.menard@pasteur.fr>
Date: Tue, 4 Jun 2019 19:56:26 +0200
Subject: [PATCH] Update manifest.yaml, job.yaml, .gitlab-ci.yml files
---
.gitlab-ci.yml | 5 +++--
job.yaml | 38 ++++++++++++++++++++++++++++++++++++++
manifest.yaml | 38 --------------------------------------
3 files changed, 41 insertions(+), 40 deletions(-)
create mode 100644 job.yaml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a61ea94..4f73448 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,8 @@ deploy:
- yum install -y gettext
- kubectl delete secret registry-gitlab -n ${NAMESPACE} --ignore-not-found=true
- kubectl create secret docker-registry -n ${NAMESPACE} registry-gitlab --docker-server=registry-gitlab.pasteur.fr --docker-username=${DEPLOY_USER} --docker-password=${DEPLOY_TOKEN} --docker-email=kubernetes@pasteur.fr
- - envsubst < manifest.yaml
- - envsubst < manifest.yaml | kubectl apply -f -
+ - envsubst < manifest.yaml | kubectl apply -n ${NAMESPACE} -f -
+ - kubectl delete job polls-migrations -n ${NAMESPACE} --ignore-not-found=true
+ - envsubst < job.yaml | kubectl apply -n ${NAMESPACE} -f -
- kubectl patch deployment polls -p "{\"spec\":{\"template\":{\"metadata\":{\"labels\":{\"date\":\"`date +'%s'`\"}}}}}"
diff --git a/job.yaml b/job.yaml
new file mode 100644
index 0000000..3cf5c31
--- /dev/null
+++ b/job.yaml
@@ -0,0 +1,38 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+ name: polls-migrations
+spec:
+ template:
+ spec:
+ containers:
+ - name: django
+ image: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}
+ command: ['python', '/app/manage.py', 'migrate']
+ env:
+ - name: DATABASE_HOST
+ value: postgresql
+ - name: DATABASE_NAME
+ valueFrom:
+ secretKeyRef:
+ name: postgresql-credentials
+ key: database
+ - name: DATABASE_USER
+ valueFrom:
+ secretKeyRef:
+ name: postgresql-credentials
+ key: username
+ - name: DATABASE_PASSWORD
+ valueFrom:
+ secretKeyRef:
+ name: postgresql-credentials
+ key: password
+ restartPolicy: Never
+ imagePullSecrets:
+ - name: registry-gitlab
+ volumes:
+ - name: postgresql-credentials
+ secret:
+ secretName: postgresql
+ backoffLimit: 5
diff --git a/manifest.yaml b/manifest.yaml
index 2fb5ff2..702d7f5 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -181,41 +181,3 @@ spec:
serviceName: polls
servicePort: 8080
path: /
----
-apiVersion: batch/v1
-kind: Job
-metadata:
- name: polls-migrations
-spec:
- template:
- spec:
- containers:
- - name: django
- image: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}
- command: ['python', '/app/manage.py', 'migrate']
- env:
- - name: DATABASE_HOST
- value: postgresql
- - name: DATABASE_NAME
- valueFrom:
- secretKeyRef:
- name: postgresql-credentials
- key: database
- - name: DATABASE_USER
- valueFrom:
- secretKeyRef:
- name: postgresql-credentials
- key: username
- - name: DATABASE_PASSWORD
- valueFrom:
- secretKeyRef:
- name: postgresql-credentials
- key: password
- restartPolicy: Never
- imagePullSecrets:
- - name: registry-gitlab
- volumes:
- - name: postgresql-credentials
- secret:
- secretName: postgresql
- backoffLimit: 5
--
GitLab