Update client-go methods with new context and update options

kubernetes · Apr 7, 2020 · 4edc7d9 · 4edc7d9
1 parent 14d1356
commit 4edc7d9
Show file tree

Hide file tree

Showing 38 changed files with 216 additions and 180 deletions.
diff --git a/cmd/e2e-test/backend_config_test.go b/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)
 				}

diff --git a/cmd/e2e-test/customrequestheaders_test.go b/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)
 			}
 

diff --git a/cmd/e2e-test/ilb_test.go b/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)

diff --git a/cmd/fuzzer/app/validate.go b/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)
 	}

diff --git a/cmd/glbc/app/init.go b/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

diff --git a/cmd/glbc/app/namer.go b/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 {

diff --git a/cmd/glbc/main.go b/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)
 	}

diff --git a/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1/backendconfig.go b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1/backendconfig.go
diff --git a/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1beta1/backendconfig.go b/pkg/backendconfig/client/clientset/versioned/typed/backendconfig/v1beta1/backendconfig.go
diff --git a/pkg/backendconfig/validation.go b/pkg/backendconfig/validation.go
@@ -17,6 +17,7 @@ limitations under the License.
 package backendconfig
 
 import (
+	"context"
 	"fmt"
 
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -65,7 +66,7 @@ func validateIAP(kubeClient kubernetes.Interface, beConfig *backendconfigv1.Back
 	// If necessary, get the OAuth credentials stored in the K8s secret.
 	if beConfig.Spec.Iap.OAuthClientCredentials != nil && beConfig.Spec.Iap.OAuthClientCredentials.SecretName != "" {
 		secretName := beConfig.Spec.Iap.OAuthClientCredentials.SecretName
-		secret, err := kubeClient.CoreV1().Secrets(beConfig.Namespace).Get(secretName, meta_v1.GetOptions{})
+		secret, err := kubeClient.CoreV1().Secrets(beConfig.Namespace).Get(context.TODO(), secretName, meta_v1.GetOptions{})
 		if err != nil {
 			return fmt.Errorf("error retrieving secret %v: %v", secretName, err)
 		}

diff --git a/pkg/backendconfig/validation_test.go b/pkg/backendconfig/validation_test.go
@@ -17,6 +17,7 @@ limitations under the License.
 package backendconfig
 
 import (
+	"context"
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
@@ -63,7 +64,7 @@ func TestValidateIAP(t *testing.T) {
 						Name:      "foo",
 					},
 				}
-				kubeClient.CoreV1().Secrets("wrong-namespace").Create(secret)
+				kubeClient.CoreV1().Secrets("wrong-namespace").Create(context.TODO(), secret, meta_v1.CreateOptions{})
 			},
 			expectError: true,
 		},
@@ -80,7 +81,7 @@ func TestValidateIAP(t *testing.T) {
 						"client_secret": []byte("my-secret"),
 					},
 				}
-				kubeClient.CoreV1().Secrets("default").Create(secret)
+				kubeClient.CoreV1().Secrets("default").Create(context.TODO(), secret, meta_v1.CreateOptions{})
 			},
 			expectError: true,
 		},
@@ -97,7 +98,7 @@ func TestValidateIAP(t *testing.T) {
 						"client_id": []byte("my-id"),
 					},
 				}
-				kubeClient.CoreV1().Secrets("default").Create(secret)
+				kubeClient.CoreV1().Secrets("default").Create(context.TODO(), secret, meta_v1.CreateOptions{})
 			},
 			expectError: true,
 		},
@@ -115,7 +116,7 @@ func TestValidateIAP(t *testing.T) {
 						"client_secret": []byte("my-secret"),
 					},
 				}
-				kubeClient.CoreV1().Secrets("default").Create(secret)
+				kubeClient.CoreV1().Secrets("default").Create(context.TODO(), secret, meta_v1.CreateOptions{})
 			},
 			expectError: false,
 		},
@@ -145,7 +146,7 @@ func TestValidateIAP(t *testing.T) {
 						"client_secret": []byte("my-secret"),
 					},
 				}
-				kubeClient.CoreV1().Secrets("default").Create(secret)
+				kubeClient.CoreV1().Secrets("default").Create(context.TODO(), secret, meta_v1.CreateOptions{})
 			},
 			expectError: true,
 		},