github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-03 10:17:46 +00:00
Code Issues Projects Releases Wiki Activity

automated refactor

Browse Source
This commit is contained in:
Mike Danese
2020-03-01 09:24:42 -08:00
parent 86bd06c882
commit c58e69ec79
174 changed files with 404 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/auth/dynamic_client_test.go
View File

@@ -107,7 +107,7 @@ func TestDynamicClientBuilder(t *testing.T) {
// We want to trigger token rotation here by deleting service account
// the dynamic client was using.
if err = dymClient.CoreV1().ServiceAccounts(ns).Delete(context.TODO(), saName, nil); err != nil {
if err = dymClient.CoreV1().ServiceAccounts(ns).Delete(context.TODO(), saName, metav1.DeleteOptions{}); err != nil {
t.Fatalf("delete service account %s failed: %v", saName, err)
}
time.Sleep(time.Second * 10)

10
test/integration/auth/node_test.go
View File

@@ -218,7 +218,7 @@ func TestNodeAuthorizer(t *testing.T) {
deleteNode2NormalPod := func(client clientset.Interface) func() error {
return func() error {
zero := int64(0)
return client.CoreV1().Pods("ns").Delete(context.TODO(), "node2normalpod", &metav1.DeleteOptions{GracePeriodSeconds: &zero})
return client.CoreV1().Pods("ns").Delete(context.TODO(), "node2normalpod", metav1.DeleteOptions{GracePeriodSeconds: &zero})
}
}
@@ -240,7 +240,7 @@ func TestNodeAuthorizer(t *testing.T) {
deleteNode2MirrorPod := func(client clientset.Interface) func() error {
return func() error {
zero := int64(0)
return client.CoreV1().Pods("ns").Delete(context.TODO(), "node2mirrorpod", &metav1.DeleteOptions{GracePeriodSeconds: &zero})
return client.CoreV1().Pods("ns").Delete(context.TODO(), "node2mirrorpod", metav1.DeleteOptions{GracePeriodSeconds: &zero})
}
}
@@ -289,7 +289,7 @@ func TestNodeAuthorizer(t *testing.T) {
}
deleteNode2 := func(client clientset.Interface) func() error {
return func() error {
return client.CoreV1().Nodes().Delete(context.TODO(), "node2", nil)
return client.CoreV1().Nodes().Delete(context.TODO(), "node2", metav1.DeleteOptions{})
}
}
createNode2NormalPodEviction := func(client clientset.Interface) func() error {
@@ -388,7 +388,7 @@ func TestNodeAuthorizer(t *testing.T) {
}
deleteNode1Lease := func(client clientset.Interface) func() error {
return func() error {
return client.CoordinationV1().Leases(corev1.NamespaceNodeLease).Delete(context.TODO(), "node1", &metav1.DeleteOptions{})
return client.CoordinationV1().Leases(corev1.NamespaceNodeLease).Delete(context.TODO(), "node1", metav1.DeleteOptions{})
}
}
@@ -445,7 +445,7 @@ func TestNodeAuthorizer(t *testing.T) {
}
deleteNode1CSINode := func(client clientset.Interface) func() error {
return func() error {
return client.StorageV1().CSINodes().Delete(context.TODO(), "node1", &metav1.DeleteOptions{})
return client.StorageV1().CSINodes().Delete(context.TODO(), "node1", metav1.DeleteOptions{})
}
}

2
test/integration/auth/rbac_test.go
View File

@@ -742,7 +742,7 @@ func TestDiscoveryUpgradeBootstrapping(t *testing.T) {
t.Fatalf("Failed to update `system:basic-user` ClusterRoleBinding: %v", err)
}
t.Logf("Deleting default `system:public-info-viewer` ClusterRoleBinding")
if err = client.RbacV1().ClusterRoleBindings().Delete(context.TODO(), "system:public-info-viewer", &metav1.DeleteOptions{}); err != nil {
if err = client.RbacV1().ClusterRoleBindings().Delete(context.TODO(), "system:public-info-viewer", metav1.DeleteOptions{}); err != nil {
t.Fatalf("Failed to delete `system:public-info-viewer` ClusterRoleBinding: %v", err)
}

6
test/integration/auth/svcaccttoken_test.go
View File

@@ -803,7 +803,7 @@ func createDeleteSvcAcct(t *testing.T, cs clientset.Interface, sa *v1.ServiceAcc
return
}
done = true
if err := cs.CoreV1().ServiceAccounts(sa.Namespace).Delete(context.TODO(), sa.Name, nil); err != nil {
if err := cs.CoreV1().ServiceAccounts(sa.Namespace).Delete(context.TODO(), sa.Name, metav1.DeleteOptions{}); err != nil {
t.Fatalf("err: %v", err)
}
}
@@ -822,7 +822,7 @@ func createDeletePod(t *testing.T, cs clientset.Interface, pod *v1.Pod) (*v1.Pod
return
}
done = true
if err := cs.CoreV1().Pods(pod.Namespace).Delete(context.TODO(), pod.Name, nil); err != nil {
if err := cs.CoreV1().Pods(pod.Namespace).Delete(context.TODO(), pod.Name, metav1.DeleteOptions{}); err != nil {
t.Fatalf("err: %v", err)
}
}
@@ -841,7 +841,7 @@ func createDeleteSecret(t *testing.T, cs clientset.Interface, sec *v1.Secret) (*
return
}
done = true
if err := cs.CoreV1().Secrets(sec.Namespace).Delete(context.TODO(), sec.Name, nil); err != nil {
if err := cs.CoreV1().Secrets(sec.Namespace).Delete(context.TODO(), sec.Name, metav1.DeleteOptions{}); err != nil {
t.Fatalf("err: %v", err)
}
}