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/v3/output-deploy-mode-k8s-template.json
Vendored
+15 -12
View File
@@ -36,19 +36,19 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "DaemonSet",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"name": "foo"
},
"spec": {
"template": {
@@ -61,20 +61,23 @@
"spec": {
"containers": [
{
"name": "foo",
"image": "redis",
"imagePullPolicy": "",
"name": "foo",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
}
},
"status": {
"currentNumberScheduled": 0,
"numberMisscheduled": 0,
"desiredNumberScheduled": 0
"desiredNumberScheduled": 0,
"numberMisscheduled": 0
}
}
]
}
}
script/test/fixtures/v3/output-deploy-mode-os-template.json
Vendored
+15 -12
View File
@@ -36,19 +36,19 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "DaemonSet",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"name": "foo"
},
"spec": {
"template": {
@@ -61,19 +61,22 @@
"spec": {
"containers": [
{
"name": "foo",
"image": "redis",
"imagePullPolicy": "",
"name": "foo",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
}
},
"status": {
"currentNumberScheduled": 0,
"numberMisscheduled": 0,
"desiredNumberScheduled": 0
"desiredNumberScheduled": 0,
"numberMisscheduled": 0
}
},
{
@@ -168,4 +171,4 @@
}
}
]
}
}
script/test/fixtures/v3/output-env-k8s.json
Vendored
+24 -16
View File
@@ -36,52 +36,60 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"name": "foo"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "foo"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"spec": {
"containers": [
{
"name": "foo",
"image": "foo/bar:latest",
"env": [
{
"name": "FOO",
"value": "foo"
}
],
"image": "foo/bar:latest",
"imagePullPolicy": "",
"name": "foo",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/v3/output-env-subs.json
Vendored
+24 -17
View File
@@ -4,50 +4,57 @@
"metadata": {},
"items": [
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "foo",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "foo"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "foo"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"spec": {
"containers": [
{
"name": "foo",
"image": "foo/bar:latest",
"env": [
{
"name": "FOO",
"value": "bar"
"name": "FOO"
}
],
"image": "foo/bar:latest",
"imagePullPolicy": "",
"name": "foo",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/v3/output-k8s-3.5.json
Vendored
+23 -15
View File
@@ -34,38 +34,45 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "helloworld",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "helloworld"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "helloworld"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "helloworld"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.network/helloworld-network": "true",
"io.kompose.service": "helloworld"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.network/helloworld-network": "true",
"io.kompose.service": "helloworld"
}
},
"spec": {
"containers": [
{
"name": "helloworld",
"image": "tutum/hello-world",
"imagePullPolicy": "",
"name": "helloworld",
"ports": [
{
"containerPort": 80
@@ -74,10 +81,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
script/test/fixtures/v3/output-k8s-full-example.json
Vendored
+28 -28
View File
@@ -507,34 +507,6 @@
},
"status": {}
},
{
"kind": "NetworkPolicy",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "other-other-network",
"creationTimestamp": null
},
"spec": {
"podSelector": {
"matchLabels": {
"io.kompose.network/other-other-network": "true"
}
},
"ingress": [
{
"from": [
{
"podSelector": {
"matchLabels": {
"io.kompose.network/other-other-network": "true"
}
}
}
]
}
]
}
},
{
"kind": "NetworkPolicy",
"apiVersion": "extensions/v1beta1",
@@ -590,6 +562,34 @@
}
]
}
},
{
"kind": "NetworkPolicy",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "other-other-network",
"creationTimestamp": null
},
"spec": {
"podSelector": {
"matchLabels": {
"io.kompose.network/other-other-network": "true"
}
},
"ingress": [
{
"from": [
{
"podSelector": {
"matchLabels": {
"io.kompose.network/other-other-network": "true"
}
}
}
]
}
]
}
}
]
}
script/test/fixtures/v3/output-k8s-template.json
Vendored
+79 -55
View File
@@ -96,92 +96,107 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "frontend",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "LoadBalancer",
"kompose.version": "%VERSION%"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"name": "frontend"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "frontend"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "LoadBalancer",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
}
},
"spec": {
"containers": [
{
"name": "frontend",
"env": [
{
"name": "GET_HOSTS_FROM",
"value": "dns"
}
],
"image": "gcr.io/google-samples/gb-frontend:v4",
"imagePullPolicy": "",
"name": "frontend",
"ports": [
{
"containerPort": 80
}
],
"env": [
{
"name": "GET_HOSTS_FROM",
"value": "dns"
}
],
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-master",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis-master"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis-master"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
}
},
"spec": {
"containers": [
{
"name": "redis-master",
"image": "k8s.gcr.io/redis:e2e",
"imagePullPolicy": "",
"name": "redis-master",
"ports": [
{
"containerPort": 6379
@@ -190,63 +205,72 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "redis-slave"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "redis-slave"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
}
},
"spec": {
"containers": [
{
"name": "redis-slave",
"image": "gcr.io/google_samples/gb-redisslave:v1",
"ports": [
{
"containerPort": 6379
}
],
"env": [
{
"name": "GET_HOSTS_FROM",
"value": "dns"
}
],
"image": "gcr.io/google_samples/gb-redisslave:v1",
"imagePullPolicy": "",
"name": "redis-slave",
"ports": [
{
"containerPort": 6379
}
],
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/v3/output-memcpu-k8s.json
Vendored
+23 -15
View File
@@ -36,39 +36,46 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"name": "foo"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "foo"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"spec": {
"containers": [
{
"name": "foo",
"image": "redis",
"imagePullPolicy": "",
"name": "foo",
"resources": {
"limits": {
"cpu": "10m",
@@ -81,10 +88,11 @@
}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/v3/output-memcpu-partial-k8s.json
Vendored
+23 -15
View File
@@ -36,39 +36,46 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"name": "foo"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "foo"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"spec": {
"containers": [
{
"name": "foo",
"image": "redis",
"imagePullPolicy": "",
"name": "foo",
"resources": {
"limits": {
"memory": "52428800"
@@ -79,10 +86,11 @@
}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/v3/output-unset-env-k8s.json
Vendored
+28 -20
View File
@@ -36,56 +36,64 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "foo",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"name": "foo"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "foo"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"spec": {
"containers": [
{
"name": "foo",
"image": "foo/bar:latest",
"env": [
{
"name": "V3_HOST_ENV_TEST_SET_TO_BAR",
"value": "BAR"
},
{
"name": "FOO",
"value": "foo"
},
{
"name": "V3_HOST_ENV_TEST_SET_TO_BAR",
"value": "BAR"
}
],
"image": "foo/bar:latest",
"imagePullPolicy": "",
"name": "foo",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/v3/output-volumes-k8s-template.json
Vendored
+36 -29
View File
@@ -36,35 +36,59 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "foobar",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foobar"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foobar"
},
"name": "foobar"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "foobar"
}
},
"strategy": {
"type": "Recreate"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foobar"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foobar"
}
},
"spec": {
"containers": [
{
"image": "foo/bar:latest",
"imagePullPolicy": "",
"name": "foobar",
"resources": {},
"volumeMounts": [
{
"mountPath": "/tmp/foo/bar",
"name": "foobar-claim0"
}
]
}
],
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"name": "foobar-claim0",
@@ -72,25 +96,8 @@
"claimName": "foobar-claim0"
}
}
],
"containers": [
{
"name": "foobar",
"image": "foo/bar:latest",
"resources": {},
"volumeMounts": [
{
"name": "foobar-claim0",
"mountPath": "/tmp/foo/bar"
}
]
}
],
"restartPolicy": "Always"
]
}
},
"strategy": {
"type": "Recreate"
}
},
"status": {}