implement expose service, add tests, fix #140

Implements a kompose specific docker compose label "kompose.service.expose" which can be used to expose the specified services externally. The accepted values are of type string.
If the value is set to "true", the provider sets the endpoint automatically, and for any other value, the value is set as the hostname. If multiple ports are defined in a service, the first one is chosen to be the exposed.

Unit tests, functional tests, glide updates and docs have also been added in this commit for the related feature.
This commit is contained in:
Shubham Minglani
2016-12-21 20:00:38 +05:30
parent 48e3ba88cd
commit 7e378cd546
174 changed files with 10380 additions and 32848 deletions
+48
View File
@@ -38,7 +38,9 @@ import (
deployapi "github.com/openshift/origin/pkg/deploy/api"
deploymentconfigreaper "github.com/openshift/origin/pkg/deploy/cmd"
imageapi "github.com/openshift/origin/pkg/image/api"
routeapi "github.com/openshift/origin/pkg/route/api"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/util/intstr"
)
type OpenShift struct {
@@ -156,6 +158,34 @@ func (o *OpenShift) initDeploymentConfig(name string, service kobject.ServiceCon
return dc
}
func (o *OpenShift) initRoute(name string, service kobject.ServiceConfig, port int32) *routeapi.Route {
route := &routeapi.Route{
TypeMeta: unversioned.TypeMeta{
Kind: "Route",
APIVersion: "v1",
},
ObjectMeta: api.ObjectMeta{
Name: name,
},
Spec: routeapi.RouteSpec{
Port: &routeapi.RoutePort{
TargetPort: intstr.IntOrString{
IntVal: port,
},
},
To: routeapi.RouteTargetReference{
Kind: "Service",
Name: name,
},
},
}
if service.ExposeService != "true" {
route.Spec.Host = service.ExposeService
}
return route
}
// Transform maps komposeObject to openshift objects
// returns objects that are already sorted in the way that Services are first
func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) []runtime.Object {
@@ -186,6 +216,10 @@ func (o *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
if o.PortsExist(name, service) {
svc := o.CreateService(name, service, objects)
objects = append(objects, svc)
if service.ExposeService != "" {
objects = append(objects, o.initRoute(name, service, svc.Spec.Ports[0].Port))
}
}
}
o.UpdateKubernetesObjects(name, service, &objects)
@@ -257,6 +291,12 @@ func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.Conv
return err
}
logrus.Infof("Successfully created PersistentVolumeClaim: %s", t.Name)
case *routeapi.Route:
_, err := oclient.Routes(namespace).Create(t)
if err != nil {
return err
}
logrus.Infof("Successfully created Route: %s", t.Name)
}
}
@@ -323,6 +363,14 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
} else {
logrus.Infof("Successfully deleted PersistentVolumeClaim: %s", t.Name)
}
case *routeapi.Route:
// delete route
err = oclient.Routes(namespace).Delete(t.Name)
if err != nil {
return err
} else {
logrus.Infof("Successfully deleted Route: %s", t.Name)
}
}
}
return nil
@@ -61,3 +61,34 @@ func TestInitDeploymentConfig(t *testing.T) {
t.Errorf("Expected myfoobarname for name, actual %s", spec.Spec.Triggers[1].ImageChangeParams.ContainerNames[0])
}
}
func TestKomposeConvertRoute(t *testing.T) {
o := OpenShift{}
name := "app"
sc := newServiceConfig()
sc.ExposeService = "true"
var port int32 = 5555
route := o.initRoute(name, sc, port)
if route.ObjectMeta.Name != name {
t.Errorf("Expected %s for name, actual %s", name, route.ObjectMeta.Name)
}
if route.Spec.To.Name != name {
t.Errorf("Expected %s for name, actual %s", name, route.Spec.To.Name)
}
if route.Spec.Port.TargetPort.IntVal != port {
t.Errorf("Expected %d for port, actual %d", port, route.Spec.Port.TargetPort.IntVal)
}
if route.Spec.Host != "" {
t.Errorf("Expected Spec.Host to not be set, got %s instead", route.Spec.Host)
}
sc.ExposeService = "example.com"
route = o.initRoute(name, sc, port)
if route.Spec.Host != sc.ExposeService {
t.Errorf("Expected %s for Spec.Host, actual %s", sc.ExposeService, route.Spec.Host)
}
}