vbatts/nodejs-ex
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Moving credentials into secrets

Browse source
This commit is contained in:
jupierce 2016-11-29 11:18:16 -05:00
parent fb4415ce65
commit 7d73fbd2a8
3 changed files with 123 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

61
openshift/templates/nodejs-mongodb-persistent.json
View file

@ -15,6 +15,18 @@
"template": "nodejs-mongo-persistent"
},
"objects": [
{
"kind": "Secret",
"apiVersion": "v1",
"metadata": {
"name": "${NAME}"
},
"stringData": {
"databaseUser": "${DATABASE_USER}",
"databasePassword": "${DATABASE_PASSWORD}",
"databaseAdminPassword" : "${DATABASE_ADMIN_PASSWORD}"
}
},
{
"kind": "Service",
"apiVersion": "v1",
@ -186,11 +198,21 @@
},
{
"name": "MONGODB_USER",
"value": "${DATABASE_USER}"
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "databaseUser"
}
}
},
{
"name": "MONGODB_PASSWORD",
"value": "${DATABASE_PASSWORD}"
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "databasePassword"
}
}
},
{
"name": "MONGODB_DATABASE",
@ -198,7 +220,12 @@
},
{
"name": "MONGODB_ADMIN_PASSWORD",
"value": "${DATABASE_ADMIN_PASSWORD}"
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "databaseAdminPassword"
}
}
}
],
"readinessProbe": {
@ -323,11 +350,21 @@
"env": [
{
"name": "MONGODB_USER",
"value": "${DATABASE_USER}"
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "databaseUser"
}
}
},
{
"name": "MONGODB_PASSWORD",
"value": "${DATABASE_PASSWORD}"
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "databasePassword"
}
}
},
{
"name": "MONGODB_DATABASE",
@ -335,14 +372,24 @@
},
{
"name": "MONGODB_ADMIN_PASSWORD",
"value": "${DATABASE_ADMIN_PASSWORD}"
"valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "databaseAdminPassword"
}
}
}
],
"readinessProbe": {
"timeoutSeconds": 1,
"initialDelaySeconds": 3,
"exec": {
"command": [ "/bin/sh", "-i", "-c", "mongo 127.0.0.1:27017/$MONGODB_DATABASE -u $MONGODB_USER -p $MONGODB_PASSWORD --eval=\"quit()\""]
"command": [
"/bin/sh",
"-i",
"-c",
"mongo 127.0.0.1:27017/$MONGODB_DATABASE -u $MONGODB_USER -p $MONGODB_PASSWORD --eval=\"quit()\""
]
}
},
"livenessProbe": {