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

Copy the service labels also to Deployment Pod spec annotations (#1166)

Browse Source 
* Copy the service labels also to Deployment Pod spec annotations

This allows kube2iam to work

* Remove test file forgotten from version 1.0.0

* Update test fixtures to have Deployment.spec.t.m.annotations

* Fix name conversion "test_server" -> "test-server"

It looks unrelated to my changes, but still changing.

* Fixing some more output fixtures
This commit is contained in:
Alan Justino da Silva
2019-09-02 10:06:28 +08:00
committed by Hang Yan
parent 4f07f2a5a4
commit 30655b4dd6
77 changed files with 604 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/v3/output-env-k8s.json
Vendored
+5
View File
@@ -57,6 +57,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/v3/output-env-subs.json
Vendored
+4
View File
@@ -24,6 +24,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/v3/output-k8s-3.5.json
Vendored
+4
View File
@@ -54,6 +54,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "helloworld"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/v3/output-k8s-template.json
Vendored
+13
View File
@@ -117,6 +117,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "LoadBalancer",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -166,6 +171,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -209,6 +218,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/v3/output-memcpu-k8s.json
Vendored
+5
View File
@@ -57,6 +57,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/v3/output-memcpu-partial-k8s.json
Vendored
+6 -1
View File
@@ -57,6 +57,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -82,4 +87,4 @@
"status": {}
}
]
}
}
script/test/fixtures/v3/output-unset-env-k8s.json
Vendored
+5
View File
@@ -57,6 +57,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/v3/output-volumes-k8s-template.json
Vendored
+5
View File
@@ -57,6 +57,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foobar"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {