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/change-in-volume/output-k8s-empty-vols-template.json
Vendored
+9
View File
@@ -87,6 +87,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -125,6 +130,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/change-in-volume/output-k8s-template.json
Vendored
+9
View File
@@ -87,6 +87,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -125,6 +130,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/compose-v3.3-test/output-k8s-config-long-warning.json
Vendored
+5 -1
View File
@@ -38,6 +38,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -71,4 +75,4 @@
"status": {}
}
]
}
}
script/test/fixtures/compose-v3.3-test/output-k8s-config-long.json
Vendored
+5 -1
View File
@@ -38,6 +38,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -71,4 +75,4 @@
"status": {}
}
]
}
}
script/test/fixtures/compose-v3.3-test/output-k8s-config-short-warning.json
Vendored
+5 -1
View File
@@ -38,6 +38,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -56,4 +60,4 @@
"status": {}
}
]
}
}
script/test/fixtures/compose-v3.3-test/output-k8s-config-short.json
Vendored
+5 -1
View File
@@ -38,6 +38,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -56,4 +60,4 @@
"status": {}
}
]
}
}
script/test/fixtures/compose-v3.3-test/output-k8s-endpoint-mode-1.json
Vendored
+4
View File
@@ -55,6 +55,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/compose-v3.3-test/output-k8s-endpoint-mode-2.json
Vendored
+4
View File
@@ -54,6 +54,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/configmap/output-k8s-template.json
Vendored
+7 -2
View File
@@ -57,6 +57,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "nodeport",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -114,7 +119,7 @@
"metadata": {
"name": "redis-foo-env",
"creationTimestamp": null,
"labels": {
"labels": {
"io.kompose.service": "redis-foo-env"
}
},
@@ -128,7 +133,7 @@
"metadata": {
"name": "redis-bar-env",
"creationTimestamp": null,
"labels": {
"labels": {
"io.kompose.service": "redis-bar-env"
}
},
script/test/fixtures/controller/output-k8s-controller-template.json
Vendored
+5 -1
View File
@@ -102,6 +102,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -163,4 +167,4 @@
"status": {}
}
]
}
}
script/test/fixtures/controller/output-k8s-controller-v3-template.json
Vendored
+6 -1
View File
@@ -103,6 +103,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"port": "wordpress"
}
},
"spec": {
@@ -168,4 +173,4 @@
"status": {}
}
]
}
}
script/test/fixtures/controller/output-k8s-deployment-template.json
Vendored
+13 -1
View File
@@ -16,7 +16,6 @@
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.type": "LoadBalancer"
}
},
"spec": {
@@ -118,6 +117,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.type": "LoadBalancer"
}
},
"spec": {
@@ -167,6 +171,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -210,6 +218,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/controller/output-k8s-global-deployment-template.json
Vendored
+5 -1
View File
@@ -24,6 +24,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "worker"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -42,4 +46,4 @@
"status": {}
}
]
}
}
script/test/fixtures/domain/output-k8s.json
Vendored
+4
View File
@@ -24,6 +24,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "dns"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/entrypoint-command/output-k8s-template.json
Vendored
+5
View File
@@ -57,6 +57,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "base"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/env/output-k8s.json
Vendored
+5 -1
View File
@@ -59,6 +59,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "namenode"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -162,4 +166,4 @@
"status": {}
}
]
}
}
script/test/fixtures/envvars-separators/output-k8s-template.json
Vendored
+52
View File
@@ -114,6 +114,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-api"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -195,6 +199,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-bitbucket-scm-collector"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -271,6 +279,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-chat-ops-collector"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -347,6 +359,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-github-scm-collector"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -423,6 +439,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jenkins-build-collector"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -499,6 +519,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jenkins-cucumber-test-collector"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -575,6 +599,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jira-feature-collector"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -661,6 +689,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-sonar-codequality-collector"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -737,6 +769,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-subversion-scm-collector"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -813,6 +849,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-udeploy-collector"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -903,6 +943,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-ui"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -946,6 +990,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-versionone-collector"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -1022,6 +1070,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mongodb"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/etherpad/output-k8s-template.json
Vendored
+8
View File
@@ -84,6 +84,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "etherpad"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -149,6 +153,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
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": {
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json
Vendored
+9
View File
@@ -90,6 +90,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -134,6 +138,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com"
}
},
"spec": {
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-tls.json
Vendored
+10
View File
@@ -86,6 +86,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -131,6 +135,12 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com",
"kompose.service.expose.tls-secret": "test-secret"
}
},
"spec": {
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json
Vendored
+9
View File
@@ -85,6 +85,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -129,6 +133,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com"
}
},
"spec": {
script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname-tls.json
Vendored
+10
View File
@@ -86,6 +86,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -131,6 +135,12 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "batman.example.com,batwoman.example.com",
"kompose.service.expose.tls-secret": "test-secret"
}
},
"spec": {
script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname.json
Vendored
+9
View File
@@ -85,6 +85,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -129,6 +133,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": " batman.example.com ,, batwoman.example.com "
}
},
"spec": {
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json
Vendored
+9
View File
@@ -90,6 +90,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -134,6 +138,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "True",
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json
Vendored
+9
View File
@@ -85,6 +85,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -129,6 +133,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.service.expose": "True"
}
},
"spec": {
script/test/fixtures/gitlab/output-k8s-template.json
Vendored
+12
View File
@@ -124,6 +124,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "gitlab"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -207,6 +211,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "postgresql"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -264,6 +272,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/group-add/output-k8s.json
Vendored
+4
View File
@@ -24,6 +24,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "myservice"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/healthcheck/output-k8s-template.json
Vendored
+5
View File
@@ -57,6 +57,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/healthcheck/output-only-command-k8s-template.json
Vendored
+5
View File
@@ -57,6 +57,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/image-pull-policy/provider-files/kubernetes-v12-image-pull-policy.json
Vendored
+6 -1
View File
@@ -25,6 +25,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx0"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.image-pull-policy": "Always",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -44,4 +49,4 @@
"status": {}
}
]
}
}
script/test/fixtures/image-pull-policy/provider-files/kubernetes-v3-image-pull-policy.json
Vendored
+16 -1
View File
@@ -25,6 +25,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx0"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.image-pull-policy": "Always",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -65,6 +70,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx1"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.image-pull-policy": "IfNotPresent",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -105,6 +115,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx2"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.image-pull-policy": "Never",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -124,4 +139,4 @@
"status": {}
}
]
}
}
script/test/fixtures/image-pull-secret/provider-files/kubernetes-image-pull-secret.json
Vendored
+9
View File
@@ -24,6 +24,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "open-image-service"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -63,6 +67,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "tm-image-service"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.image-pull-secret": "sample-k8s-secret-name",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/keyonly-envs/output-k8s-template.json
Vendored
+12
View File
@@ -114,6 +114,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -175,6 +179,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -218,6 +226,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/mem-limit/output-k8s-template.json
Vendored
+4
View File
@@ -60,6 +60,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/mem-limit/output-mb-k8s-template.json
Vendored
+4
View File
@@ -60,6 +60,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/merge-multiple-compose/output-base-template.json
Vendored
+5 -1
View File
@@ -24,6 +24,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -68,4 +72,4 @@
"status": {}
}
]
}
}
script/test/fixtures/merge-multiple-compose/output-compose-new-service-template.json
Vendored
+10 -2
View File
@@ -54,6 +54,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "new-my-service"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -92,12 +96,16 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"containers": [
{
"name": "test_server",
"name": "test-server",
"image": "test",
"ports": [
{
@@ -115,4 +123,4 @@
"status": {}
}
]
}
}
script/test/fixtures/merge-multiple-compose/output-compose-port-template.json
Vendored
+6 -2
View File
@@ -54,12 +54,16 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"containers": [
{
"name": "test_server",
"name": "test-server",
"image": "test",
"ports": [
{
@@ -77,4 +81,4 @@
"status": {}
}
]
}
}
script/test/fixtures/merge-multiple-compose/output-openshift-template.json
Vendored
+1 -1
View File
@@ -174,7 +174,7 @@
"spec": {
"containers": [
{
"name": "test_server",
"name": "test-server",
"image": " ",
"ports": [
{
script/test/fixtures/multiple-compose-files/output-k8s-template.json
Vendored
+8
View File
@@ -94,6 +94,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "etherpad"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -162,6 +166,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/nginx-node-redis/output-k8s-template-v3.json
Vendored
+20
View File
@@ -174,6 +174,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -217,6 +221,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -260,6 +268,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -303,6 +315,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -346,6 +362,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/nginx-node-redis/output-k8s-template.json
Vendored
+20
View File
@@ -174,6 +174,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -217,6 +221,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -260,6 +268,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -303,6 +315,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -346,6 +362,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/placement/output-k8s-array-template.json
Vendored
+4
View File
@@ -24,6 +24,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/placement/output-k8s-template.json
Vendored
+4
View File
@@ -24,6 +24,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/ports-with-ip/output-k8s-template.json
Vendored
+8
View File
@@ -90,6 +90,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -137,6 +141,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/ports-with-proto/output-k8s-template.json
Vendored
+8
View File
@@ -90,6 +90,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -137,6 +141,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/restart-options/output-k8s-restart-unless-stopped.json
Vendored
+5 -1
View File
@@ -24,6 +24,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -48,4 +52,4 @@
"status": {}
}
]
}
}
script/test/fixtures/same-port-different-proto/output-k8s-template.json
Vendored
+8 -1
View File
@@ -30,7 +30,6 @@
"port": 6379,
"targetPort": 6379
},
{
"name": "1234",
"protocol": "UDP",
@@ -97,6 +96,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -148,6 +151,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/service-name-change/output-k8s-template.json
Vendored
+9
View File
@@ -92,6 +92,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.service.type": "headless",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -182,6 +187,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/stdin-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/stdin/output-k8s.json
Vendored
+4
View File
@@ -24,6 +24,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "backend"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/stdin/output.json
Vendored
+4
View File
@@ -54,6 +54,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
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": {}
}
]
}
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": {
script/test/fixtures/volume-mounts/hostpath/output-k8s-template.json
Vendored
+4
View File
@@ -54,6 +54,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/volume-mounts/named-volume/output-k8s-template.json
Vendored
+5
View File
@@ -56,6 +56,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.volume.size": "1Gi"
}
},
"spec": {
script/test/fixtures/volume-mounts/named-volume/output-k8s-v3.json
Vendored
+5
View File
@@ -56,6 +56,11 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%",
"kompose.volume.size": "200Mi"
}
},
"spec": {
script/test/fixtures/volume-mounts/simple-vol-mounts/output-k8s-template.json
Vendored
+4
View File
@@ -54,6 +54,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "httpd"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/volume-mounts/tmpfs/output-k8s-template.json
Vendored
+4
View File
@@ -54,6 +54,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/volume-mounts/volumes-from/output-k8s-template.json
Vendored
+8
View File
@@ -84,6 +84,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -175,6 +179,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/yaml-and-yml/output-k8s-template.json
Vendored
+8
View File
@@ -84,6 +84,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "kompose convert --stdout -j",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -127,6 +131,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "kompose convert --stdout -j",
"kompose.version": "%VERSION%"
}
},
"spec": {
script/test/fixtures/yaml-and-yml/yml/output-k8s-template.json
Vendored
+8
View File
@@ -84,6 +84,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
},
"annotations": {
"kompose.cmd": "kompose convert --stdout -j",
"kompose.version": "%VERSION%"
}
},
"spec": {
@@ -127,6 +131,10 @@
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "kompose convert --stdout -j",
"kompose.version": "%VERSION%"
}
},
"spec": {