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

Upgrade deployment/daemonset to apps/v1 (#1207)

Browse Source
This commit is contained in:
Hang Yan
2019-12-26 16:36:11 +08:00
committed by GitHub
parent 73ec0abab2
commit bc28ffc675
101 changed files with 4186 additions and 2966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/ports-with-ip/output-k8s-template.json
Vendored
+44 -28
View File
@@ -70,37 +70,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"containers": [
{
"name": "redis",
"image": "redis:3.0",
"imagePullPolicy": "",
"name": "redis",
"ports": [
{
"containerPort": 6379
@@ -113,45 +120,53 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "web"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "web"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "tuna/docker-counter23",
"imagePullPolicy": "",
"name": "web",
"ports": [
{
"containerPort": 5000,
@@ -161,10 +176,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/ports-with-ip/output-k8s.json
Vendored
+6 -6
View File
@@ -13,7 +13,7 @@
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "kompose -f /home/snarwade/go/src/github.com/kubernetes/kompose/script/test/fixtures/ports-with-ip/docker-compose.yml convert --stdout -j",
"kompose.cmd": "%CMD%",
"kompose.version": "1.0.0 (HEAD)"
}
},
@@ -49,7 +49,7 @@
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "kompose -f /home/snarwade/go/src/github.com/kubernetes/kompose/script/test/fixtures/ports-with-ip/docker-compose.yml convert --stdout -j",
"kompose.cmd": "%CMD%",
"kompose.version": "1.0.0 (HEAD)"
}
},
@@ -71,7 +71,7 @@
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"apiVersion": "apps/v1",
"metadata": {
"name": "redis",
"creationTimestamp": null,
@@ -79,7 +79,7 @@
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "kompose -f /home/snarwade/go/src/github.com/kubernetes/kompose/script/test/fixtures/ports-with-ip/docker-compose.yml convert --stdout -j",
"kompose.cmd": "%CMD%",
"kompose.version": "1.0.0 (HEAD)"
}
},
@@ -118,7 +118,7 @@
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"apiVersion": "apps/v1",
"metadata": {
"name": "web",
"creationTimestamp": null,
@@ -126,7 +126,7 @@
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "kompose -f /home/snarwade/go/src/github.com/kubernetes/kompose/script/test/fixtures/ports-with-ip/docker-compose.yml convert --stdout -j",
"kompose.cmd": "%CMD%",
"kompose.version": "1.0.0 (HEAD)"
}
},