github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-13 14:41:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #87299 from mikedanese/ctx

Browse Source 
context in client-go
This commit is contained in:
Kubernetes Prow Robot
2020-02-08 06:43:52 -08:00
committed by GitHub
parent 06c639fb4a 2637772298
commit 334d788f08
954 changed files with 8533 additions and 7714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
test/e2e/storage/utils/create.go
View File

@@ -18,6 +18,7 @@ package utils
import (
"bytes"
"context"
"encoding/json"
"fmt"
imageutils "k8s.io/kubernetes/test/utils/image"
@@ -397,11 +398,11 @@ func (*serviceAccountFactory) Create(f *framework.Framework, i interface{}) (fun
return nil, errorItemNotSupported
}
client := f.ClientSet.CoreV1().ServiceAccounts(f.Namespace.GetName())
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create ServiceAccount")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}
@@ -419,11 +420,11 @@ func (*clusterRoleFactory) Create(f *framework.Framework, i interface{}) (func()
framework.Logf("Define cluster role %v", item.GetName())
client := f.ClientSet.RbacV1().ClusterRoles()
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create ClusterRole")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}
@@ -440,11 +441,11 @@ func (*clusterRoleBindingFactory) Create(f *framework.Framework, i interface{})
}
client := f.ClientSet.RbacV1().ClusterRoleBindings()
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create ClusterRoleBinding")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}
@@ -461,11 +462,11 @@ func (*roleFactory) Create(f *framework.Framework, i interface{}) (func() error,
}
client := f.ClientSet.RbacV1().Roles(f.Namespace.GetName())
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create Role")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}
@@ -482,11 +483,11 @@ func (*roleBindingFactory) Create(f *framework.Framework, i interface{}) (func()
}
client := f.ClientSet.RbacV1().RoleBindings(f.Namespace.GetName())
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create RoleBinding")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}
@@ -503,11 +504,11 @@ func (*serviceFactory) Create(f *framework.Framework, i interface{}) (func() err
}
client := f.ClientSet.CoreV1().Services(f.Namespace.GetName())
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create Service")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}
@@ -524,11 +525,11 @@ func (*statefulSetFactory) Create(f *framework.Framework, i interface{}) (func()
}
client := f.ClientSet.AppsV1().StatefulSets(f.Namespace.GetName())
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create StatefulSet")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}
@@ -545,11 +546,11 @@ func (*daemonSetFactory) Create(f *framework.Framework, i interface{}) (func() e
}
client := f.ClientSet.AppsV1().DaemonSets(f.Namespace.GetName())
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create DaemonSet")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}
@@ -566,11 +567,11 @@ func (*storageClassFactory) Create(f *framework.Framework, i interface{}) (func(
}
client := f.ClientSet.StorageV1().StorageClasses()
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create StorageClass")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}
@@ -587,11 +588,11 @@ func (*csiDriverFactory) Create(f *framework.Framework, i interface{}) (func() e
}
client := f.ClientSet.StorageV1beta1().CSIDrivers()
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create CSIDriver")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}
@@ -608,11 +609,11 @@ func (*secretFactory) Create(f *framework.Framework, i interface{}) (func() erro
}
client := f.ClientSet.CoreV1().Secrets(f.Namespace.GetName())
if _, err := client.Create(item); err != nil {
if _, err := client.Create(context.TODO(), item); err != nil {
return nil, errors.Wrap(err, "create Secret")
}
return func() error {
return client.Delete(item.GetName(), &metav1.DeleteOptions{})
return client.Delete(context.TODO(), item.GetName(), &metav1.DeleteOptions{})
}, nil
}

3
test/e2e/storage/utils/host_exec.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package utils
import (
"context"
"fmt"
v1 "k8s.io/api/core/v1"
@@ -97,7 +98,7 @@ func (h *hostExecutor) launchNodeExecPod(node string) *v1.Pod {
return &privileged
}(true),
}
pod, err := cs.CoreV1().Pods(ns.Name).Create(hostExecPod)
pod, err := cs.CoreV1().Pods(ns.Name).Create(context.TODO(), hostExecPod)
framework.ExpectNoError(err)
err = e2epod.WaitForPodRunningInNamespace(cs, pod)
framework.ExpectNoError(err)

23
test/e2e/storage/utils/utils.go
View File

@@ -17,6 +17,7 @@ limitations under the License.
package utils
import (
"context"
"crypto/sha256"
"encoding/base64"
"fmt"
@@ -118,7 +119,7 @@ func isSudoPresent(nodeIP string, provider string) bool {
// address. Returns an error if the node the pod is on doesn't have an
// address.
func getHostAddress(client clientset.Interface, p *v1.Pod) (string, error) {
node, err := client.CoreV1().Nodes().Get(p.Spec.NodeName, metav1.GetOptions{})
node, err := client.CoreV1().Nodes().Get(context.TODO(), p.Spec.NodeName, metav1.GetOptions{})
if err != nil {
return "", err
}
@@ -298,9 +299,9 @@ func TestVolumeUnmountsFromDeletedPodWithForceOption(c clientset.Interface, f *f
ginkgo.By(fmt.Sprintf("Deleting Pod %q", clientPod.Name))
if forceDelete {
err = c.CoreV1().Pods(clientPod.Namespace).Delete(clientPod.Name, metav1.NewDeleteOptions(0))
err = c.CoreV1().Pods(clientPod.Namespace).Delete(context.TODO(), clientPod.Name, metav1.NewDeleteOptions(0))
} else {
err = c.CoreV1().Pods(clientPod.Namespace).Delete(clientPod.Name, &metav1.DeleteOptions{})
err = c.CoreV1().Pods(clientPod.Namespace).Delete(context.TODO(), clientPod.Name, &metav1.DeleteOptions{})
}
framework.ExpectNoError(err)
@@ -384,9 +385,9 @@ func TestVolumeUnmapsFromDeletedPodWithForceOption(c clientset.Interface, f *fra
ginkgo.By(fmt.Sprintf("Deleting Pod %q", clientPod.Name))
if forceDelete {
err = c.CoreV1().Pods(clientPod.Namespace).Delete(clientPod.Name, metav1.NewDeleteOptions(0))
err = c.CoreV1().Pods(clientPod.Namespace).Delete(context.TODO(), clientPod.Name, metav1.NewDeleteOptions(0))
} else {
err = c.CoreV1().Pods(clientPod.Namespace).Delete(clientPod.Name, &metav1.DeleteOptions{})
err = c.CoreV1().Pods(clientPod.Namespace).Delete(context.TODO(), clientPod.Name, &metav1.DeleteOptions{})
}
framework.ExpectNoError(err, "Failed to delete pod.")
@@ -465,7 +466,7 @@ func RunInPodWithVolume(c clientset.Interface, ns, claimName, command string) {
},
},
}
pod, err := c.CoreV1().Pods(ns).Create(pod)
pod, err := c.CoreV1().Pods(ns).Create(context.TODO(), pod)
framework.ExpectNoError(err, "Failed to create pod: %v", err)
defer func() {
e2epod.DeletePodOrFail(c, ns, pod.Name)
@@ -535,13 +536,13 @@ func StartExternalProvisioner(c clientset.Interface, ns string, externalPluginNa
},
},
}
provisionerPod, err := podClient.Create(provisionerPod)
provisionerPod, err := podClient.Create(context.TODO(), provisionerPod)
framework.ExpectNoError(err, "Failed to create %s pod: %v", provisionerPod.Name, err)
framework.ExpectNoError(e2epod.WaitForPodRunningInNamespace(c, provisionerPod))
ginkgo.By("locating the provisioner pod")
pod, err := podClient.Get(provisionerPod.Name, metav1.GetOptions{})
pod, err := podClient.Get(context.TODO(), provisionerPod.Name, metav1.GetOptions{})
framework.ExpectNoError(err, "Cannot locate the provisioner pod %v: %v", provisionerPod.Name, err)
return pod
@@ -578,9 +579,9 @@ func PrivilegedTestPSPClusterRoleBinding(client clientset.Interface,
},
}
roleBindingClient.Delete(binding.GetName(), &metav1.DeleteOptions{})
roleBindingClient.Delete(context.TODO(), binding.GetName(), &metav1.DeleteOptions{})
err := wait.Poll(2*time.Second, 2*time.Minute, func() (bool, error) {
_, err := roleBindingClient.Get(binding.GetName(), metav1.GetOptions{})
_, err := roleBindingClient.Get(context.TODO(), binding.GetName(), metav1.GetOptions{})
return apierrors.IsNotFound(err), nil
})
framework.ExpectNoError(err, "Timed out waiting for RBAC binding %s deletion: %v", binding.GetName(), err)
@@ -589,7 +590,7 @@ func PrivilegedTestPSPClusterRoleBinding(client clientset.Interface,
continue
}
_, err = roleBindingClient.Create(binding)
_, err = roleBindingClient.Create(context.TODO(), binding)
framework.ExpectNoError(err, "Failed to create %s role binding: %v", binding.GetName(), err)
}