testdays: more indentation fixes

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
This commit is contained in:
Pierre-Yves Chibon 2020-11-02 15:17:18 +01:00
parent 8bd054f708
commit 7b089785b2
2 changed files with 86 additions and 87 deletions

View file

@ -14,18 +14,18 @@ spec:
app: testdays
deploymentconfig: testdays
---
apiVersion: v1
kind: Service
metadata:
labels:
app: resultsdb
name: resultsdb
spec:
ports:
- name: 8080-tcp
port: 8080
protocol: TCP
targetPort: 8080
selector:
app: resultsdb
deploymentconfig: resultsdb
apiVersion: v1
kind: Service
metadata:
labels:
app: resultsdb
name: resultsdb
spec:
ports:
- name: 8080-tcp
port: 8080
protocol: TCP
targetPort: 8080
selector:
app: resultsdb
deploymentconfig: resultsdb

View file

@ -74,76 +74,75 @@ spec:
kind: ImageStreamTag
name: testdays:latest
---
---
apiVersion: v1
kind: DeploymentConfig
metadata:
labels:
app: resultsdb
service: resultsdb
name: resultsdb
spec:
replicas: 1
selector:
app: resultsdb
deploymentconfig: resultsdb
strategy:
type: Recreate
recreateParams:
mid:
failurePolicy: Abort
execNewPod:
containerName: resultsdb
# We only need to init the database the first time, after we just need to check
# for DB upgrades
command: ["python", "/opt/app-root/src/resultsdb/cli.py", "init_db"]
template:
metadata:
labels:
app: resultsdb
deploymentconfig: resultsdb
spec:
containers:
- name: resultsdb
image: resultsdb:latest
ports:
- containerPort: 8080
resources: {}
env:
- name: POSTGRESQL_USER
value: "{{ resultsdb_testdays_db_user }}"
- name: POSTGRESQL_PASSWORD
value: "{{ resultsdb_testdays_db_pass }}"
- name: POSTGRESQL_DATABASE
value: "{{ resultsdb_testdays_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
- name: SECRET_KEY
value: "{{ resultsdb_testdays_secret_key }}"
- name: OPENSHIFT_PROD
value: "1"
readinessProbe:
timeoutSeconds: 1
initialDelaySeconds: 5
httpGet:
path: /
port: 8080
livenessProbe:
timeoutSeconds: 1
initialDelaySeconds: 30
httpGet:
path: /
port: 8080
apiVersion: v1
kind: DeploymentConfig
metadata:
labels:
app: resultsdb
service: resultsdb
name: resultsdb
spec:
replicas: 1
selector:
app: resultsdb
deploymentconfig: resultsdb
strategy:
type: Recreate
recreateParams:
mid:
failurePolicy: Abort
execNewPod:
containerName: resultsdb
# We only need to init the database the first time, after we just need to check
# for DB upgrades
command: ["python", "/opt/app-root/src/resultsdb/cli.py", "init_db"]
template:
metadata:
labels:
app: resultsdb
deploymentconfig: resultsdb
spec:
containers:
- name: resultsdb
image: resultsdb:latest
ports:
- containerPort: 8080
resources: {}
env:
- name: POSTGRESQL_USER
value: "{{ resultsdb_testdays_db_user }}"
- name: POSTGRESQL_PASSWORD
value: "{{ resultsdb_testdays_db_pass }}"
- name: POSTGRESQL_DATABASE
value: "{{ resultsdb_testdays_db_name }}"
- name: POSTGRESQL_SERVICE_HOST
value: "db01{{ env_suffix }}.iad2.fedoraproject.org"
- name: POSTGRESQL_SERVICE_PORT
value: "5432"
- name: SECRET_KEY
value: "{{ resultsdb_testdays_secret_key }}"
- name: OPENSHIFT_PROD
value: "1"
readinessProbe:
timeoutSeconds: 1
initialDelaySeconds: 5
httpGet:
path: /
port: 8080
livenessProbe:
timeoutSeconds: 1
initialDelaySeconds: 30
httpGet:
path: /
port: 8080
triggers:
- type: ConfigChange
- type: ImageChange
imageChangeParams:
automatic: true
containerNames:
- resultsdb
from:
kind: ImageStreamTag
name: resultsdb:latest
triggers:
- type: ConfigChange
- type: ImageChange
imageChangeParams:
automatic: true
containerNames:
- resultsdb
from:
kind: ImageStreamTag
name: resultsdb:latest