Merge pull request #193 from bowei/vendor

Update vendor/ to support multiple TLS certificates interface

Gopkg.toml

@@ -24,9 +24,11 @@ ignored = ["k8s.io/kubernetes/pkg/api"]
 
 [[constraint]]
   name = "k8s.io/api"
-  # We are currently vendoring a non-released k8s version. This should go away
-  # once the symbol has been released.
-  revision = "02509811a0e5c1e5bb0656e31ec861da05cd801c"
+  revision = "release-1.10"
+
+[[constraint]]
+  name = "k8s.io/apiserver"
+  revision = "release-1.10"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
@@ -38,14 +40,23 @@ ignored = ["k8s.io/kubernetes/pkg/api"]
 
 [[constraint]]
   name = "k8s.io/kubernetes"
-  revision = "7652c252d4ce2aea1563853bef0438769c5781fd"
-
-[[constraint]]
+  revision = "9c40f5b5a622c61c2e37efd37bf136d174d6799a"
+
+# This needs to be an override as it is a non-direct dependency and will not be
+# considered by `dep` as a constraint.
+#
+# Kubernetes is currently vendoring a non-released version. One of the
+# symbols needed is no longer there in the released tag.
+[[override]]
   name = "github.com/docker/distribution"
-  # Kubernetes is currently vendoring a non-released version. One of the
-  # symbols needed is not longer there in the released tag.
   revision = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
 
+# This needs to be an override as it is a non-direct dependency and will not be
+# considered by `dep` as a constraint.
+[[override]]
+  name = "google.golang.org/api"
+  revision = "7f657476956314fee258816aaf81c0ff65cf8bee"
+
 [[constraint]]
   name = "github.com/opencontainers/go-digest"
   version = "1.0.0-rc1"

pkg/loadbalancers/fakes.go

@@ -335,7 +335,12 @@ func (f *FakeLoadBalancers) SetUrlMapForTargetHttpsProxy(proxy *compute.TargetHt
 }
 
 // SetSslCertificateForTargetHttpsProxy fakes out setting certificates.
-func (f *FakeLoadBalancers) SetSslCertificateForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, SSLCert *compute.SslCertificate) error {
+func (f *FakeLoadBalancers) SetSslCertificateForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, certs []*compute.SslCertificate) error {
+	if len(certs) != 1 {
+		return fmt.Errorf("can only take one cert, got %v", certs)
+	}
+	SSLCert := certs[0]
+
 	f.calls = append(f.calls, "SetSslCertificateForTargetHttpsProxy")
 	found := false
 	for i := range f.Tps {

pkg/loadbalancers/interfaces.go

@@ -51,7 +51,7 @@ type LoadBalancers interface {
 	CreateTargetHttpsProxy(proxy *compute.TargetHttpsProxy) error
 	DeleteTargetHttpsProxy(name string) error
 	SetUrlMapForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, urlMap *compute.UrlMap) error
-	SetSslCertificateForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, SSLCerts *compute.SslCertificate) error
+	SetSslCertificateForTargetHttpsProxy(proxy *compute.TargetHttpsProxy, SSLCerts []*compute.SslCertificate) error
 
 	// SslCertificates
 	GetSslCertificate(name string) (*compute.SslCertificate, error)

pkg/loadbalancers/l7.go

@@ -360,7 +360,7 @@ func (l *L7) checkHttpsProxy() (err error) {
 	if !utils.CompareLinks(cert, l.sslCert.SelfLink) {
 		glog.Infof("Https proxy %v has the wrong ssl certs, setting %v overwriting %v",
 			proxy.Name, l.sslCert.SelfLink, cert)
-		if err := l.cloud.SetSslCertificateForTargetHttpsProxy(proxy, l.sslCert); err != nil {
+		if err := l.cloud.SetSslCertificateForTargetHttpsProxy(proxy, []*compute.SslCertificate{l.sslCert}); err != nil {
 			return err
 		}
 	}