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/examples/output-counter-k8s.json
Vendored
+8
View File
@@ -84,6 +84,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -127,6 +131,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/examples/output-counter-v3-k8s.json
Vendored
+9
View File
@@ -86,6 +86,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -130,6 +134,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.type": "NodePort",
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/examples/output-gitlab-k8s.json
Vendored
+13
View File
@@ -123,6 +123,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "gitlab"
},
"annotations": {
"kompose.service.type": "NodePort",
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -540,6 +545,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "postgresql"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -639,6 +648,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/examples/output-k8s.json
Vendored
+13
View File
@@ -117,6 +117,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"annotations": {
"kompose.service.type": "LoadBalancer",
"kompose.cmd": "%CMD%",
"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/examples/output-v3-k8s.json
Vendored
+13
View File
@@ -117,6 +117,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"annotations": {
"kompose.service.type": "LoadBalancer",
"kompose.cmd": "%CMD%",
"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/examples/output-voting-k8s.json
Vendored
+22
View File
@@ -147,6 +147,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"com.example.description": "Postgres Database",
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -190,6 +195,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -233,6 +242,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "result"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -277,6 +290,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "vote"
},
"annotations": {
"com.example.description": "Vote",
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -320,6 +338,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "worker"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {