From 74f748aba1a75a7822f8b81509dd6d85e8b6ec9b Mon Sep 17 00:00:00 2001
From: Thomas MENARD <thomas.menard@pasteur.fr>
Date: Tue, 4 Jun 2019 19:43:36 +0200
Subject: [PATCH] Update mysite/settings.py, manifest.yaml files
---
manifest.yaml | 74 +++++++++++++++++++++++-----------------------
mysite/settings.py | 2 +-
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/manifest.yaml b/manifest.yaml
index f021cfa..f660868 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -151,53 +151,53 @@ spec:
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
-annotations:
+ annotations:
kubernetes.io/ingress.class: traefik
-labels:
+ labels:
app: polls
-name: polls
+ name: polls
spec:
-rules:
-- host: ${CI_PROJECT_NAME}.k8s-dev.pasteur.fr
+ rules:
+ - host: ${CI_PROJECT_NAME}.k8s-dev.pasteur.fr
http:
paths:
- backend:
serviceName: polls
servicePort: 8080
- path: /
+ path: /
---
apiVersion: batch/v1
kind: Job
metadata:
-name: polls-migrations
+ name: polls-migrations
spec:
-template:
- spec:
- containers:
- - name: django
- image: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}
- command: ['python', 'manage.py', 'migrate']
- env:
- - 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
+ 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_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/mysite/settings.py b/mysite/settings.py
index cba76a7..4baea88 100755
--- a/mysite/settings.py
+++ b/mysite/settings.py
@@ -85,7 +85,7 @@ DATABASES = {
'NAME': 'polls',
'USER': os.getenv('DATABASE_USER'),
'PASSWORD': os.getenv('DATABASE_PASSWORD'),
- 'HOST': os.getenv('DATABASE_NAME'),
+ 'HOST': os.getenv('DATABASE_HOST'),
'PORT': '5432',
}
}
--
GitLab