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

Merge pull request #11 from rhcarvalho/api-v1

Browse source 
Update templates to API v1
This commit is contained in:
Ben Parees 2015-06-11 11:35:33 -04:00
commit 505ff52a05
2 changed files with 24 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ {
"kind": "Template", "kind": "Template",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-quickstart-source-postgresql", "name": "django-quickstart-source-postgresql",
"annotations": { "annotations": {
@ -15,7 +15,7 @@
"objects": [ "objects": [
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "${FRONTEND_SERVICE_NAME}", "name": "${FRONTEND_SERVICE_NAME}",
"annotations": { "annotations": {
@ -37,7 +37,7 @@
}, },
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "${DATABASE_SERVICE_NAME}", "name": "${DATABASE_SERVICE_NAME}",
"annotations": { "annotations": {
@ -59,10 +59,9 @@
}, },
{ {
"kind": "Route", "kind": "Route",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "${FRONTEND_SERVICE_NAME}-route", "name": "${FRONTEND_SERVICE_NAME}-route"
"creationTimestamp": null
}, },
"spec": { "spec": {
"host" : "${FRONTEND_ROUTE}", "host" : "${FRONTEND_ROUTE}",
@ -74,7 +73,7 @@
}, },
{ {
"kind": "BuildConfig", "kind": "BuildConfig",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-quickstart-source", "name": "django-quickstart-source",
"annotations": { "annotations": {
@ -106,17 +105,16 @@
}, },
"triggers": [ "triggers": [
{ {
"type": "imageChange", "type": "ImageChange"
"imageChange": {}
}, },
{ {
"type": "github", "type": "GitHub",
"github": { "github": {
"secret": "secret123" "secret": "secret123"
} }
}, },
{ {
"type": "generic", "type": "Generic",
"generic": { "generic": {
"secret": "secret123" "secret": "secret123"
} }
@ -126,7 +124,7 @@
}, },
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "${FRONTEND_SERVICE_NAME}", "name": "${FRONTEND_SERVICE_NAME}",
"annotations": { "annotations": {
@ -213,7 +211,7 @@
}, },
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "${DATABASE_SERVICE_NAME}", "name": "${DATABASE_SERVICE_NAME}",
"labels": { "labels": {
@ -275,7 +273,7 @@
}, },
{ {
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-quickstart-source", "name": "django-quickstart-source",
"annotations": { "annotations": {
@ -285,7 +283,7 @@
}, },
{ {
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "python-33-centos7", "name": "python-33-centos7",
"annotations": { "annotations": {

24
openshift/templates/django.json
View file

@ -1,6 +1,6 @@
{ {
"kind": "Template", "kind": "Template",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-quickstart-source", "name": "django-quickstart-source",
"annotations": { "annotations": {
@ -15,7 +15,7 @@
"objects": [ "objects": [
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "${FRONTEND_SERVICE_NAME}", "name": "${FRONTEND_SERVICE_NAME}",
"annotations": { "annotations": {
@ -37,10 +37,9 @@
}, },
{ {
"kind": "Route", "kind": "Route",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "${FRONTEND_SERVICE_NAME}-route", "name": "${FRONTEND_SERVICE_NAME}-route"
"creationTimestamp": null
}, },
"spec": { "spec": {
"host" : "${FRONTEND_ROUTE}", "host" : "${FRONTEND_ROUTE}",
@ -49,10 +48,10 @@
"name" : "${FRONTEND_SERVICE_NAME}" "name" : "${FRONTEND_SERVICE_NAME}"
} }
} }
}, },
{ {
"kind": "BuildConfig", "kind": "BuildConfig",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-quickstart-source", "name": "django-quickstart-source",
"annotations": { "annotations": {
@ -84,17 +83,16 @@
}, },
"triggers": [ "triggers": [
{ {
"type": "imageChange", "type": "ImageChange"
"imageChange": {}
}, },
{ {
"type": "github", "type": "GitHub",
"github": { "github": {
"secret": "secret123" "secret": "secret123"
} }
}, },
{ {
"type": "generic", "type": "Generic",
"generic": { "generic": {
"secret": "secret123" "secret": "secret123"
} }
@ -104,7 +102,7 @@
}, },
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "${FRONTEND_SERVICE_NAME}", "name": "${FRONTEND_SERVICE_NAME}",
"annotations": { "annotations": {
@ -191,7 +189,7 @@
}, },
{ {
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "django-quickstart-source", "name": "django-quickstart-source",
"annotations": { "annotations": {