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/merge-multiple-compose/output-base-template.json
Vendored
+23 -15
View File
@@ -4,37 +4,41 @@
"metadata": {},
"items": [
{
"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": "richarvey/nginx-php-fpm",
"env": [
{
"name": "ENABLE_XDEBUG",
@@ -61,13 +65,17 @@
"value": "1"
}
],
"image": "richarvey/nginx-php-fpm",
"imagePullPolicy": "",
"name": "web",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/merge-multiple-compose/output-compose-new-service-template.json
Vendored
+44 -28
View File
@@ -34,79 +34,94 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "new-my-service",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "new-my-service"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "new-my-service"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "new-my-service"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "new-my-service"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "new-my-service"
}
},
"spec": {
"containers": [
{
"name": "new-my-service",
"image": "nginx",
"imagePullPolicy": "",
"name": "new-my-service",
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "server",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "server"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "server"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
}
},
"spec": {
"containers": [
{
"name": "test-server",
"image": "test",
"imagePullPolicy": "",
"name": "test-server",
"ports": [
{
"containerPort": 5000
@@ -115,10 +130,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/merge-multiple-compose/output-compose-port-template.json
Vendored
+22 -14
View File
@@ -34,37 +34,44 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "server",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "server"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "server"
}
},
"strategy": {},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
}
},
"spec": {
"containers": [
{
"name": "test-server",
"image": "test",
"imagePullPolicy": "",
"name": "test-server",
"ports": [
{
"containerPort": 5000
@@ -73,10 +80,11 @@
"resources": {}
}
],
"restartPolicy": "Always"
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": null
}
},
"strategy": {}
}
},
"status": {}
}
script/test/fixtures/merge-multiple-compose/output-openshift-template.json
Vendored
+1 -1
View File
@@ -219,4 +219,4 @@
}
}
]
}
}
script/test/fixtures/merge-multiple-compose/output-other-toplevel-merge-template.json
Vendored
+84 -70
View File
@@ -18,40 +18,68 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "other-toplevel-dev",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-dev"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "other-toplevel-dev"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "other-toplevel-dev"
}
},
"strategy": {
"type": "Recreate"
},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-dev"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"containers": [
{
"image": "nginx",
"imagePullPolicy": "",
"name": "other-toplevel-dev",
"resources": {},
"volumeMounts": [
{
"mountPath": "/nginx.conf",
"name": "firstconfig"
},
{
"mountPath": "/var/www/nginx",
"name": "firstvolume"
}
]
}
],
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"name": "firstconfig",
"configMap": {
"name": "firstconfig",
"Name": "firstconfig",
"defaultMode": 644
}
},
"name": "firstconfig"
},
{
"name": "firstvolume",
@@ -59,29 +87,8 @@
"claimName": "firstvolume"
}
}
],
"containers": [
{
"name": "other-toplevel-dev",
"image": "nginx",
"resources": {},
"volumeMounts": [
{
"name": "firstconfig",
"mountPath": "/nginx.conf"
},
{
"name": "firstvolume",
"mountPath": "/var/www/nginx"
}
]
}
],
"restartPolicy": "Always"
]
}
},
"strategy": {
"type": "Recreate"
}
},
"status": {}
@@ -123,40 +130,68 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "other-toplevel-second",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-second"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "other-toplevel-second"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "other-toplevel-second"
}
},
"strategy": {
"type": "Recreate"
},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-second"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"containers": [
{
"image": "nginx",
"imagePullPolicy": "",
"name": "other-toplevel-second",
"resources": {},
"volumeMounts": [
{
"mountPath": "/nginx.conf",
"name": "secondconfig"
},
{
"mountPath": "/var/www/nginx",
"name": "secondvolume"
}
]
}
],
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"name": "secondconfig",
"configMap": {
"name": "secondconfig",
"Name": "secondconfig",
"defaultMode": 644
}
},
"name": "secondconfig"
},
{
"name": "secondvolume",
@@ -164,29 +199,8 @@
"claimName": "secondvolume"
}
}
],
"containers": [
{
"name": "other-toplevel-second",
"image": "nginx",
"resources": {},
"volumeMounts": [
{
"name": "secondconfig",
"mountPath": "/nginx.conf"
},
{
"name": "secondvolume",
"mountPath": "/var/www/nginx"
}
]
}
],
"restartPolicy": "Always"
]
}
},
"strategy": {
"type": "Recreate"
}
},
"status": {}
script/test/fixtures/merge-multiple-compose/output-other-toplevel-override-template.json
Vendored
+42 -35
View File
@@ -18,40 +18,68 @@
}
},
{
"apiVersion": "apps/v1",
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "other-toplevel-base",
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-base"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
"name": "other-toplevel-base"
},
"spec": {
"replicas": 1,
"selector": {
"matchLabels": {
"io.kompose.service": "other-toplevel-base"
}
},
"strategy": {
"type": "Recreate"
},
"template": {
"metadata": {
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
},
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-base"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"containers": [
{
"image": "nginx",
"imagePullPolicy": "",
"name": "other-toplevel-base",
"resources": {},
"volumeMounts": [
{
"mountPath": "/nginx.conf",
"name": "firstconfig"
},
{
"mountPath": "/var/www/nginx",
"name": "firstvolume"
}
]
}
],
"restartPolicy": "Always",
"serviceAccountName": "",
"volumes": [
{
"name": "firstconfig",
"configMap": {
"name": "firstconfig",
"Name": "firstconfig",
"defaultMode": 644
}
},
"name": "firstconfig"
},
{
"name": "firstvolume",
@@ -59,29 +87,8 @@
"claimName": "firstvolume"
}
}
],
"containers": [
{
"name": "other-toplevel-base",
"image": "nginx",
"resources": {},
"volumeMounts": [
{
"name": "firstconfig",
"mountPath": "/nginx.conf"
},
{
"name": "firstvolume",
"mountPath": "/var/www/nginx"
}
]
}
],
"restartPolicy": "Always"
]
}
},
"strategy": {
"type": "Recreate"
}
},
"status": {}