Merge pull request #511 from kadel/fix-ingress-down

add missing 'io.kompose.service' label to Route and Ingress
kubernetes · Apr 12, 2017 · 0464d24 · 0464d24
2 parents 3dd41ec + f8da614
commit 0464d24
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 10 deletions.
diff --git 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
@@ -301,7 +301,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/...est/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json b/...est/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
@@ -138,7 +138,10 @@
       "apiVersion": "extensions/v1beta1",
       "metadata": {
         "name": "web",
-        "creationTimestamp": null
+        "creationTimestamp": null,
+        "labels": {
+          "io.kompose.service": "web"
+        }
       },
       "spec": {
         "rules": [

diff --git a/...pt/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json b/...pt/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
@@ -138,7 +138,10 @@
       "apiVersion": "extensions/v1beta1",
       "metadata": {
         "name": "web",
-        "creationTimestamp": null
+        "creationTimestamp": null,
+        "labels": {
+          "io.kompose.service": "web"
+        }
       },
       "spec": {
         "rules": [

diff --git a/...test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json b/...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
@@ -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
@@ -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
@@ -248,7 +248,10 @@
       "apiVersion": "v1",
       "metadata": {
         "name": "web",
-        "creationTimestamp": null
+        "creationTimestamp": null,
+        "labels": {
+          "io.kompose.service": "web"
+        }
       },
       "spec": {
         "host": "",