From 852078cc5c12f33e14ac9ae55a70dc548f8a9a07 Mon Sep 17 00:00:00 2001 From: Hang Yan Date: Fri, 27 Apr 2018 03:11:24 +0800 Subject: [PATCH] Remove incorrect logging about headless service (#991) --- pkg/transformer/kubernetes/k8sutils.go | 9 ++------- pkg/transformer/kubernetes/kubernetes.go | 2 +- pkg/transformer/openshift/openshift.go | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/pkg/transformer/kubernetes/k8sutils.go b/pkg/transformer/kubernetes/k8sutils.go index fb8262ac..d84cb43c 100644 --- a/pkg/transformer/kubernetes/k8sutils.go +++ b/pkg/transformer/kubernetes/k8sutils.go @@ -284,13 +284,8 @@ func convertToVersion(obj runtime.Object, groupVersion unversioned.GroupVersion) } // PortsExist checks if service has ports defined -func (k *Kubernetes) PortsExist(name string, service kobject.ServiceConfig) bool { - if len(service.Port) == 0 { - log.Debugf("[%s] No ports defined. Headless service will be created.", name) - return false - } - return true - +func (k *Kubernetes) PortsExist(service kobject.ServiceConfig) bool { + return len(service.Port) != 0 } // CreateService creates a k8s service diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 24ca6294..688bb27e 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -727,7 +727,7 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject. objects = k.CreateKubernetesObjects(name, service, opt) } - if k.PortsExist(name, service) { + if k.PortsExist(service) { svc := k.CreateService(name, service, objects) objects = append(objects, svc) diff --git a/pkg/transformer/openshift/openshift.go b/pkg/transformer/openshift/openshift.go index fcc04e57..af5dcaaf 100644 --- a/pkg/transformer/openshift/openshift.go +++ b/pkg/transformer/openshift/openshift.go @@ -386,7 +386,7 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C } - if o.PortsExist(name, service) { + if o.PortsExist(service) { svc := o.CreateService(name, service, objects) objects = append(objects, svc)