Merge pull request #1070 from aledbf/update

Update go dependencies to k8s v1.18.0

Makefile

@@ -40,7 +40,7 @@ ARCH ?= amd64
 ALL_ARCH := amd64
 
 # Image to use for building.
-BUILD_IMAGE ?= golang:1.12.3-alpine
+BUILD_IMAGE ?= golang:1.13.9-alpine
 # Containers will be named: $(CONTAINER_PREFIX)-$(BINARY)-$(ARCH):$(VERSION).
 CONTAINER_PREFIX ?= ingress-gce
 

cmd/e2e-test/backend_config_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package main
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"testing"
@@ -116,7 +117,7 @@ func TestBackendConfigNegatives(t *testing.T) {
 
 			t.Logf("Waiting %v for warning event to be emitted", eventPollTimeout)
 			if err := wait.Poll(eventPollInterval, eventPollTimeout, func() (bool, error) {
-				events, err := Framework.Clientset.CoreV1().Events(s.Namespace).List(metav1.ListOptions{})
+				events, err := Framework.Clientset.CoreV1().Events(s.Namespace).List(context.TODO(), metav1.ListOptions{})
 				if err != nil {
 					return false, fmt.Errorf("error in listing events: %s", err)
 				}

cmd/e2e-test/customrequestheaders_test.go

@@ -74,7 +74,7 @@ func TestCustomRequestHeaders(t *testing.T) {
 			}
 			t.Logf("Echo service created (%s/%s)", s.Namespace, "service-1")
 
-			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(ing); err != nil {
+			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(context.TODO(), ing, metav1.CreateOptions{}); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}
 			t.Logf("Ingress created (%s/%s)", s.Namespace, ing.Name)
@@ -98,7 +98,7 @@ func TestCustomRequestHeaders(t *testing.T) {
 			}
 
 			// Wait for GCLB resources to be deleted.
-			if err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Delete(ing.Name, &metav1.DeleteOptions{}); err != nil {
+			if err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Delete(context.TODO(), ing.Name, metav1.DeleteOptions{}); err != nil {
 				t.Errorf("Delete(%q) = %v, want nil", ing.Name, err)
 			}
 

cmd/e2e-test/ilb_test.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"k8s.io/api/networking/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/ingress-gce/pkg/annotations"
 	"k8s.io/ingress-gce/pkg/e2e"
@@ -97,7 +98,7 @@ func TestILB(t *testing.T) {
 			}
 			t.Logf("Echo service created (%s/%s)", s.Namespace, serviceName)
 
-			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(tc.ing); err != nil {
+			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(context.TODO(), tc.ing, metav1.CreateOptions{}); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}
 			t.Logf("Ingress created (%s/%s)", s.Namespace, tc.ing.Name)
@@ -243,7 +244,7 @@ func TestILBHttps(t *testing.T) {
 			}
 			t.Logf("Echo service created (%s/%s)", s.Namespace, serviceName)
 
-			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(ing); err != nil {
+			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(context.TODO(), ing, metav1.CreateOptions{}); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}
 			t.Logf("Ingress created (%s/%s)", s.Namespace, ing.Name)
@@ -384,7 +385,7 @@ func TestILBUpdate(t *testing.T) {
 			}
 			t.Logf("Echo service created (%s/%s)", s.Namespace, serviceName)
 
-			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(tc.ing); err != nil {
+			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(context.TODO(), tc.ing, metav1.CreateOptions{}); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}
 			t.Logf("Ingress created (%s/%s)", s.Namespace, tc.ing.Name)
@@ -418,7 +419,7 @@ func TestILBUpdate(t *testing.T) {
 			}
 
 			// Perform update
-			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Update(tc.ingUpdate); err != nil {
+			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Update(context.TODO(), tc.ingUpdate, metav1.UpdateOptions{}); err != nil {
 				t.Fatalf("error updating ingress spec: %v", err)
 			}
 
@@ -492,7 +493,7 @@ func TestILBError(t *testing.T) {
 			}
 			t.Logf("Echo service created (%s/%s)", s.Namespace, serviceName)
 
-			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(tc.ing); err != nil {
+			if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(context.TODO(), tc.ing, metav1.CreateOptions{}); err != nil {
 				t.Fatalf("error creating Ingress spec: %v", err)
 			}
 			t.Logf("Ingress created (%s/%s)", s.Namespace, tc.ing.Name)
@@ -582,7 +583,7 @@ func TestILBShared(t *testing.T) {
 
 				t.Logf("Ingress = %s", ing.String())
 
-				if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(ing); err != nil {
+				if _, err := Framework.Clientset.NetworkingV1beta1().Ingresses(s.Namespace).Create(context.TODO(), ing, metav1.CreateOptions{}); err != nil {
 					t.Fatalf("error creating Ingress spec: %v", err)
 				}
 				t.Logf("Ingress created (%s/%s)", s.Namespace, ing.Name)

cmd/fuzzer/app/validate.go

@@ -127,7 +127,7 @@ func Validate() {
 	fmt.Printf("Features = %v\n\n", fsNames)
 
 	k8s := k8sClientSet(config)
-	ing, err := k8s.NetworkingV1beta1().Ingresses(validateOptions.ns).Get(validateOptions.name, metav1.GetOptions{})
+	ing, err := k8s.NetworkingV1beta1().Ingresses(validateOptions.ns).Get(context.TODO(), validateOptions.name, metav1.GetOptions{})
 	if err != nil {
 		panic(err)
 	}

cmd/glbc/app/init.go

@@ -17,6 +17,7 @@ limitations under the License.
 package app
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -87,7 +88,7 @@ func waitForServicePort(client kubernetes.Interface, name types.NamespacedName,
 
 	err := wait.Poll(3*time.Second, 5*time.Minute, func() (bool, error) {
 		var err error
-		svc, err = client.CoreV1().Services(name.Namespace).Get(name.Name, meta_v1.GetOptions{})
+		svc, err = client.CoreV1().Services(name.Namespace).Get(context.TODO(), name.Name, meta_v1.GetOptions{})
 		if err != nil {
 			klog.V(4).Infof("Error getting service %v", name.String())
 			return false, nil

cmd/glbc/app/namer.go

@@ -17,6 +17,7 @@ limitations under the License.
 package app
 
 import (
+	"context"
 	"crypto/rand"
 	"fmt"
 	"time"
@@ -160,7 +161,7 @@ func getClusterUID(kubeClient kubernetes.Interface, name string) (string, error)
 	}
 
 	// Check if the cluster has an Ingress with ip
-	ings, err := kubeClient.ExtensionsV1beta1().Ingresses(metav1.NamespaceAll).List(metav1.ListOptions{
+	ings, err := kubeClient.ExtensionsV1beta1().Ingresses(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{
 		LabelSelector: labels.Everything().String(),
 	})
 	if err != nil {

cmd/glbc/main.go

@@ -134,7 +134,7 @@ func main() {
 	}
 
 	// Get kube-system UID that will be used for v2 frontend naming scheme.
-	kubeSystemNS, err := kubeClient.CoreV1().Namespaces().Get("kube-system", metav1.GetOptions{})
+	kubeSystemNS, err := kubeClient.CoreV1().Namespaces().Get(context.TODO(), "kube-system", metav1.GetOptions{})
 	if err != nil {
 		klog.Fatalf("Error getting kube-system namespace: %v", err)
 	}

go.mod

@@ -1,99 +1,59 @@
 module k8s.io/ingress-gce
 
-go 1.12
+go 1.13
 
 require (
 	github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200203062548-7bdc6cbb875a
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/beorn7/perks v1.0.0 // indirect
-	github.com/emicklei/go-restful v2.9.3+incompatible // indirect
-	github.com/go-openapi/spec v0.19.0
-	github.com/go-openapi/swag v0.19.0 // indirect
+	github.com/go-openapi/spec v0.19.3
 	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
 	github.com/google/go-cmp v0.3.0
 	github.com/googleapis/gnostic v0.2.0 // indirect
 	github.com/imdario/mergo v0.3.7 // indirect
 	github.com/kr/pretty v0.1.0
-	github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983 // indirect
-	github.com/mdempsky/maligned v0.0.0-20180708014732-6e39bd26a8c8 // indirect
 	github.com/prometheus/client_golang v1.0.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.4.0
-	github.com/tsenart/deadcode v0.0.0-20160724212837-210d2dc333e9 // indirect
 	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
 	google.golang.org/api v0.17.1-0.20200224000813-c3b745b3f301
 	gopkg.in/gcfg.v1 v1.2.3 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	istio.io/api v0.0.0-20190809125725-591cf32c1d0e
-	k8s.io/api v0.17.0
+	k8s.io/api v0.18.0
 	k8s.io/apiextensions-apiserver v0.0.0
-	k8s.io/apimachinery v0.17.0
-	k8s.io/client-go v0.17.0
-	k8s.io/cloud-provider v0.17.0
-	k8s.io/component-base v0.17.0
+	k8s.io/apimachinery v0.18.0
+	k8s.io/apiserver v0.18.0
+	k8s.io/client-go v0.18.0
+	k8s.io/cloud-provider v0.18.0
+	k8s.io/component-base v0.18.0
 	k8s.io/klog v1.0.0
-	k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
-	k8s.io/kubernetes v1.15.0
+	k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
+	k8s.io/kubernetes v1.18.0
 	k8s.io/legacy-cloud-providers v0.0.0
-	k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
+	k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
 )
 
 replace (
 	cloud.google.com/go => cloud.google.com/go v0.37.4
 	github.com/GoogleCloudPlatform/k8s-cloud-provider => github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20200203062548-7bdc6cbb875a
-	github.com/PuerkitoBio/purell => github.com/PuerkitoBio/purell v1.1.1
-	github.com/beorn7/perks => github.com/beorn7/perks v1.0.0
-	github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.9.3+incompatible
-	github.com/evanphx/json-patch => github.com/evanphx/json-patch v4.1.0+incompatible
-	github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.0
-	github.com/go-openapi/swag => github.com/go-openapi/swag v0.19.0
-	github.com/gogo/protobuf => github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48
-	github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef
-	github.com/golang/protobuf => github.com/golang/protobuf v1.3.1
-	github.com/google/gofuzz => github.com/google/gofuzz v1.0.0
-	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.2.0
-	github.com/hashicorp/golang-lru => github.com/hashicorp/golang-lru v0.5.1
-	github.com/imdario/mergo => github.com/imdario/mergo v0.3.7
-	github.com/json-iterator/go => github.com/json-iterator/go v1.1.6
-	github.com/kr/pretty => github.com/kr/pretty v0.1.0
-	github.com/mailru/easyjson => github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983
-	github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
-	github.com/prometheus/client_model => github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
-	github.com/prometheus/common => github.com/prometheus/common v0.3.0
-	github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.0-20190416084830-8368d24ba045
-	github.com/spf13/pflag => github.com/spf13/pflag v1.0.3
-	go.opencensus.io => go.opencensus.io v0.20.2
-	golang.org/x/crypto => golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd
-	golang.org/x/net => golang.org/x/net v0.0.0-20190420063019-afa5a82059c6
-	golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
-	golang.org/x/sys => golang.org/x/sys v0.0.0-20190422165155-953cdadca894
-	golang.org/x/time => golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
-	google.golang.org/api => google.golang.org/api v0.17.1-0.20200224000813-c3b745b3f301
-	gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.3
-	gopkg.in/inf.v0 => gopkg.in/inf.v0 v0.9.1
-	gopkg.in/warnings.v0 => gopkg.in/warnings.v0 v0.1.2
-	gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.2.2
-	k8s.io/api => k8s.io/api v0.0.0-20190620085002-8f739060a0b3
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190620085550-3a2f62f126c9
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190620085203-5d32fb3b42f4
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190620085659-429467d76d0e
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085041-d697df55dbe9
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191114112026-556fa5a14fdf
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190620090010-a60497bb9ffa
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20190620085131-4cd66be69262
-	k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190531030430-6117653b35f1
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190620090114-816aa063c73d
-	k8s.io/klog => k8s.io/klog v1.0.0
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190620085316-c835efc41000
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190620085943-52018c8ce3c1
-	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190620085811-cc0b23ba60a9
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190620085909-5dfb14b3a101
-	k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190620085837-98477dc0c87c
-	k8s.io/kubernetes => k8s.io/kubernetes v1.15.0
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20191210234026-b5fed2ccee23
-	k8s.io/metrics => k8s.io/metrics v0.0.0-20190620085627-5b02f62e9559
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190620085357-8191e314a1f7
+	k8s.io/api => k8s.io/api v0.18.0
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
+	k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
+	k8s.io/apiserver => k8s.io/apiserver v0.18.0
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
+	k8s.io/client-go => k8s.io/client-go v0.18.0
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
+	k8s.io/code-generator => k8s.io/code-generator v0.18.0
+	k8s.io/component-base => k8s.io/component-base v0.18.0
+	k8s.io/cri-api => k8s.io/cri-api v0.18.0
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
+	k8s.io/kubectl => k8s.io/kubectl v0.18.0
+	k8s.io/kubelet => k8s.io/kubelet v0.18.0
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
+	k8s.io/metrics => k8s.io/metrics v0.18.0
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
 )