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/tty-true/output-k8s-template.json
Vendored
+4
View File
@@ -54,6 +54,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "client"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/tty-true/output-k8s.json
Vendored
-81
View File
@@ -1,81 +0,0 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "client",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "client"
},
"annotations": {
"kompose.cmd": "kompose -f /home/snarwade/go/src/github.com/kubernetes/kompose/script/test/fixtures/tty-true/docker-compose.yml convert --stdout -j",
"kompose.version": "1.0.0 (HEAD)"
}
},
"spec": {
"ports": [
{
"name": "1337",
"port": 1337,
"targetPort": 1337
}
],
"selector": {
"io.kompose.service": "client"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "client",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "client"
},
"annotations": {
"kompose.cmd": "kompose -f /home/snarwade/go/src/github.com/kubernetes/kompose/script/test/fixtures/tty-true/docker-compose.yml convert --stdout -j",
"kompose.version": "1.0.0 (HEAD)"
}
},
"spec": {
"replicas": 1,
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "client"
}
},
"spec": {
"containers": [
{
"name": "client",
"image": "registry.centos.org/centos/centos:7",
"ports": [
{
"containerPort": 1337
}
],
"resources": {},
"tty": true
}
],
"restartPolicy": "Always"
}
},
"strategy": {}
},
"status": {}
}
]
}