deep-stack/kompose
4
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #186 from surajssd/create-pvc

Browse Source 
Create PVC object for docker-compose volumes
This commit is contained in:
Tuna
2016-10-06 21:39:21 +02:00
committed by GitHub
parent fbfdb75eb9 e879164c2e
commit 12d6e87454
8 changed files with 358 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/cmd/tests.sh
+7
View File
@@ -51,5 +51,12 @@ convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/ports-wit
convert::expect_success "kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/ports-with-proto/docker-compose.yml convert --stdout" "$KOMPOSE_ROOT/script/test/fixtures/ports-with-proto/output-os.json"
######
# Tests related to docker-compose file in /script/test/fixtures/volume-mounts/simple-vol-mounts
# kubernetes test
convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/volume-mounts/simple-vol-mounts/docker-compose.yml convert --stdout" "$KOMPOSE_ROOT/script/test/fixtures/volume-mounts/simple-vol-mounts/output-k8s.json"
# openshift test
convert::expect_success "kompose -f $KOMPOSE_ROOT/script/test/fixtures/volume-mounts/simple-vol-mounts/docker-compose.yml convert --stdout --dc" "$KOMPOSE_ROOT/script/test/fixtures/volume-mounts/simple-vol-mounts/output-os.json"
exit $EXIT_STATUS
script/test/fixtures/volume-mounts/simple-vol-mounts/docker-compose.yml
Vendored
+9
View File
@@ -0,0 +1,9 @@
version: "2"
services:
httpd:
image: docker.io/fedora/apache
ports:
- "80"
volumes:
- /var/www/html
script/test/fixtures/volume-mounts/simple-vol-mounts/output-k8s.json
Vendored
+104
View File
@@ -0,0 +1,104 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "httpd",
"creationTimestamp": null,
"labels": {
"service": "httpd"
}
},
"spec": {
"ports": [
{
"name": "80",
"protocol": "TCP",
"port": 80,
"targetPort": 80
}
],
"selector": {
"service": "httpd"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "httpd",
"creationTimestamp": null
},
"spec": {
"replicas": 1,
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"service": "httpd"
}
},
"spec": {
"volumes": [
{
"name": "httpd-claim0",
"persistentVolumeClaim": {
"claimName": "httpd-claim0"
}
}
],
"containers": [
{
"name": "httpd",
"image": "docker.io/fedora/apache",
"ports": [
{
"containerPort": 80,
"protocol": "TCP"
}
],
"resources": {},
"volumeMounts": [
{
"name": "httpd-claim0",
"mountPath": "/var/www/html"
}
]
}
],
"restartPolicy": "Always"
}
},
"strategy": {}
},
"status": {}
},
{
"kind": "PersistentVolumeClaim",
"apiVersion": "v1",
"metadata": {
"name": "httpd-claim0",
"creationTimestamp": null
},
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "100Mi"
}
}
},
"status": {}
}
]
}
script/test/fixtures/volume-mounts/simple-vol-mounts/output-os.json
Vendored
+156
View File
@@ -0,0 +1,156 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "httpd",
"creationTimestamp": null,
"labels": {
"service": "httpd"
}
},
"spec": {
"ports": [
{
"name": "80",
"protocol": "TCP",
"port": 80,
"targetPort": 80
}
],
"selector": {
"service": "httpd"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "httpd",
"creationTimestamp": null,
"labels": {
"service": "httpd"
}
},
"spec": {
"strategy": {
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"httpd"
],
"from": {
"kind": "ImageStreamTag",
"name": "httpd:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"service": "httpd"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"service": "httpd"
}
},
"spec": {
"volumes": [
{
"name": "httpd-claim0",
"persistentVolumeClaim": {
"claimName": "httpd-claim0"
}
}
],
"containers": [
{
"name": "httpd",
"image": " ",
"ports": [
{
"containerPort": 80,
"protocol": "TCP"
}
],
"resources": {},
"volumeMounts": [
{
"name": "httpd-claim0",
"mountPath": "/var/www/html"
}
]
}
],
"restartPolicy": "Always"
}
}
},
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "httpd",
"creationTimestamp": null
},
"spec": {
"tags": [
{
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "docker.io/fedora/apache"
},
"generation": null,
"importPolicy": {}
}
]
},
"status": {
"dockerImageRepository": ""
}
},
{
"kind": "PersistentVolumeClaim",
"apiVersion": "v1",
"metadata": {
"name": "httpd-claim0",
"creationTimestamp": null
},
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "100Mi"
}
}
},
"status": {}
}
]
}