Merge pull request #1880 from aledbf/master

Update go dependencies and cleanup deprecated packages
kubernetes · Jan 7, 2018 · 983b994 · 983b994
2 parents a09527c + c795447
commit 983b994
Show file tree

Hide file tree

Showing 1,208 changed files with 84,099 additions and 32,965 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -61,10 +61,6 @@
   branch = "master"
   name = "github.com/paultag/sniff"
 
-[[constraint]]
-  name = "github.com/pborman/uuid"
-  version = "1.1.0"
-
 [[constraint]]
   name = "github.com/pkg/errors"
   version = "0.8.0"
@@ -95,16 +91,16 @@
 
 [[constraint]]
   name = "k8s.io/api"
-  branch = "release-1.8"
+  branch = "release-1.9"
 
 [[constraint]]
   name = "k8s.io/apimachinery"
-  branch = "release-1.8"
+  branch = "release-1.9"
 
 [[constraint]]
   name = "k8s.io/client-go"
-  version = "v5.0.1"
+  version = "v6.0.0"
 
 [[constraint]]
   name = "k8s.io/kubernetes"
-  version = "v1.8.3"
+  version = "v1.9.0"
diff --git a/internal/ingress/controller/backend_ssl_test.go b/internal/ingress/controller/backend_ssl_test.go
@@ -31,7 +31,6 @@ import (
 	"k8s.io/ingress-nginx/internal/ingress"
 	"k8s.io/ingress-nginx/internal/ingress/store"
 	"k8s.io/ingress-nginx/internal/task"
-	"k8s.io/kubernetes/pkg/api"
 )
 
 const (
@@ -76,7 +75,7 @@ func buildSecretForBackendSSL() *apiv1.Secret {
 	return &apiv1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "foo_secret",
-			Namespace: api.NamespaceDefault,
+			Namespace: metav1.NamespaceDefault,
 		},
 	}
 }
@@ -153,8 +152,8 @@ func TestSyncSecret(t *testing.T) {
 		Data          map[string][]byte
 		expectSuccess bool
 	}{
-		{"getPemCertificate_error", "default/foo_secret", map[string][]byte{api.TLSPrivateKeyKey: dKey}, false},
-		{"normal_test", "default/foo_secret", map[string][]byte{api.TLSCertKey: dCrt, api.TLSPrivateKeyKey: dKey, tlscaName: dCa}, true},
+		{"getPemCertificate_error", "default/foo_secret", map[string][]byte{apiv1.TLSPrivateKeyKey: dKey}, false},
+		{"normal_test", "default/foo_secret", map[string][]byte{apiv1.TLSCertKey: dCrt, apiv1.TLSPrivateKeyKey: dKey, tlscaName: dCa}, true},
 	}
 
 	for _, foo := range foos {
@@ -200,12 +199,12 @@ func TestGetPemCertificate(t *testing.T) {
 	}{
 		{"sceret_not_exist", "default/foo_secret_not_exist", nil, true},
 		{"data_not_complete_all_not_exist", "default/foo_secret", map[string][]byte{}, true},
-		{"data_not_complete_TLSCertKey_not_exist", "default/foo_secret", map[string][]byte{api.TLSPrivateKeyKey: dKey, tlscaName: dCa}, false},
-		{"data_not_complete_TLSCertKeyAndCA_not_exist", "default/foo_secret", map[string][]byte{api.TLSPrivateKeyKey: dKey}, true},
-		{"data_not_complete_TLSPrivateKeyKey_not_exist", "default/foo_secret", map[string][]byte{api.TLSCertKey: dCrt, tlscaName: dCa}, false},
-		{"data_not_complete_TLSPrivateKeyKeyAndCA_not_exist", "default/foo_secret", map[string][]byte{api.TLSCertKey: dCrt}, true},
-		{"data_not_complete_CA_not_exist", "default/foo_secret", map[string][]byte{api.TLSCertKey: dCrt, api.TLSPrivateKeyKey: dKey}, false},
-		{"normal_test", "default/foo_secret", map[string][]byte{api.TLSCertKey: dCrt, api.TLSPrivateKeyKey: dKey, tlscaName: dCa}, false},
+		{"data_not_complete_TLSCertKey_not_exist", "default/foo_secret", map[string][]byte{apiv1.TLSPrivateKeyKey: dKey, tlscaName: dCa}, false},
+		{"data_not_complete_TLSCertKeyAndCA_not_exist", "default/foo_secret", map[string][]byte{apiv1.TLSPrivateKeyKey: dKey}, true},
+		{"data_not_complete_TLSPrivateKeyKey_not_exist", "default/foo_secret", map[string][]byte{apiv1.TLSCertKey: dCrt, tlscaName: dCa}, false},
+		{"data_not_complete_TLSPrivateKeyKeyAndCA_not_exist", "default/foo_secret", map[string][]byte{apiv1.TLSCertKey: dCrt}, true},
+		{"data_not_complete_CA_not_exist", "default/foo_secret", map[string][]byte{apiv1.TLSCertKey: dCrt, apiv1.TLSPrivateKeyKey: dKey}, false},
+		{"normal_test", "default/foo_secret", map[string][]byte{apiv1.TLSCertKey: dCrt, apiv1.TLSPrivateKeyKey: dKey, tlscaName: dCa}, false},
 	}
 
 	for _, foo := range foos {

diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go
@@ -31,7 +31,6 @@ import (
 
 	apiv1 "k8s.io/api/core/v1"
 	extensions "k8s.io/api/extensions/v1beta1"
-	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
 	clientset "k8s.io/client-go/kubernetes"
@@ -55,15 +54,6 @@ const (
 	rootLocation    = "/"
 )
 
-var (
-	cloner *conversion.Cloner
-)
-
-func init() {
-	cloner := conversion.NewCloner()
-	cloner.RegisterDeepCopyFunc(ingress.GetGeneratedDeepCopyFuncs)
-}
-
 // Configuration contains all the settings required by an Ingress controller
 type Configuration struct {
 	APIServerHost  string
@@ -554,17 +544,12 @@ func (n *NGINXController) getBackendServers(ingresses []*extensions.Ingress) ([]
 							if len(endps) > 0 {
 								glog.V(3).Infof("using custom default backend in server %v location %v (service %v/%v)",
 									server.Hostname, location.Path, location.DefaultBackend.Namespace, location.DefaultBackend.Name)
-								b, err := cloner.DeepCopy(upstream)
-								if err != nil {
-									glog.Errorf("unexpected error copying Upstream: %v", err)
-								} else {
-									name := fmt.Sprintf("custom-default-backend-%v", upstream.Name)
-									nb := b.(*ingress.Backend)
-									nb.Name = name
-									nb.Endpoints = endps
-									aUpstreams = append(aUpstreams, nb)
-									location.Backend = name
-								}
+								nb := upstream.DeepCopy()
+								name := fmt.Sprintf("custom-default-backend-%v", upstream.Name)
+								nb.Name = name
+								nb.Endpoints = endps
+								aUpstreams = append(aUpstreams, nb)
+								location.Backend = name
 							}
 						}
 					}