Commit 0ab5b38e authored by Bryan  BRANCOTTE's avatar Bryan BRANCOTTE

Merge branch 'disposable-resources' into 'master'

Labeling disposable resources

See merge request hub/12765-viralhostrangedb!30
parents dd94fc5f c51d1159
......@@ -64,6 +64,7 @@ deploy_prod:
PUBLIC_URL: "viralhostrangedb.pasteur.cloud"
STORAGE_SUFFIX: "-${CI_COMMIT_REF_SLUG}"
DEBUG: "True"
DISPOSABLE: "Never"
environment:
name: "viralhostrange-prod/$CI_COMMIT_REF_SLUG"
url: "https://viralhostrangedb.pasteur.cloud"
......@@ -97,6 +98,7 @@ deploy_dev:
PUBLIC_URL: "viralhostrangedb-${CI_COMMIT_REF_SLUG}.pasteur.cloud"
STORAGE_SUFFIX: "-${CI_COMMIT_REF_SLUG}"
DEBUG: "True"
DISPOSABLE: "Always"
environment:
name: "viralhostrange-dev/$CI_COMMIT_REF_SLUG"
url: "https://viralhostrangedb-${CI_COMMIT_REF_SLUG}.pasteur.cloud"
......
......@@ -16,6 +16,10 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: ${CI_ENVIRONMENT_SLUG}-postgres
labels:
branch: branch${STORAGE_SUFFIX}
can-be-killed-without-warning: ${DISPOSABLE}
disposable-by-admin: ${DISPOSABLE}
spec:
template:
metadata:
......@@ -23,6 +27,8 @@ spec:
app: postgres-app
role: backend
branch: branch${STORAGE_SUFFIX}
can-be-killed-without-warning: ${DISPOSABLE}
disposable-by-admin: ${DISPOSABLE}
spec:
containers:
- image: "postgres:10.1"
......
......@@ -5,6 +5,8 @@ metadata:
name: ${CI_ENVIRONMENT_SLUG}-webhost-deployment
labels:
branch: branch${STORAGE_SUFFIX}
can-be-killed-without-warning: ${DISPOSABLE}
disposable-by-admin: ${DISPOSABLE}
spec:
replicas: 1
selector:
......@@ -23,6 +25,8 @@ spec:
app: ${CI_ENVIRONMENT_SLUG} #webhost-app
branch: branch${STORAGE_SUFFIX}
role: front
can-be-killed-without-warning: ${DISPOSABLE}
disposable-by-admin: ${DISPOSABLE}
spec:
containers:
- name: webhost-container
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment