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/nginx-node-redis/output-k8s-template-v3.json
Vendored
+110 -70
View File
@@ -154,37 +154,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "nginx",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "nginx"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "nginx"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"containers": [
{
"name": "nginx",
"image": "nginx",
"imagePullPolicy": "",
"name": "nginx",
"ports": [
{
"containerPort": 80
@@ -193,45 +200,53 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node1",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "node1"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "node1"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
}
},
"spec": {
"containers": [
{
"name": "node1",
"image": "node1",
"imagePullPolicy": "",
"name": "node1",
"ports": [
{
"containerPort": 8080
@@ -240,45 +255,53 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node2",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "node2"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "node2"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
}
},
"spec": {
"containers": [
{
"name": "node2",
"image": "node2",
"imagePullPolicy": "",
"name": "node2",
"ports": [
{
"containerPort": 8080
@@ -287,45 +310,53 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node3",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "node3"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "node3"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
}
},
"spec": {
"containers": [
{
"name": "node3",
"image": "node3",
"imagePullPolicy": "",
"name": "node3",
"ports": [
{
"containerPort": 8080
@@ -334,45 +365,53 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"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",
"imagePullPolicy": "",
"name": "redis",
"ports": [
{
"containerPort": 6379
@@ -381,10 +420,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/nginx-node-redis/output-k8s-template.json
Vendored
+110 -70
View File
@@ -154,37 +154,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "nginx",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "nginx"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "nginx"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"containers": [
{
"name": "nginx",
"image": "nginx",
"imagePullPolicy": "",
"name": "nginx",
"ports": [
{
"containerPort": 80
@@ -193,45 +200,53 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node1",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "node1"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "node1"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
}
},
"spec": {
"containers": [
{
"name": "node1",
"image": "node1",
"imagePullPolicy": "",
"name": "node1",
"ports": [
{
"containerPort": 8080
@@ -240,45 +255,53 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node2",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "node2"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "node2"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
}
},
"spec": {
"containers": [
{
"name": "node2",
"image": "node2",
"imagePullPolicy": "",
"name": "node2",
"ports": [
{
"containerPort": 8080
@@ -287,45 +310,53 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node3",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "node3"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "node3"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
}
},
"spec": {
"containers": [
{
"name": "node3",
"image": "node3",
"imagePullPolicy": "",
"name": "node3",
"ports": [
{
"containerPort": 8080
@@ -334,45 +365,53 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"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",
"imagePullPolicy": "",
"name": "redis",
"ports": [
{
"containerPort": 6379
@@ -381,10 +420,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}