Fix tests for buildconfig.

This commit is contained in:
Ratnadeep Debnath 2016-11-16 18:26:42 +05:30
parent 1a7b19c070
commit bea50b1608

View File

@ -3,33 +3,6 @@
"apiVersion": "v1", "apiVersion": "v1",
"metadata": {}, "metadata": {},
"items": [ "items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "node2",
"creationTimestamp": null,
"labels": {
"service": "node2"
}
},
"spec": {
"ports": [
{
"name": "8080",
"protocol": "TCP",
"port": 8080,
"targetPort": 8080
}
],
"selector": {
"service": "node2"
}
},
"status": {
"loadBalancer": {}
}
},
{ {
"kind": "Service", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
@ -139,7 +112,7 @@
} }
}, },
{ {
"kind": "DeploymentConfig", "kind": "Service",
"apiVersion": "v1", "apiVersion": "v1",
"metadata": { "metadata": {
"name": "node2", "name": "node2",
@ -149,81 +122,20 @@
} }
}, },
"spec": { "spec": {
"strategy": { "ports": [
"resources": {}
},
"triggers": [
{ {
"type": "ConfigChange" "name": "8080",
}, "protocol": "TCP",
{ "port": 8080,
"type": "ImageChange", "targetPort": 8080
"imageChangeParams": {
"automatic": true,
"containerNames": [
"node2"
],
"from": {
"kind": "ImageStreamTag",
"name": "node2:latest"
}
}
} }
], ],
"replicas": 1,
"test": false,
"selector": { "selector": {
"service": "node2" "service": "node2"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"service": "node2"
}
},
"spec": {
"containers": [
{
"name": "node2",
"image": " ",
"ports": [
{
"containerPort": 8080,
"protocol": "TCP"
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
} }
}, },
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "node2",
"creationTimestamp": null
},
"spec": {
"tags": [
{
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage"
},
"generation": null,
"importPolicy": {}
}
]
},
"status": { "status": {
"dockerImageRepository": "" "loadBalancer": {}
} }
}, },
{ {
@ -297,23 +209,53 @@
"name": "node3", "name": "node3",
"creationTimestamp": null "creationTimestamp": null
}, },
"spec": { "spec": {},
"tags": [
{
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage"
},
"generation": null,
"importPolicy": {}
}
]
},
"status": { "status": {
"dockerImageRepository": "" "dockerImageRepository": ""
} }
}, },
{
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "node3",
"creationTimestamp": null
},
"spec": {
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange"
}
],
"runPolicy": "Serial",
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "master"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/node"
},
"strategy": {
"type": "Docker",
"dockerStrategy": {}
},
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "node3:latest"
}
},
"resources": {},
"postCommit": {}
},
"status": {
"lastVersion": 0
}
},
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1", "apiVersion": "v1",
@ -474,23 +416,53 @@
"name": "nginx", "name": "nginx",
"creationTimestamp": null "creationTimestamp": null
}, },
"spec": { "spec": {},
"tags": [
{
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage"
},
"generation": null,
"importPolicy": {}
}
]
},
"status": { "status": {
"dockerImageRepository": "" "dockerImageRepository": ""
} }
}, },
{
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
},
"spec": {
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange"
}
],
"runPolicy": "Serial",
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "master"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/nginx"
},
"strategy": {
"type": "Docker",
"dockerStrategy": {}
},
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "nginx:latest"
}
},
"resources": {},
"postCommit": {}
},
"status": {
"lastVersion": 0
}
},
{ {
"kind": "DeploymentConfig", "kind": "DeploymentConfig",
"apiVersion": "v1", "apiVersion": "v1",
@ -562,22 +534,170 @@
"name": "node1", "name": "node1",
"creationTimestamp": null "creationTimestamp": null
}, },
"spec": { "spec": {},
"tags": [
{
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage"
},
"generation": null,
"importPolicy": {}
}
]
},
"status": { "status": {
"dockerImageRepository": "" "dockerImageRepository": ""
} }
},
{
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "node1",
"creationTimestamp": null
},
"spec": {
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange"
}
],
"runPolicy": "Serial",
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "master"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/node"
},
"strategy": {
"type": "Docker",
"dockerStrategy": {}
},
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "node1:latest"
}
},
"resources": {},
"postCommit": {}
},
"status": {
"lastVersion": 0
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "node2",
"creationTimestamp": null,
"labels": {
"service": "node2"
}
},
"spec": {
"strategy": {
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"node2"
],
"from": {
"kind": "ImageStreamTag",
"name": "node2:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"service": "node2"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"service": "node2"
}
},
"spec": {
"containers": [
{
"name": "node2",
"image": " ",
"ports": [
{
"containerPort": 8080,
"protocol": "TCP"
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
}
},
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "node2",
"creationTimestamp": null
},
"spec": {},
"status": {
"dockerImageRepository": ""
}
},
{
"kind": "BuildConfig",
"apiVersion": "v1",
"metadata": {
"name": "node2",
"creationTimestamp": null
},
"spec": {
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange"
}
],
"runPolicy": "Serial",
"source": {
"type": "Git",
"git": {
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "master"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/node"
},
"strategy": {
"type": "Docker",
"dockerStrategy": {}
},
"output": {
"to": {
"kind": "ImageStreamTag",
"name": "node2:latest"
}
},
"resources": {},
"postCommit": {}
},
"status": {
"lastVersion": 0
}
} }
] ]
} }