some of created objects were missing io.kompose.service label

label added to BuildConfig, DaemonSet, ReplicationController, Deployment and Pod
This commit is contained in:
Tomas Kral 2017-04-27 13:27:49 +02:00
parent 7e785bb31f
commit 792976da1f
No known key found for this signature in database
GPG Key ID: E690DA7E4F291FA6
29 changed files with 278 additions and 71 deletions

View File

@ -130,7 +130,8 @@ func (k *Kubernetes) InitRC(name string, service kobject.ServiceConfig, replicas
APIVersion: "v1",
},
ObjectMeta: api.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: api.ReplicationControllerSpec{
Replicas: int32(replicas),
@ -171,7 +172,8 @@ func (k *Kubernetes) InitD(name string, service kobject.ServiceConfig, replicas
APIVersion: "extensions/v1beta1",
},
ObjectMeta: api.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: extensions.DeploymentSpec{
Replicas: int32(replicas),
@ -191,7 +193,8 @@ func (k *Kubernetes) InitDS(name string, service kobject.ServiceConfig) *extensi
APIVersion: "extensions/v1beta1",
},
ObjectMeta: api.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: extensions.DaemonSetSpec{
Template: api.PodTemplateSpec{
@ -513,7 +516,8 @@ func (k *Kubernetes) InitPod(name string, service kobject.ServiceConfig) *api.Po
APIVersion: "v1",
},
ObjectMeta: api.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: k.InitPodSpec(name, service.Image),
}

View File

@ -311,7 +311,7 @@ func TestKomposeConvert(t *testing.T) {
if err := checkPodTemplate(config, d.Spec.Template, labels); err != nil {
t.Errorf("%v", err)
}
if err := checkMeta(config, d.ObjectMeta, name, false); err != nil {
if err := checkMeta(config, d.ObjectMeta, name, true); err != nil {
t.Errorf("%v", err)
}
if (int)(d.Spec.Replicas) != replicas {
@ -328,7 +328,7 @@ func TestKomposeConvert(t *testing.T) {
if err := checkPodTemplate(config, ds.Spec.Template, labels); err != nil {
t.Errorf("%v", err)
}
if err := checkMeta(config, ds.ObjectMeta, name, false); err != nil {
if err := checkMeta(config, ds.ObjectMeta, name, true); err != nil {
t.Errorf("%v", err)
}
if ds.Spec.Selector != nil && len(ds.Spec.Selector.MatchLabels) > 0 {
@ -342,7 +342,7 @@ func TestKomposeConvert(t *testing.T) {
if err := checkPodTemplate(config, *rc.Spec.Template, labels); err != nil {
t.Errorf("%v", err)
}
if err := checkMeta(config, rc.ObjectMeta, name, false); err != nil {
if err := checkMeta(config, rc.ObjectMeta, name, true); err != nil {
t.Errorf("%v", err)
}
if (int)(rc.Spec.Replicas) != replicas {
@ -360,7 +360,7 @@ func TestKomposeConvert(t *testing.T) {
if err := checkPodTemplate(config, *dc.Spec.Template, labels); err != nil {
t.Errorf("%v", err)
}
if err := checkMeta(config, dc.ObjectMeta, name, false); err != nil {
if err := checkMeta(config, dc.ObjectMeta, name, true); err != nil {
t.Errorf("%v", err)
}
if (int)(dc.Spec.Replicas) != replicas {

View File

@ -216,8 +216,10 @@ func initBuildConfig(name string, service kobject.ServiceConfig, repo string, br
Kind: "BuildConfig",
APIVersion: "v1",
},
ObjectMeta: kapi.ObjectMeta{
Name: name,
Name: name,
Labels: transformer.ConfigLabels(name),
},
Spec: buildapi.BuildConfigSpec{
Triggers: []buildapi.BuildTriggerPolicy{

View File

@ -139,7 +139,10 @@
"apiVersion": "v1",
"metadata": {
"name": "foo1",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo1"
}
},
"spec": {
"triggers": [
@ -270,7 +273,10 @@
"apiVersion": "v1",
"metadata": {
"name": "foo",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "foo"
}
},
"spec": {
"triggers": [

View File

@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -96,7 +99,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

View File

@ -146,6 +146,9 @@
"metadata": {
"name": "db",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "db"
},
"annotations": {
"com.example.description": "Postgres Database"
}
@ -184,7 +187,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -220,7 +226,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "result",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "result"
}
},
"spec": {
"replicas": 1,
@ -257,6 +266,9 @@
"metadata": {
"name": "vote",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "vote"
},
"annotations": {
"com.example.description": "Vote"
}
@ -295,7 +307,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "worker",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "worker"
}
},
"spec": {
"replicas": 1,

View File

@ -35,7 +35,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "base",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "base"
}
},
"spec": {
"replicas": 1,

View File

@ -356,7 +356,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-api",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-api"
}
},
"spec": {
"replicas": 1,
@ -430,7 +433,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-bitbucket-scm-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-bitbucket-scm-collector"
}
},
"spec": {
"replicas": 1,
@ -499,7 +505,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-chat-ops-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-chat-ops-collector"
}
},
"spec": {
"replicas": 1,
@ -568,7 +577,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-github-scm-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-github-scm-collector"
}
},
"spec": {
"replicas": 1,
@ -637,7 +649,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-jenkins-build-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jenkins-build-collector"
}
},
"spec": {
"replicas": 1,
@ -706,7 +721,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-jenkins-cucumber-test-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jenkins-cucumber-test-collector"
}
},
"spec": {
"replicas": 1,
@ -775,7 +793,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-jira-feature-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-jira-feature-collector"
}
},
"spec": {
"replicas": 1,
@ -854,7 +875,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-sonar-codequality-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-sonar-codequality-collector"
}
},
"spec": {
"replicas": 1,
@ -923,7 +947,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-subversion-scm-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-subversion-scm-collector"
}
},
"spec": {
"replicas": 1,
@ -992,7 +1019,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-udeploy-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-udeploy-collector"
}
},
"spec": {
"replicas": 1,
@ -1075,7 +1105,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-ui",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-ui"
}
},
"spec": {
"replicas": 1,
@ -1111,7 +1144,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "hygieia-versionone-collector",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "hygieia-versionone-collector"
}
},
"spec": {
"replicas": 1,
@ -1180,7 +1216,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mongodb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mongodb"
}
},
"spec": {
"replicas": 1,

View File

@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "etherpad",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "etherpad"
}
},
"spec": {
"replicas": 1,
@ -118,7 +121,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
}
},
"spec": {
"replicas": 1,

View File

@ -68,7 +68,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -105,6 +108,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "batman.example.com"
}

