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

Abstracted port checking function

Browse Source 
To reduce the inconsistency of message printing created a
function which can be called from both kubernetes and openshift
This commit is contained in:
Suraj Deshmukh 2016-08-16 11:25:27 +05:30
parent 2fd923ce49
commit c281bfdda8
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/transformer/kubernetes/k8sutils.go
View File

@ -213,3 +213,12 @@ func convertToVersion(objs []runtime.Object) ([]runtime.Object, error) {
return ret, nil
}
func PortsExist(name string, service kobject.ServiceConfig) bool {
if len(service.Port) == 0 {
logrus.Warningf("[%s] Service cannot be created because of missing port.", name)
return false
} else {
return true
}
}

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

@ -314,11 +314,10 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
}
// If ports not provided in configuration we will not make service
if len(ports) == 0 {
logrus.Warningf("[%s] Service cannot be created because of missing port.", name)
} else {
if PortsExist(name, service) {
objects = append(objects, sc)
}
allobjects = append(allobjects, objects...)
}

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

@ -153,9 +153,7 @@ func (k *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
}
// If ports not provided in configuration we will not make service
if len(ports) == 0 {
logrus.Warningf("[%s] Service cannot be created because of missing port.", name)
} else {
if kubernetes.PortsExist(name, service) {
objects = append(objects, sc)
}
allobjects = append(allobjects, objects...)