Update manifest.yaml, job.yaml, .gitlab-ci.yml files

.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'`\"}}}}}"
 

job.yaml

+---
+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

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