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

add missing 'io.kompose.service' label to Route and Ingress

Browse Source 
This was caussing 'kompose down' not to delete Route and Ingress
This commit is contained in:
Tomas Kral 2017-03-24 14:22:42 +01:00
parent 3c3ae9807a
commit f8da61436e
No known key found for this signature in database
GPG Key ID: E690DA7E4F291FA6
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", APIVersion: "extensions/v1beta1",
}, },
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: name, Name: name,
Labels: transformer.ConfigLabels(name),
}, },
Spec: extensions.IngressSpec{ Spec: extensions.IngressSpec{
Rules: []extensions.IngressRule{ Rules: []extensions.IngressRule{

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

@ -280,7 +280,8 @@ func (o *OpenShift) initRoute(name string, service kobject.ServiceConfig, port i
APIVersion: "v1", APIVersion: "v1",
}, },
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
Name: name, Name: name,
Labels: transformer.ConfigLabels(name),
}, },
Spec: routeapi.RouteSpec{ Spec: routeapi.RouteSpec{
Port: &routeapi.RoutePort{ 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", "apiVersion": "extensions/v1beta1",
"metadata": { "metadata": {
"name": "web", "name": "web",
"creationTimestamp": null "creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
}, },
"spec": { "spec": {
"rules": [ "rules": [

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

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

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

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

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

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

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

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