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

Merge pull request #6 from rhcarvalho/api-v1

Browse source 
Update template to API v1
This commit is contained in:
Ben Parees 2015-06-11 12:44:19 -04:00
commit 0324c24534
1 changed files with 25 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

93
openshift/templates/nodejs.json
View file

@ -1,9 +1,8 @@
{ {
"kind": "Template", "kind": "Template",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "nodejs-example", "name": "nodejs-example",
"creationTimestamp": null,
"annotations": { "annotations": {
"description": "A simple Node.js application that responds with information about the server.", "description": "A simple Node.js application that responds with information about the server.",
"iconClass": "icon-nodejs", "iconClass": "icon-nodejs",
@ -13,38 +12,28 @@
"objects": [ "objects": [
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "nodejs-frontend", "name": "nodejs-frontend"
"creationTimestamp": null
}, },
"spec": { "spec": {
"ports": [ "ports": [
{ {
"name": "web", "name": "web",
"protocol": "TCP",
"port": 8080, "port": 8080,
"targetPort": 8080, "targetPort": 8080
"nodePort": 0
} }
], ],
"selector": { "selector": {
"name": "nodejs-frontend" "name": "nodejs-frontend"
}, }
"portalIP": "",
"type": "ClusterIP",
"sessionAffinity": "None"
},
"status": {
"loadBalancer": {}
} }
}, },
{ {
"kind": "Route", "kind": "Route",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "frontend-route", "name": "frontend-route"
"creationTimestamp": null
}, },
"spec": { "spec": {
"host" : "${FRONTEND_ROUTE}", "host" : "${FRONTEND_ROUTE}",
@ -56,36 +45,26 @@
}, },
{ {
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "nodejs-example", "name": "nodejs-example"
"creationTimestamp": null
},
"spec": {},
"status": {
"dockerImageRepository": ""
} }
}, },
{ {
"kind": "ImageStream", "kind": "ImageStream",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "nodejs-010-centos7", "name": "nodejs-010-centos7"
"creationTimestamp": null
}, },
"spec": { "spec": {
"dockerImageRepository": "openshift/nodejs-010-centos7" "dockerImageRepository": "openshift/nodejs-010-centos7"
},
"status": {
"dockerImageRepository": ""
} }
}, },
{ {
"kind": "BuildConfig", "kind": "BuildConfig",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "nodejs-example", "name": "nodejs-example",
"creationTimestamp": null,
"labels": { "labels": {
"name": "nodejs-example" "name": "nodejs-example"
} }
@ -93,26 +72,25 @@
"spec": { "spec": {
"triggers": [ "triggers": [
{ {
"type": "github", "type": "GitHub",
"github": { "github": {
"secret": "secret101" "secret": "secret101"
} }
}, },
{ {
"type": "generic", "type": "Generic",
"generic": { "generic": {
"secret": "secret101" "secret": "secret101"
} }
}, },
{ {
"type": "imageChange", "type": "ImageChange"
"imageChange": {}
} }
], ],
"source": { "source": {
"type": "Git", "type": "Git",
"git": { "git": {
"uri": "${GITHUB_URL}" "uri": "${SOURCE_REPOSITORY_URL}"
} }
}, },
"strategy": { "strategy": {
@ -130,19 +108,14 @@
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"name": "nodejs-example:latest" "name": "nodejs-example:latest"
} }
}, }
"resources": {}
},
"status": {
"lastVersion": 0
} }
}, },
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1beta3", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "nodejs-frontend", "name": "nodejs-frontend"
"creationTimestamp": null
}, },
"spec": { "spec": {
"strategy": { "strategy": {
@ -151,8 +124,7 @@
"updatePeriodSeconds": 1, "updatePeriodSeconds": 1,
"intervalSeconds": 1, "intervalSeconds": 1,
"timeoutSeconds": 120 "timeoutSeconds": 120
}, }
"resources": {}
}, },
"triggers": [ "triggers": [
{ {
@ -165,8 +137,7 @@
"from": { "from": {
"kind": "ImageStreamTag", "kind": "ImageStreamTag",
"name": "nodejs-example:latest" "name": "nodejs-example:latest"
}, }
"lastTriggeredImage": ""
} }
} }
], ],
@ -176,7 +147,6 @@
}, },
"template": { "template": {
"metadata": { "metadata": {
"creationTimestamp": null,
"labels": { "labels": {
"name": "nodejs-frontend" "name": "nodejs-frontend"
} }
@ -188,26 +158,14 @@
"image": "nodejs-example", "image": "nodejs-example",
"ports": [ "ports": [
{ {
"containerPort": 8080, "containerPort": 8080
"protocol": "TCP"
} }
], ]
"resources": {},
"terminationMessagePath": "/dev/termination-log",
"imagePullPolicy": "IfNotPresent",
"capabilities": {},
"securityContext": {
"capabilities": {},
"privileged": false
}
} }
], ]
"restartPolicy": "Always",
"dnsPolicy": "ClusterFirst"
} }
} }
}, }
"status": {}
} }
], ],
"parameters": [ "parameters": [
@ -226,4 +184,3 @@
"template": "nodejs-example" "template": "nodejs-example"
} }
} }