diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index f673d645..d8a6a1c8 100755 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -453,8 +453,9 @@ func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, por APIVersion: "extensions/v1beta1", }, ObjectMeta: api.ObjectMeta{ - Name: name, - Labels: transformer.ConfigLabels(name), + Name: name, + Labels: transformer.ConfigLabels(name), + Annotations: transformer.ConfigAnnotations(service), }, Spec: extensions.IngressSpec{ Rules: make([]extensions.IngressRule, len(hosts)), 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 f9202b0b..8f998855 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 @@ -192,6 +192,11 @@ "creationTimestamp": null, "labels": { "io.kompose.service": "web" + }, + "annotations": { + "kompose.cmd": "%CMD%", + "kompose.service.expose": "batman.example.com", + "kompose.version": "%VERSION%" } }, "spec": { diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-tls.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-tls.json index 6055082d..871db4e9 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-tls.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-hostname-tls.json @@ -187,6 +187,12 @@ "creationTimestamp": null, "labels": { "io.kompose.service": "web" + }, + "annotations": { + "kompose.cmd": "%CMD%", + "kompose.service.expose": "batman.example.com", + "kompose.service.expose.tls-secret": "test-secret", + "kompose.version": "%VERSION%" } }, "spec": { 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 41d69e3f..cc59dc6b 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 @@ -184,6 +184,11 @@ "creationTimestamp": null, "labels": { "io.kompose.service": "web" + }, + "annotations": { + "kompose.cmd": "%CMD%", + "kompose.service.expose": "batman.example.com", + "kompose.version": "%VERSION%" } }, "spec": { diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname-tls.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname-tls.json index 5f2810e0..b32e4de5 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname-tls.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname-tls.json @@ -187,6 +187,12 @@ "creationTimestamp": null, "labels": { "io.kompose.service": "web" + }, + "annotations": { + "kompose.cmd": "%CMD%", + "kompose.service.expose": "batman.example.com,batwoman.example.com", + "kompose.service.expose.tls-secret": "test-secret", + "kompose.version": "%VERSION%" } }, "spec": { diff --git a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname.json b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname.json index 1ad9b514..dcce9000 100644 --- a/script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname.json +++ b/script/test/fixtures/expose-service/provider-files/kubernetes-expose-multiple-hostname.json @@ -184,6 +184,11 @@ "creationTimestamp": null, "labels": { "io.kompose.service": "web" + }, + "annotations": { + "kompose.cmd": "%CMD%", + "kompose.service.expose": " batman.example.com/home ,, batwoman.example.com ", + "kompose.version": "%VERSION%" } }, "spec": { 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 2fcc0e91..cb4e3188 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 @@ -192,6 +192,11 @@ "creationTimestamp": null, "labels": { "io.kompose.service": "web" + }, + "annotations": { + "kompose.cmd": "%CMD%", + "kompose.service.expose": "True", + "kompose.version": "%VERSION%" } }, "spec": { 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 e6a2c6c8..656b28c3 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 @@ -184,6 +184,11 @@ "creationTimestamp": null, "labels": { "io.kompose.service": "web" + }, + "annotations": { + "kompose.cmd": "%CMD%", + "kompose.service.expose": "True", + "kompose.version": "%VERSION%" } }, "spec": {