From f8da61436edbf59e68b2d76d3a29402fbf2638d7 Mon Sep 17 00:00:00 2001 From: Tomas Kral Date: Fri, 24 Mar 2017 14:22:42 +0100 Subject: [PATCH] add missing 'io.kompose.service' label to Route and Ingress This was caussing 'kompose down' not to delete Route and Ingress --- pkg/transformer/kubernetes/kubernetes.go | 3 ++- pkg/transformer/openshift/openshift.go | 3 ++- .../kubernetes-expose-hostname-multiple-ports.json | 5 ++++- .../provider-files/kubernetes-expose-hostname.json | 5 ++++- .../kubernetes-expose-true-multiple-ports.json | 5 ++++- .../provider-files/kubernetes-expose-true.json | 5 ++++- .../openshift-expose-hostname-multiple-ports.json | 5 ++++- .../provider-files/openshift-expose-hostname.json | 5 ++++- .../provider-files/openshift-expose-true-multiple-ports.json | 5 ++++- .../expose-service/provider-files/openshift-expose-true.json | 5 ++++- 10 files changed, 36 insertions(+), 10 deletions(-) diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index ed12322b..8ae2b579 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -208,7 +208,8 @@ func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, por APIVersion: "extensions/v1beta1", }, ObjectMeta: api.ObjectMeta{ - Name: name, + Name: name, + Labels: transformer.ConfigLabels(name), }, Spec: extensions.IngressSpec{ Rules: []extensions.IngressRule{ diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go index 6a41d566..a6ac2dcb 100644 --- a/pkg/transformer/openshift/openshift.go +++ b/pkg/transformer/openshift/openshift.go @@ -280,7 +280,8 @@ func (o *OpenShift) initRoute(name string, service kobject.ServiceConfig, port i APIVersion: "v1", }, ObjectMeta: api.ObjectMeta{ - Name: name, + Name: name, + Labels: transformer.ConfigLabels(name), }, Spec: routeapi.RouteSpec{ Port: &routeapi.RoutePort{ diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json index f72f2006..d2dc9ce4 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json @@ -146,7 +146,10 @@ "apiVersion": "extensions/v1beta1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "rules": [ diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json index 6783c958..902be11a 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json @@ -138,7 +138,10 @@ "apiVersion": "extensions/v1beta1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "rules": [ diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json index cbfc73e0..b6842d7b 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json @@ -146,7 +146,10 @@ "apiVersion": "extensions/v1beta1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "rules": [ diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json index 4377e065..ab77b2a4 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json @@ -138,7 +138,10 @@ "apiVersion": "extensions/v1beta1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "rules": [ diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json b/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json index d69facd4..a5ec61d3 100644 --- a/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json +++ b/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json @@ -256,7 +256,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "host": "batman.example.com", diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json b/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json index 4dfbae43..ddd38412 100644 --- a/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json +++ b/script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json @@ -248,7 +248,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "host": "batman.example.com", diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json b/script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json index 989ef147..5b5f7200 100644 --- a/script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json +++ b/script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json @@ -256,7 +256,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "host": "", diff --git a/script/test/fixtures/expose-service/provider-files/openshift-expose-true.json b/script/test/fixtures/expose-service/provider-files/openshift-expose-true.json index 2424ddfa..ed206793 100644 --- a/script/test/fixtures/expose-service/provider-files/openshift-expose-true.json +++ b/script/test/fixtures/expose-service/provider-files/openshift-expose-true.json @@ -248,7 +248,10 @@ "apiVersion": "v1", "metadata": { "name": "web", - "creationTimestamp": null + "creationTimestamp": null, + "labels": { + "io.kompose.service": "web" + } }, "spec": { "host": "",