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

Merge top level non-service keys (#1187)

Browse Source 
* merge top level non-service keys

docker-compose default behaviour is to merge these top level keys such
as `networks`
This commit is contained in:
Chander G
2019-11-28 14:18:49 +08:00
committed by Hang Yan
parent d03a6a9474
commit 5857252c3d
10 changed files with 425 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/merge-multiple-compose/first_config.txt
Vendored
+1
View File
@@ -0,0 +1 @@
First config
script/test/fixtures/merge-multiple-compose/other-toplevel-base.yml
Vendored
+15
View File
@@ -0,0 +1,15 @@
version: "3.3"
services:
other-toplevel-base:
image: nginx
volumes:
- firstvolume:/var/www/nginx
configs:
- source: firstconfig
target: /etc/nginx.conf
mode: 644
configs:
firstconfig:
file: ./first_config.txt
script/test/fixtures/merge-multiple-compose/other-toplevel-dev.yml
Vendored
+20
View File
@@ -0,0 +1,20 @@
version: "3.3"
services:
other-toplevel-dev:
image: nginx
volumes:
- firstvolume:/var/www/nginx
configs:
- source: firstconfig
target: /etc/nginx.conf
mode: 644
volumes:
firstvolume:
driver_opts:
type: "nfs"
configs:
firstconfig:
file: ./first_config.txt
script/test/fixtures/merge-multiple-compose/other-toplevel-ext.yml
Vendored
+19
View File
@@ -0,0 +1,19 @@
version: "3.3"
services:
other-toplevel-second:
image: nginx
volumes:
- secondvolume:/var/www/nginx
configs:
- source: secondconfig
target: /etc/nginx.conf
mode: 644
volumes:
secondvolume:
external: true
configs:
secondconfig:
file: ./second_config.txt
script/test/fixtures/merge-multiple-compose/other-toplevel-override.yml
Vendored
+9
View File
@@ -0,0 +1,9 @@
version: "3.3"
volumes:
firstvolume:
external: true
configs:
firstconfig:
file: ./second_config.txt
script/test/fixtures/merge-multiple-compose/output-other-toplevel-merge-template.json
Vendored
+217
View File
@@ -0,0 +1,217 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "ConfigMap",
"apiVersion": "v1",
"metadata": {
"name": "firstconfig",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-dev"
}
},
"data": {
"first-config.txt": "First config\n"
}
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "other-toplevel-dev",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-dev"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"replicas": 1,
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-dev"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"volumes": [
{
"name": "firstconfig",
"configMap": {
"name": "firstconfig",
"defaultMode": 644
}
},
{
"name": "firstvolume",
"persistentVolumeClaim": {
"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": {}
},
{
"kind": "PersistentVolumeClaim",
"apiVersion": "v1",
"metadata": {
"name": "firstvolume",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "firstvolume"
}
},
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "100Mi"
}
}
},
"status": {}
},
{
"kind": "ConfigMap",
"apiVersion": "v1",
"metadata": {
"name": "secondconfig",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-second"
}
},
"data": {
"second-config.txt": "Second config\n"
}
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "other-toplevel-second",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-second"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"replicas": 1,
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-second"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"volumes": [
{
"name": "secondconfig",
"configMap": {
"name": "secondconfig",
"defaultMode": 644
}
},
{
"name": "secondvolume",
"persistentVolumeClaim": {
"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": {}
},
{
"kind": "PersistentVolumeClaim",
"apiVersion": "v1",
"metadata": {
"name": "secondvolume",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "secondvolume"
}
},
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "100Mi"
}
}
},
"status": {}
}
]
}
script/test/fixtures/merge-multiple-compose/output-other-toplevel-override-template.json
Vendored
+112
View File
@@ -0,0 +1,112 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "ConfigMap",
"apiVersion": "v1",
"metadata": {
"name": "firstconfig",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-base"
}
},
"data": {
"second-config.txt": "Second config\n"
}
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "other-toplevel-base",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-base"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"replicas": 1,
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "other-toplevel-base"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"volumes": [
{
"name": "firstconfig",
"configMap": {
"name": "firstconfig",
"defaultMode": 644
}
},
{
"name": "firstvolume",
"persistentVolumeClaim": {
"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": {}
},
{
"kind": "PersistentVolumeClaim",
"apiVersion": "v1",
"metadata": {
"name": "firstvolume",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "firstvolume"
}
},
"spec": {
"accessModes": [
"ReadWriteOnce"
],
"resources": {
"requests": {
"storage": "100Mi"
}
}
},
"status": {}
}
]
}
script/test/fixtures/merge-multiple-compose/second_config.txt
Vendored
+1
View File
@@ -0,0 +1 @@
Second config