Skip to content
This repository has been archived by the owner on May 17, 2024. It is now read-only.

Commit

Permalink
Replaces context.Background() to context.TODO() in e2e tests
Browse files Browse the repository at this point in the history 
Signed-off-by: JoshVanL <vleeuwenjoshua@gmail.com>
  • Loading branch information
@JoshVanL
JoshVanL committed Mar 30, 2020
1 parent 5b5e17c commit 0deb0ac
Show file tree
Hide file tree
Showing 12 changed files with 71 additions and 71 deletions.
28 changes: 14 additions & 14 deletions test/e2e/framework/helper/deploy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
},
}

_, err := h.KubeClient.CoreV1().Secrets(ns.Name).Create(context.Background(), sec, metav1.CreateOptions{})
_, err := h.KubeClient.CoreV1().Secrets(ns.Name).Create(context.TODO(), sec, metav1.CreateOptions{})
if err != nil {
return nil, nil, err
}
Expand All @@ -111,7 +111,7 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
pTrue := true
pFalse := false

crole, err := h.KubeClient.RbacV1().ClusterRoles().Create(context.Background(), &rbacv1.ClusterRole{
crole, err := h.KubeClient.RbacV1().ClusterRoles().Create(context.TODO(), &rbacv1.ClusterRole{
ObjectMeta: metav1.ObjectMeta{
GenerateName: kind.ProxyImageName + "-",
OwnerReferences: []metav1.OwnerReference{
Expand Down Expand Up @@ -142,7 +142,7 @@ func (h *Helper) DeployProxy(ns *corev1.Namespace, issuerURL *url.URL, clientID
return nil, nil, err
}

_, err = h.KubeClient.RbacV1().ClusterRoleBindings().Create(context.Background(),
_, err = h.KubeClient.RbacV1().ClusterRoleBindings().Create(context.TODO(),
&rbacv1.ClusterRoleBinding{
ObjectMeta: metav1.ObjectMeta{
GenerateName: kind.ProxyImageName + "-",
Expand Down Expand Up @@ -235,7 +235,7 @@ func (h *Helper) DeployFakeAPIServer(ns string) ([]corev1.Volume, *url.URL, erro
return nil, nil, err
}

sec, err := h.KubeClient.CoreV1().Secrets(ns).Create(context.Background(), &corev1.Secret{
sec, err := h.KubeClient.CoreV1().Secrets(ns).Create(context.TODO(), &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "fake-apiserver-ca-",
Namespace: ns,
Expand Down Expand Up @@ -293,7 +293,7 @@ func (h *Helper) DeployAuditWebhook(ns, logPath string) (corev1.Volume, *url.URL
return corev1.Volume{}, nil, err
}

sec, err := h.KubeClient.CoreV1().Secrets(ns).Create(context.Background(), &corev1.Secret{
sec, err := h.KubeClient.CoreV1().Secrets(ns).Create(context.TODO(), &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "audit-webhook-ca-",
Namespace: ns,
Expand Down Expand Up @@ -323,7 +323,7 @@ func (h *Helper) deployApp(ns, name string, serviceType corev1.ServiceType, cont

var netIPs []net.IP
if serviceType == corev1.ServiceTypeNodePort {
nodes, err := h.KubeClient.CoreV1().Nodes().List(context.Background(), metav1.ListOptions{})
nodes, err := h.KubeClient.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
if err != nil {
return nil, nil, err
}
Expand Down Expand Up @@ -419,7 +419,7 @@ func (h *Helper) deployApp(ns, name string, serviceType corev1.ServiceType, cont
},
}

svc, err = h.KubeClient.CoreV1().Services(ns).Create(context.Background(), svc, metav1.CreateOptions{})
svc, err = h.KubeClient.CoreV1().Services(ns).Create(context.TODO(), svc, metav1.CreateOptions{})
if err != nil {
return nil, nil, err
}
Expand All @@ -429,17 +429,17 @@ func (h *Helper) deployApp(ns, name string, serviceType corev1.ServiceType, cont
strconv.FormatUint(uint64(svc.Spec.Ports[0].NodePort), 10))
}

_, err = h.KubeClient.CoreV1().Secrets(ns).Create(context.Background(), sec, metav1.CreateOptions{})
_, err = h.KubeClient.CoreV1().Secrets(ns).Create(context.TODO(), sec, metav1.CreateOptions{})
if err != nil {
return nil, nil, err
}

_, err = h.KubeClient.CoreV1().ServiceAccounts(ns).Create(context.Background(), sa, metav1.CreateOptions{})
_, err = h.KubeClient.CoreV1().ServiceAccounts(ns).Create(context.TODO(), sa, metav1.CreateOptions{})
if err != nil {
return nil, nil, err
}

_, err = h.KubeClient.AppsV1().Deployments(ns).Create(context.Background(), deploy, metav1.CreateOptions{})
_, err = h.KubeClient.AppsV1().Deployments(ns).Create(context.TODO(), deploy, metav1.CreateOptions{})
if err != nil {
return nil, nil, err
}
Expand Down Expand Up @@ -468,24 +468,24 @@ func (h *Helper) DeleteFakeAPIServer(ns string) error {
}

func (h *Helper) deleteApp(ns, name string, extraSecrets ...string) error {
err := h.KubeClient.AppsV1().Deployments(ns).Delete(context.Background(), name, metav1.DeleteOptions{})
err := h.KubeClient.AppsV1().Deployments(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil && !k8sErrors.IsNotFound(err) {
return err
}

for _, s := range append(extraSecrets, name) {
err = h.KubeClient.CoreV1().Secrets(ns).Delete(context.Background(), s, metav1.DeleteOptions{})
err = h.KubeClient.CoreV1().Secrets(ns).Delete(context.TODO(), s, metav1.DeleteOptions{})
if err != nil && !k8sErrors.IsNotFound(err) {
return err
}
}

err = h.KubeClient.CoreV1().Services(ns).Delete(context.Background(), name, metav1.DeleteOptions{})
err = h.KubeClient.CoreV1().Services(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil && !k8sErrors.IsNotFound(err) {
return err
}

err = h.KubeClient.CoreV1().ServiceAccounts(ns).Delete(context.Background(), name, metav1.DeleteOptions{})
err = h.KubeClient.CoreV1().ServiceAccounts(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil && !k8sErrors.IsNotFound(err) {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/framework/helper/poll.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func (h *Helper) WaitForDeploymentReady(namespace, name string, timeout time.Dur
log.Infof("Waiting for Deployment to become ready %s/%s", namespace, name)

err := wait.PollImmediate(time.Second*2, timeout, func() (bool, error) {
deploy, err := h.KubeClient.AppsV1().Deployments(namespace).Get(context.Background(), name, metav1.GetOptions{})
deploy, err := h.KubeClient.AppsV1().Deployments(namespace).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
return false, err
}
Expand Down Expand Up @@ -49,7 +49,7 @@ func (h *Helper) WaitForPodReady(namespace, name string, timeout time.Duration)
log.Infof("Waiting for Pod to become ready %s/%s", namespace, name)

err := wait.PollImmediate(time.Second*2, timeout, func() (bool, error) {
pod, err := h.KubeClient.CoreV1().Pods(namespace).Get(context.Background(), name, metav1.GetOptions{})
pod, err := h.KubeClient.CoreV1().Pods(namespace).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
return false, err
}
Expand Down Expand Up @@ -91,7 +91,7 @@ func (h *Helper) WaitForDeploymentToDelete(namespace, name string, timeout time.
log.Infof("Waiting for Deployment to be deleted: %s/%s", namespace, name)

err := wait.PollImmediate(time.Second*2, timeout, func() (bool, error) {
_, err := h.KubeClient.AppsV1().Deployments(namespace).Get(context.Background(), name, metav1.GetOptions{})
_, err := h.KubeClient.AppsV1().Deployments(namespace).Get(context.TODO(), name, metav1.GetOptions{})
if k8sErrors.IsNotFound(err) {
return true, nil
}
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/framework/helper/secrets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
)

func (h *Helper) GetServiceAccountSecret(ns, name string) (*corev1.Secret, error) {
sa, err := h.KubeClient.CoreV1().ServiceAccounts(ns).Get(context.Background(), name, metav1.GetOptions{})
sa, err := h.KubeClient.CoreV1().ServiceAccounts(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
return nil, err
}
sec, err := h.KubeClient.CoreV1().Secrets(ns).Get(context.Background(), sa.Secrets[0].Name, metav1.GetOptions{})
sec, err := h.KubeClient.CoreV1().Secrets(ns).Get(context.TODO(), sa.Secrets[0].Name, metav1.GetOptions{})
if err != nil {
return nil, err
}
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/framework/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ func (f *Framework) CreateKubeNamespace(baseName string) (*corev1.Namespace, err
},
}

return f.KubeClientSet.CoreV1().Namespaces().Create(context.Background(), ns, metav1.CreateOptions{})
return f.KubeClientSet.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{})
}

// DeleteKubeNamespace will delete a namespace resource
func (f *Framework) DeleteKubeNamespace(namespace string) error {
return f.KubeClientSet.CoreV1().Namespaces().Delete(context.Background(), namespace, metav1.DeleteOptions{})
return f.KubeClientSet.CoreV1().Namespaces().Delete(context.TODO(), namespace, metav1.DeleteOptions{})
}

// WaitForKubeNamespaceNotExist will wait for the namespace with the given name
Expand All @@ -41,7 +41,7 @@ func (f *Framework) WaitForKubeNamespaceNotExist(namespace string) error {

func namespaceNotExist(c kubernetes.Interface, namespace string) wait.ConditionFunc {
return func() (bool, error) {
_, err := c.CoreV1().Namespaces().Get(context.Background(), namespace, metav1.GetOptions{})
_, err := c.CoreV1().Namespaces().Get(context.TODO(), namespace, metav1.GetOptions{})
if apierrors.IsNotFound(err) {
return true, nil
}
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/suite/cases/audit/audit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var _ = framework.CasesDescribe("Audit", func() {

It("should be able to write audit logs to file", func() {
By("Creating policy file ConfigMap")
cm, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(context.Background(), &corev1.ConfigMap{
cm, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(context.TODO(), &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "kube-oidc-proxy-policy-",
},
Expand Down Expand Up @@ -61,7 +61,7 @@ rules:

It("should be able to write audit logs to webhook", func() {
By("Creating policy file ConfigMap")
cmPolicy, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(context.Background(), &corev1.ConfigMap{
cmPolicy, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(context.TODO(), &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "kube-oidc-proxy-policy-",
},
Expand All @@ -77,7 +77,7 @@ rules:
extraWebhookVol, webhookURL, err := f.Helper().DeployAuditWebhook(f.Namespace.Name, "/audit-log")
Expect(err).NotTo(HaveOccurred())

cmWebhook, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(context.Background(), &corev1.ConfigMap{
cmWebhook, err := f.Helper().KubeClient.CoreV1().ConfigMaps(f.Namespace.Name).Create(context.TODO(), &corev1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "kube-oidc-proxy-webhook-config-",
},
Expand Down Expand Up @@ -163,7 +163,7 @@ func testAuditLogs(f *framework.Framework, podLabelSelector string) {

By("Copying audit log from proxy locally")
// Get pod
pods, err := f.Helper().KubeClient.CoreV1().Pods(f.Namespace.Name).List(context.Background(), metav1.ListOptions{
pods, err := f.Helper().KubeClient.CoreV1().Pods(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{
LabelSelector: podLabelSelector,
})
Expect(err).NotTo(HaveOccurred())
Expand Down
20 changes: 10 additions & 10 deletions test/e2e/suite/cases/impersonation/impersonation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var _ = framework.CasesDescribe("Impersonation", func() {
f.DeployProxyWith(nil, "--disable-impersonation")

By("Creating ClusterRole for system:anonymous to impersonate")
roleImpersonate, err := f.Helper().KubeClient.RbacV1().ClusterRoles().Create(context.Background(), &rbacv1.ClusterRole{
roleImpersonate, err := f.Helper().KubeClient.RbacV1().ClusterRoles().Create(context.TODO(), &rbacv1.ClusterRole{
ObjectMeta: metav1.ObjectMeta{
GenerateName: fmt.Sprintf("test-user-role-impersonate-"),
},
Expand All @@ -81,7 +81,7 @@ var _ = framework.CasesDescribe("Impersonation", func() {
Expect(err).NotTo(HaveOccurred())

By("Creating Role for user foo to list Pods")
rolePods, err := f.Helper().KubeClient.RbacV1().Roles(f.Namespace.Name).Create(context.Background(), &rbacv1.Role{
rolePods, err := f.Helper().KubeClient.RbacV1().Roles(f.Namespace.Name).Create(context.TODO(), &rbacv1.Role{
ObjectMeta: metav1.ObjectMeta{
GenerateName: fmt.Sprintf("test-user-role-pods-"),
},
Expand All @@ -92,7 +92,7 @@ var _ = framework.CasesDescribe("Impersonation", func() {
Expect(err).NotTo(HaveOccurred())

By("Creating ClusterRoleBinding for user system:anonymous")
rolebindingImpersonate, err := f.Helper().KubeClient.RbacV1().ClusterRoleBindings().Create(context.Background(),
rolebindingImpersonate, err := f.Helper().KubeClient.RbacV1().ClusterRoleBindings().Create(context.TODO(),
&rbacv1.ClusterRoleBinding{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-user-binding-system-anonymous",
Expand All @@ -103,7 +103,7 @@ var _ = framework.CasesDescribe("Impersonation", func() {
Expect(err).NotTo(HaveOccurred())

By("Creating RoleBinding for user foo@example.com")
rolebindingPods, err := f.Helper().KubeClient.RbacV1().RoleBindings(f.Namespace.Name).Create(context.Background(),
rolebindingPods, err := f.Helper().KubeClient.RbacV1().RoleBindings(f.Namespace.Name).Create(context.TODO(),
&rbacv1.RoleBinding{
ObjectMeta: metav1.ObjectMeta{
GenerateName: "test-user-binding-user-foo-example-com",
Expand All @@ -123,23 +123,23 @@ var _ = framework.CasesDescribe("Impersonation", func() {

// Should not error since we have authorized system:anonymous to
// impersonate and foo@example.com to list pods
_, err = client.CoreV1().Pods(f.Namespace.Name).List(context.Background(), metav1.ListOptions{})
_, err = client.CoreV1().Pods(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{})
Expect(err).NotTo(HaveOccurred())

By("Deleting RoleBinding for user foo@example.com")
err = f.Helper().KubeClient.RbacV1().RoleBindings(f.Namespace.Name).Delete(context.Background(), rolebindingPods.Name, metav1.DeleteOptions{})
err = f.Helper().KubeClient.RbacV1().RoleBindings(f.Namespace.Name).Delete(context.TODO(), rolebindingPods.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred())

By("Deleting Role for list Pods")
err = f.Helper().KubeClient.RbacV1().Roles(f.Namespace.Name).Delete(context.Background(), rolePods.Name, metav1.DeleteOptions{})
err = f.Helper().KubeClient.RbacV1().Roles(f.Namespace.Name).Delete(context.TODO(), rolePods.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred())

By("Deleting ClusterRoleBinding for user system:anonymous")
err = f.Helper().KubeClient.RbacV1().ClusterRoleBindings().Delete(context.Background(), rolebindingImpersonate.Name, metav1.DeleteOptions{})
err = f.Helper().KubeClient.RbacV1().ClusterRoleBindings().Delete(context.TODO(), rolebindingImpersonate.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred())

By("Deleting ClusterRole for Impersonate")
err = f.Helper().KubeClient.RbacV1().ClusterRoles().Delete(context.Background(), roleImpersonate.Name, metav1.DeleteOptions{})
err = f.Helper().KubeClient.RbacV1().ClusterRoles().Delete(context.TODO(), roleImpersonate.Name, metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred())
})
})
Expand All @@ -151,7 +151,7 @@ func tryImpersonationClient(f *framework.Framework, impConfig rest.Impersonation
client, err := kubernetes.NewForConfig(config)
Expect(err).NotTo(HaveOccurred())

_, err = client.CoreV1().Pods(f.Namespace.Name).List(context.Background(), metav1.ListOptions{})
_, err = client.CoreV1().Pods(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{})
kErr, ok := err.(*k8sErrors.StatusError)
if !ok {
Expect(err).NotTo(HaveOccurred())
Expand Down
16 changes: 8 additions & 8 deletions test/e2e/suite/cases/passthrough/passthrough.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var _ = framework.CasesDescribe("Passthrough", func() {

JustBeforeEach(func() {
By("Creating List Pods Role")
_, err := f.Helper().KubeClient.RbacV1().Roles(f.Namespace.Name).Create(context.Background(),
_, err := f.Helper().KubeClient.RbacV1().Roles(f.Namespace.Name).Create(context.TODO(),
&rbacv1.Role{
ObjectMeta: metav1.ObjectMeta{
Name: "e2e-impersonation-pods-list",
Expand All @@ -41,7 +41,7 @@ var _ = framework.CasesDescribe("Passthrough", func() {

// Create bindings for both the OIDC user and default ServiceAccount
By("Creating List Pods RoleBinding")
_, err = f.Helper().KubeClient.RbacV1().RoleBindings(f.Namespace.Name).Create(context.Background(),
_, err = f.Helper().KubeClient.RbacV1().RoleBindings(f.Namespace.Name).Create(context.TODO(),
&rbacv1.RoleBinding{
ObjectMeta: metav1.ObjectMeta{
Name: "e2e-impersonation-pods-list",
Expand Down Expand Up @@ -71,20 +71,20 @@ var _ = framework.CasesDescribe("Passthrough", func() {

JustAfterEach(func() {
By("Deleting List Pods Role")
err := f.Helper().KubeClient.RbacV1().Roles(f.Namespace.Name).Delete(context.Background(),
err := f.Helper().KubeClient.RbacV1().Roles(f.Namespace.Name).Delete(context.TODO(),
"e2e-impersonation-pods-list", metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred())

By("Creating List Pods RoleBinding")
err = f.Helper().KubeClient.RbacV1().RoleBindings(f.Namespace.Name).Delete(context.Background(),
err = f.Helper().KubeClient.RbacV1().RoleBindings(f.Namespace.Name).Delete(context.TODO(),
"e2e-impersonation-pods-list", metav1.DeleteOptions{})
Expect(err).NotTo(HaveOccurred())
})

It("error when a valid OIDC token is used but return correct when passthrough is disabled", func() {
By("A valid OIDC token should respond without error")
proxyClient := f.NewProxyClient()
_, err := proxyClient.CoreV1().Pods(f.Namespace.Name).List(context.Background(), metav1.ListOptions{})
_, err := proxyClient.CoreV1().Pods(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{})
Expect(err).NotTo(HaveOccurred())

By("Using a ServiceAccount token should error by the proxy")
Expand All @@ -96,7 +96,7 @@ var _ = framework.CasesDescribe("Passthrough", func() {
client, err := kubernetes.NewForConfig(config)
Expect(err).NotTo(HaveOccurred())

_, err = client.CoreV1().Pods(f.Namespace.Name).List(context.Background(), metav1.ListOptions{})
_, err = client.CoreV1().Pods(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{})
kErr, ok := err.(*k8sErrors.StatusError)
if !ok {
Expect(err).NotTo(HaveOccurred())
Expand All @@ -119,7 +119,7 @@ var _ = framework.CasesDescribe("Passthrough", func() {

By("A valid OIDC token should respond without error")
proxyClient := f.NewProxyClient()
_, err := proxyClient.CoreV1().Pods(f.Namespace.Name).List(context.Background(), metav1.ListOptions{})
_, err := proxyClient.CoreV1().Pods(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{})
Expect(err).NotTo(HaveOccurred())

By("Using a ServiceAccount token should not error")
Expand All @@ -130,7 +130,7 @@ var _ = framework.CasesDescribe("Passthrough", func() {
kubeProxyClient, err := kubernetes.NewForConfig(proxyConfig)
Expect(err).NotTo(HaveOccurred())

_, err = kubeProxyClient.CoreV1().Pods(f.Namespace.Name).List(context.Background(), metav1.ListOptions{})
_, err = kubeProxyClient.CoreV1().Pods(f.Namespace.Name).List(context.TODO(), metav1.ListOptions{})
Expect(err).NotTo(HaveOccurred())
})
})
Loading

0 comments on commit 0deb0ac

Please sign in to comment.