deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

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

Browse Source 
add missing 'io.kompose.service' label to Route and Ingress
This commit is contained in:
Charlie Drage 2017-04-12 11:47:17 -04:00 committed by GitHub
commit 0464d24b40
10 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/transformer/kubernetes/kubernetes.go
View File

@ -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{

3
pkg/transformer/openshift/openshift.go
View File

@ -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{

5
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-multiple-ports.json vendored
View File

@ -146,7 +146,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"rules": [

5
script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname.json vendored
View File

@ -138,7 +138,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"rules": [

5
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true-multiple-ports.json vendored
View File

@ -146,7 +146,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"rules": [

5
script/test/fixtures/expose-service/provider-files/kubernetes-expose-true.json vendored
View File

@ -138,7 +138,10 @@
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"rules": [

5
script/test/fixtures/expose-service/provider-files/openshift-expose-hostname-multiple-ports.json vendored
View File

@ -256,7 +256,10 @@
"apiVersion": "v1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"host": "batman.example.com",

5
script/test/fixtures/expose-service/provider-files/openshift-expose-hostname.json vendored
View File

@ -248,7 +248,10 @@
"apiVersion": "v1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"host": "batman.example.com",

5
script/test/fixtures/expose-service/provider-files/openshift-expose-true-multiple-ports.json vendored
View File

@ -256,7 +256,10 @@
"apiVersion": "v1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"host": "",

5
script/test/fixtures/expose-service/provider-files/openshift-expose-true.json vendored
View File

@ -248,7 +248,10 @@
"apiVersion": "v1",
"metadata": {
"name": "web",
"creationTimestamp": null
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"host": "",