|
|
|
@ -141,40 +141,25 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
"kind": "DeploymentConfig", |
|
|
|
"apiVersion": "apps.openshift.io/v1", |
|
|
|
"kind": "Deployment", |
|
|
|
"apiVersion": "apps/v1", |
|
|
|
"metadata": { |
|
|
|
"name": "${NAME}", |
|
|
|
"annotations": { |
|
|
|
"description": "Defines how to deploy the application server", |
|
|
|
"template.alpha.openshift.io/wait-for-ready": "true" |
|
|
|
"template.alpha.openshift.io/wait-for-ready": "true", |
|
|
|
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"${NAME}:latest\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]" |
|
|
|
} |
|
|
|
}, |
|
|
|
"spec": { |
|
|
|
"strategy": { |
|
|
|
"type": "Recreate" |
|
|
|
}, |
|
|
|
"triggers": [ |
|
|
|
{ |
|
|
|
"type": "ImageChange", |
|
|
|
"imageChangeParams": { |
|
|
|
"automatic": true, |
|
|
|
"containerNames": [ |
|
|
|
"django-psql-persistent" |
|
|
|
], |
|
|
|
"from": { |
|
|
|
"kind": "ImageStreamTag", |
|
|
|
"name": "${NAME}:latest" |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
"type": "ConfigChange" |
|
|
|
} |
|
|
|
], |
|
|
|
"replicas": 1, |
|
|
|
"selector": { |
|
|
|
"name": "${NAME}" |
|
|
|
"matchLabels":{ |
|
|
|
"name": "${NAME}" |
|
|
|
} |
|
|
|
}, |
|
|
|
"template": { |
|
|
|
"metadata": { |
|
|
|
@ -305,41 +290,25 @@ |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
"kind": "DeploymentConfig", |
|
|
|
"apiVersion": "apps.openshift.io/v1", |
|
|
|
"kind": "Deployment", |
|
|
|
"apiVersion": "apps/v1", |
|
|
|
"metadata": { |
|
|
|
"name": "${DATABASE_SERVICE_NAME}", |
|
|
|
"annotations": { |
|
|
|
"description": "Defines how to deploy the database", |
|
|
|
"template.alpha.openshift.io/wait-for-ready": "true" |
|
|
|
"template.alpha.openshift.io/wait-for-ready": "true", |
|
|
|
"image.openshift.io/triggers": "[{\"from\":{\"kind\":\"ImageStreamTag\",\"name\":\"postgresql:${POSTGRESQL_VERSION}\"},\"fieldPath\": \"spec.template.spec.containers[0].image\"}]" |
|
|
|
} |
|
|
|
}, |
|
|
|
"spec": { |
|
|
|
"strategy": { |
|
|
|
"type": "Recreate" |
|
|
|
}, |
|
|
|
"triggers": [ |
|
|
|
{ |
|
|
|
"type": "ImageChange", |
|
|
|
"imageChangeParams": { |
|
|
|
"automatic": true, |
|
|
|
"containerNames": [ |
|
|
|
"postgresql" |
|
|
|
], |
|
|
|
"from": { |
|
|
|
"kind": "ImageStreamTag", |
|
|
|
"namespace": "${NAMESPACE}", |
|
|
|
"name": "postgresql:${POSTGRESQL_VERSION}" |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
"type": "ConfigChange" |
|
|
|
} |
|
|
|
], |
|
|
|
"replicas": 1, |
|
|
|
"selector": { |
|
|
|
"name": "${DATABASE_SERVICE_NAME}" |
|
|
|
"matchLabels":{ |
|
|
|
"name": "${DATABASE_SERVICE_NAME}" |
|
|
|
} |
|
|
|
}, |
|
|
|
"template": { |
|
|
|
"metadata": { |
|
|
|
|