View File

@ -63,7 +63,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -100,6 +103,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "batman.example.com"
}

View File

@ -68,7 +68,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -105,6 +108,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "True"
}

View File

@ -63,7 +63,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -100,6 +103,9 @@
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.service.expose": "True"
}

View File

@ -96,7 +96,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "gitlab",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "gitlab"
}
},
"spec": {
"replicas": 1,
@ -172,7 +175,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "postgresql",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "postgresql"
}
},
"spec": {
"replicas": 1,
@ -222,7 +228,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,

View File

@ -86,7 +86,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "frontend",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "frontend"
}
},
"spec": {
"replicas": 1,
@ -140,7 +143,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-master",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-master"
}
},
"spec": {
"replicas": 1,
@ -176,7 +182,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis-slave",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis-slave"
}
},
"spec": {
"replicas": 1,

View File

@ -40,7 +40,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,

View File

@ -40,7 +40,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,

View File

@ -70,7 +70,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "etherpad",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "etherpad"
}
},
"spec": {
"replicas": 1,
@ -131,7 +134,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
}
},
"spec": {
"replicas": 1,

View File

@ -138,7 +138,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"replicas": 1,
@ -173,7 +176,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node1",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
}
},
"spec": {
"replicas": 1,
@ -208,7 +214,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node2",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
}
},
"spec": {
"replicas": 1,
@ -243,7 +252,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "node3",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
}
},
"spec": {
"replicas": 1,
@ -278,7 +290,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,

View File

@ -216,7 +216,10 @@
"apiVersion": "v1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"triggers": [
@ -337,7 +340,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node1",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node1"
}
},
"spec": {
"triggers": [
@ -458,7 +464,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node2",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node2"
}
},
"spec": {
"triggers": [
@ -579,7 +588,10 @@
"apiVersion": "v1",
"metadata": {
"name": "node3",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "node3"
}
},
"spec": {
"triggers": [
@ -709,4 +721,4 @@
}
}
]
}
}

View File

@ -66,7 +66,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -106,7 +109,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

View File

@ -66,7 +66,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -106,7 +109,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

View File

@ -66,7 +66,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "mariadb",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "mariadb"
}
},
"spec": {
"replicas": 1,
@ -149,7 +152,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "wordpress",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "wordpress"
}
},
"spec": {
"replicas": 1,

View File

@ -34,7 +34,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "client",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "client"
}
},
"spec": {
"replicas": 1,

View File

@ -34,7 +34,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "client",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "client"
}
},
"spec": {
"replicas": 1,

View File

@ -34,7 +34,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "httpd",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "httpd"
}
},
"spec": {
"replicas": 1,

View File

@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "nginx",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "nginx"
}
},
"spec": {
"replicas": 1,
@ -144,7 +147,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

View File

@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -96,7 +99,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,

View File

@ -60,7 +60,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "redis",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "redis"
}
},
"spec": {
"replicas": 1,
@ -96,7 +99,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"replicas": 1,