Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Metagenomics
metagenedb
Commits
70c740a1
Commit
70c740a1
authored
Aug 06, 2019
by
Kenzo-Hugo Hillion
♻
Browse files
Merge branch 'dev' of gitlab.pasteur.fr:metagenomics/metagenedb into dev
parents
b63f5670
61a1cd77
Pipeline
#13573
passed with stages
in 1 minute and 57 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ci/deploy/deploy.sh
View file @
70c740a1
...
...
@@ -9,6 +9,9 @@ kubectl create secret docker-registry -n ${NAMESPACE} registry-gitlab --docker-s
## SECRET_KEY for Django
kubectl delete secret backend-secret
-n
${
NAMESPACE
}
--ignore-not-found
=
true
kubectl create secret generic backend-secret
-n
${
NAMESPACE
}
--from-literal
=
secret_key
=
${
SECRET_KEY
}
## Credentials for postgres
kubectl delete secret postgresql-credentials
-n
${
NAMESPACE
}
--ignore-not-found
=
true
kubectl create secret generic postgresql-credentials
-n
${
NAMESPACE
}
--from-literal
=
username
=
${
POSTGRES_USER
}
--from-literal
=
password
=
${
POSTGRES_PASSWORD
}
--from-literal
=
database
=
${
POSTGRES_DB
}
# Deployement
## DB
...
...
ci/kubernetes/backend.yaml
View file @
70c740a1
...
...
@@ -33,11 +33,11 @@ spec:
secretKeyRef
:
name
:
postgresql-credentials
key
:
username
#
- name: DATABASE_PASSWORD
#
valueFrom:
#
secretKeyRef:
#
name: postgresql-credentials
#
key: password
-
name
:
DATABASE_PASSWORD
valueFrom
:
secretKeyRef
:
name
:
postgresql-credentials
key
:
password
-
name
:
SECRET_KEY
valueFrom
:
secretKeyRef
:
...
...
ci/kubernetes/ingress.yaml
View file @
70c740a1
...
...
@@ -23,7 +23,7 @@ spec:
backend
:
serviceName
:
backend
servicePort
:
8000
-
path
:
/
catalog
-
path
:
/
api
backend
:
serviceName
:
backend
servicePort
:
8000
\ No newline at end of file
ci/kubernetes/postgresql.yaml
View file @
70c740a1
...
...
@@ -11,16 +11,6 @@ spec:
requests
:
storage
:
8Gi
---
apiVersion
:
v1
kind
:
Secret
metadata
:
name
:
postgresql-credentials
type
:
Opaque
data
:
username
:
bWV0YWdlbmVkYl91c2VyCg==
password
:
bWV0YWdlbmVkYl9kZXYK
database
:
bWV0YWdlbmVkYl9kZXYK
---
apiVersion
:
apps/v1
kind
:
Deployment
metadata
:
...
...
@@ -54,11 +44,11 @@ spec:
secretKeyRef
:
name
:
postgresql-credentials
key
:
database
#
- name: POSTGRES_PASSWORD
#
valueFrom:
#
secretKeyRef:
#
name: postgresql-credentials
#
key: password
-
name
:
POSTGRES_PASSWORD
valueFrom
:
secretKeyRef
:
name
:
postgresql-credentials
key
:
password
ports
:
-
containerPort
:
5432
name
:
postgresql
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment