Testdays - deploymentconfig -> deployment, mk4
This commit is contained in:
parent
8488c0f808
commit
2c4c789ad6
1 changed files with 7 additions and 31 deletions
|
@ -3,7 +3,7 @@ apiVersion: apps.openshift.io/v1
|
||||||
kind: DeploymentConfig
|
kind: DeploymentConfig
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: testdays
|
app: testdays-old
|
||||||
service: testdays-old
|
service: testdays-old
|
||||||
name: testdays
|
name: testdays
|
||||||
spec:
|
spec:
|
||||||
|
@ -24,14 +24,14 @@ spec:
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: testdays
|
app: testdays-old
|
||||||
deploymentconfig: testdays
|
deploymentconfig: testdays
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: testdays
|
- name: testdays
|
||||||
image: testdays:latest
|
image: testdays:latest
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8081
|
- containerPort: 8080
|
||||||
resources: {}
|
resources: {}
|
||||||
env:
|
env:
|
||||||
- name: POSTGRESQL_USER
|
- name: POSTGRESQL_USER
|
||||||
|
@ -50,18 +50,6 @@ spec:
|
||||||
value: "http://resultsdb.testdays.svc.cluster.local:8081/api/v2.0"
|
value: "http://resultsdb.testdays.svc.cluster.local:8081/api/v2.0"
|
||||||
- name: OPENSHIFT_PROD
|
- name: OPENSHIFT_PROD
|
||||||
value: "1"
|
value: "1"
|
||||||
readinessProbe:
|
|
||||||
timeoutSeconds: 1
|
|
||||||
initialDelaySeconds: 5
|
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: 8081
|
|
||||||
livenessProbe:
|
|
||||||
timeoutSeconds: 1
|
|
||||||
initialDelaySeconds: 30
|
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: 8081
|
|
||||||
|
|
||||||
triggers:
|
triggers:
|
||||||
- type: ConfigChange
|
- type: ConfigChange
|
||||||
|
@ -78,13 +66,13 @@ apiVersion: apps.openshift.io/v1
|
||||||
kind: DeploymentConfig
|
kind: DeploymentConfig
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: resultsdb
|
app: resultsdb-old
|
||||||
service: resultsdb-old
|
service: resultsdb-old
|
||||||
name: resultsdb
|
name: resultsdb
|
||||||
spec:
|
spec:
|
||||||
replicas: 1
|
replicas: 1
|
||||||
selector:
|
selector:
|
||||||
app: resultsdb
|
app: resultsdb-old
|
||||||
deploymentconfig: resultsdb
|
deploymentconfig: resultsdb
|
||||||
strategy:
|
strategy:
|
||||||
type: Recreate
|
type: Recreate
|
||||||
|
@ -99,14 +87,14 @@ spec:
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
app: resultsdb
|
app: resultsdb-old
|
||||||
deploymentconfig: resultsdb
|
deploymentconfig: resultsdb
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: resultsdb
|
- name: resultsdb
|
||||||
image: resultsdb:latest
|
image: resultsdb:latest
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 8081
|
- containerPort: 8080
|
||||||
resources: {}
|
resources: {}
|
||||||
env:
|
env:
|
||||||
- name: POSTGRESQL_USER
|
- name: POSTGRESQL_USER
|
||||||
|
@ -123,18 +111,6 @@ spec:
|
||||||
value: "{{ resultsdb_testdays_secret_key }}"
|
value: "{{ resultsdb_testdays_secret_key }}"
|
||||||
- name: OPENSHIFT_PROD
|
- name: OPENSHIFT_PROD
|
||||||
value: "1"
|
value: "1"
|
||||||
readinessProbe:
|
|
||||||
timeoutSeconds: 1
|
|
||||||
initialDelaySeconds: 5
|
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: 8081
|
|
||||||
livenessProbe:
|
|
||||||
timeoutSeconds: 1
|
|
||||||
initialDelaySeconds: 30
|
|
||||||
httpGet:
|
|
||||||
path: /
|
|
||||||
port: 8081
|
|
||||||
|
|
||||||
triggers:
|
triggers:
|
||||||
- type: ConfigChange
|
- type: ConfigChange
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue