X-dark/django-ex
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #75 from coreydaley/update_templates_to_use_secrets

Browse source 
updating to use secrets
This commit is contained in:
Ben Parees 2017-01-18 12:40:16 -05:00 committed by GitHub
commit 5f5f5135e5
3 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
openshift/templates/django-postgresql-persistent.json
View file

@ -22,8 +22,9 @@
"name": "${NAME}" "name": "${NAME}"
}, },
"stringData" : { "stringData" : {
"databaseUser" : "${DATABASE_USER}", "database-user" : "${DATABASE_USER}",
"databasePassword" : "${DATABASE_PASSWORD}" "database-password" : "${DATABASE_PASSWORD}",
"django-secret-key" : "${DJANGO_SECRET_KEY}"
} }
}, },
{ {
@ -218,7 +219,7 @@
"valueFrom": { "valueFrom": {
"secretKeyRef" : { "secretKeyRef" : {
"name" : "${NAME}", "name" : "${NAME}",
"key" : "databaseUser" "key" : "database-user"
} }
} }
}, },
@ -227,7 +228,7 @@
"valueFrom": { "valueFrom": {
"secretKeyRef" : { "secretKeyRef" : {
"name" : "${NAME}", "name" : "${NAME}",
"key" : "databasePassword" "key" : "database-password"
} }
} }
}, },
@ -237,7 +238,12 @@
}, },
{ {
"name": "DJANGO_SECRET_KEY", "name": "DJANGO_SECRET_KEY",
"value": "${DJANGO_SECRET_KEY}" "valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "django-secret-key"
}
}
} }
], ],
"resources": { "resources": {

10
openshift/templates/django-postgresql.json
View file

@ -23,7 +23,8 @@
}, },
"stringData" : { "stringData" : {
"database-user" : "${DATABASE_USER}", "database-user" : "${DATABASE_USER}",
"database-password" : "${DATABASE_PASSWORD}" "database-password" : "${DATABASE_PASSWORD}",
"django-secret-key" : "${DJANGO_SECRET_KEY}"
} }
}, },
{ {
@ -237,7 +238,12 @@
}, },
{ {
"name": "DJANGO_SECRET_KEY", "name": "DJANGO_SECRET_KEY",
"value": "${DJANGO_SECRET_KEY}" "valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "django-secret-key"
}
}
} }
], ],
"resources": { "resources": {

17
openshift/templates/django.json
View file

@ -15,6 +15,16 @@
}, },
"message": "The following service(s) have been created in your project: ${NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.", "message": "The following service(s) have been created in your project: ${NAME}.\n\nFor more information about using this template, including OpenShift considerations, see https://github.com/openshift/django-ex/blob/master/README.md.",
"objects": [ "objects": [
{
"kind": "Secret",
"apiVersion": "v1",
"metadata": {
"name": "${NAME}"
},
"stringData" : {
"django-secret-key" : "${DJANGO_SECRET_KEY}"
}
},
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
@ -195,7 +205,12 @@
}, },
{ {
"name": "DJANGO_SECRET_KEY", "name": "DJANGO_SECRET_KEY",
"value": "${DJANGO_SECRET_KEY}" "valueFrom": {
"secretKeyRef" : {
"name" : "${NAME}",
"key" : "django-secret-key"
}
}
} }
], ],
"resources": { "resources": {