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

Merge pull request #22 from bparees/length

Browse source 
shorten service name to less than 24 chars
This commit is contained in:
Ben Parees 2015-07-31 09:41:40 -04:00
commit a51feaedf6
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
"kind": "Template", "kind": "Template",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-postgresql-example", "name": "django-psql-example",
"annotations": { "annotations": {
"description": "An example Django application with a PostgreSQL database", "description": "An example Django application with a PostgreSQL database",
"tags": "instant-app,python,django,postgresql", "tags": "instant-app,python,django,postgresql",
@ -10,14 +10,14 @@
} }
}, },
"labels": { "labels": {
"template": "django-postgresql-example" "template": "django-psql-example"
}, },
"objects": [ "objects": [
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-postgresql-example", "name": "django-psql-example",
"annotations": { "annotations": {
"description": "Exposes and load balances the application pods" "description": "Exposes and load balances the application pods"
} }
@ -31,7 +31,7 @@
} }
], ],
"selector": { "selector": {
"name": "django-postgresql-example" "name": "django-psql-example"
} }
} }
}, },
@ -39,13 +39,13 @@
"kind": "Route", "kind": "Route",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-postgresql-example" "name": "django-psql-example"
}, },
"spec": { "spec": {
"host": "${APPLICATION_DOMAIN}", "host": "${APPLICATION_DOMAIN}",
"to": { "to": {
"kind": "Service", "kind": "Service",
"name": "django-postgresql-example" "name": "django-psql-example"
} }
} }
}, },
@ -53,7 +53,7 @@
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-postgresql-example", "name": "django-psql-example",
"annotations": { "annotations": {
"description": "Keeps track of changes in the application image" "description": "Keeps track of changes in the application image"
} }
@ -63,7 +63,7 @@
"kind": "BuildConfig", "kind": "BuildConfig",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-postgresql-example", "name": "django-psql-example",
"annotations": { "annotations": {
"description": "Defines how to build the application" "description": "Defines how to build the application"
} }
@ -90,7 +90,7 @@
"output": { "output": {
"to": { "to": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"name": "django-postgresql-example:latest" "name": "django-psql-example:latest"
} }
}, },
"triggers": [ "triggers": [
@ -110,7 +110,7 @@
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-postgresql-example", "name": "django-psql-example",
"annotations": { "annotations": {
"description": "Defines how to deploy the application server" "description": "Defines how to deploy the application server"
} }
@ -125,11 +125,11 @@
"imageChangeParams": { "imageChangeParams": {
"automatic": true, "automatic": true,
"containerNames": [ "containerNames": [
"django-postgresql-example" "django-psql-example"
], ],
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"name": "django-postgresql-example:latest" "name": "django-psql-example:latest"
} }
} }
}, },
@ -139,20 +139,20 @@
], ],
"replicas": 1, "replicas": 1,
"selector": { "selector": {
"name": "django-postgresql-example" "name": "django-psql-example"
}, },
"template": { "template": {
"metadata": { "metadata": {
"name": "django-postgresql-example", "name": "django-psql-example",
"labels": { "labels": {
"name": "django-postgresql-example" "name": "django-psql-example"
} }
}, },
"spec": { "spec": {
"containers": [ "containers": [
{ {
"name": "django-postgresql-example", "name": "django-psql-example",
"image": "django-postgresql-example", "image": "django-psql-example",
"ports": [ "ports": [
{ {
"containerPort": 8080 "containerPort": 8080
@ -293,7 +293,7 @@
{ {
"name": "APPLICATION_DOMAIN", "name": "APPLICATION_DOMAIN",
"description": "The exposed hostname that will route to the Django service", "description": "The exposed hostname that will route to the Django service",
"value": "django-postgresql-example.openshiftapps.com" "value": "django-psql-example.openshiftapps.com"
}, },
{ {
"name": "GITHUB_WEBHOOK_SECRET", "name": "GITHUB_WEBHOOK_SECRET",