Check for PublishMode=="ingress" before configuring ELB

Signed-off-by: Madhu Venugopal <[email protected]>

Author: mavenugo

pkg/loadbalancer/docker.go

@@ -3,17 +3,18 @@ package loadbalancer
 import (
 	"crypto/tls"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/engine-api/client"
-	"github.com/docker/go-connections/sockets"
-	"github.com/docker/go-connections/tlsconfig"
 	"net/http"
 	"os"
 	"runtime"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/client"
+	"github.com/docker/go-connections/sockets"
+	"github.com/docker/go-connections/tlsconfig"
 )
 
 const (
-	clientVersion = "1.24"
+	clientVersion = "1.25"
 )
 
 // NewDockerClient creates a new API client.

pkg/loadbalancer/info.go

@@ -2,7 +2,7 @@ package loadbalancer
 
 import (
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/engine-api/client"
+	"github.com/docker/docker/client"
 	"golang.org/x/net/context"
 )
 

pkg/loadbalancer/listener.go

@@ -2,11 +2,12 @@ package loadbalancer
 
 import (
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/engine-api/types/swarm"
 	"net/url"
 	"strconv"
 	"strings"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/docker/docker/api/types/swarm"
 )
 
 type listener struct {
@@ -131,7 +132,7 @@ func listenersFromExposedPorts(service swarm.Service) []*listener {
 	requestedPublishPorts := map[uint32]uint32{} // key - target port Y (app/container port), value = publish port X
 	if service.Spec.EndpointSpec != nil {
 		for _, p := range service.Spec.EndpointSpec.Ports {
-			if p.PublishedPort > 0 {
+			if p.PublishedPort > 0 && strings.EqualFold(string(p.PublishMode), "ingress") {
 				// Only if the user has specify the desired publish port
 				requestedPublishPorts[p.TargetPort] = p.PublishedPort
 			}

pkg/loadbalancer/listener_test.go

@@ -1,7 +1,7 @@
 package loadbalancer
 
 import (
-	"github.com/docker/engine-api/types/swarm"
+	"github.com/docker/docker/types/swarm"
 	"github.com/stretchr/testify/require"
 	"testing"
 )

pkg/loadbalancer/poll.go

@@ -2,9 +2,9 @@ package loadbalancer
 
 import (
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/engine-api/client"
-	"github.com/docker/engine-api/types"
-	"github.com/docker/engine-api/types/swarm"
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/swarm"
+	"github.com/docker/docker/client"
 	"golang.org/x/net/context"
 	"reflect"
 	"sync"

pkg/loadbalancer/poll_test.go

@@ -1,8 +1,8 @@
 package loadbalancer
 
 import (
-	mock_client "github.com/docker/editions/mock/docker/engine-api/client"
-	"github.com/docker/engine-api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
+	mock_client "github.com/docker/editions/mock/docker/docker/client"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/context"

pkg/loadbalancer/services.go

@@ -3,7 +3,7 @@ package loadbalancer
 import (
 	"fmt"
 	log "github.com/Sirupsen/logrus"
-	"github.com/docker/engine-api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 	"time"
 )
 

pkg/loadbalancer/services_test.go

@@ -1,7 +1,7 @@
 package loadbalancer
 
 import (
-	"github.com/docker/engine-api/types/swarm"
+	"github.com/docker/docker/api/types/swarm"
 	"github.com/stretchr/testify/require"
 	"testing"
 )