Skip to content

Commit

Permalink
e2e: use Ginkgo context
Browse files Browse the repository at this point in the history 
All code must use the context from Ginkgo when doing API calls or polling for a
change, otherwise the code would not return immediately when the test gets
aborted.
  • Loading branch information
@pohly
pohly committed Dec 16, 2022
1 parent bf1d1df commit 2f6c4f5
Show file tree
Hide file tree
Showing 418 changed files with 11,489 additions and 11,369 deletions.
98 changes: 49 additions & 49 deletions test/e2e/apimachinery/aggregator.go
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions test/e2e/apimachinery/apiserver_identity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
admissionapi "k8s.io/pod-security-admission/api"
)

func getControlPlaneHostname(node *v1.Node) (string, error) {
func getControlPlaneHostname(ctx context.Context, node *v1.Node) (string, error) {
nodeAddresses := e2enode.GetAddresses(node, v1.NodeExternalIP)
if len(nodeAddresses) == 0 {
return "", errors.New("no valid addresses to use for SSH")
Expand All @@ -46,7 +46,7 @@ func getControlPlaneHostname(node *v1.Node) (string, error) {
controlPlaneAddress := nodeAddresses[0]

host := controlPlaneAddress + ":" + e2essh.SSHPort
result, err := e2essh.SSH("hostname", host, framework.TestContext.Provider)
result, err := e2essh.SSH(ctx, "hostname", host, framework.TestContext.Provider)
if err != nil {
return "", err
}
Expand All @@ -59,7 +59,7 @@ func getControlPlaneHostname(node *v1.Node) (string, error) {
}

// restartAPIServer attempts to restart the kube-apiserver on a node
func restartAPIServer(node *v1.Node) error {
func restartAPIServer(ctx context.Context, node *v1.Node) error {
nodeAddresses := e2enode.GetAddresses(node, v1.NodeExternalIP)
if len(nodeAddresses) == 0 {
return errors.New("no valid addresses to use for SSH")
Expand All @@ -68,7 +68,7 @@ func restartAPIServer(node *v1.Node) error {
controlPlaneAddress := nodeAddresses[0]
cmd := "pidof kube-apiserver | xargs sudo kill"
framework.Logf("Restarting kube-apiserver via ssh, running: %v", cmd)
result, err := e2essh.SSH(cmd, net.JoinHostPort(controlPlaneAddress, e2essh.SSHPort), framework.TestContext.Provider)
result, err := e2essh.SSH(ctx, cmd, net.JoinHostPort(controlPlaneAddress, e2essh.SSHPort), framework.TestContext.Provider)
if err != nil || result.Code != 0 {
e2essh.LogResult(result)
return fmt.Errorf("couldn't restart kube-apiserver: %v", err)
Expand Down Expand Up @@ -121,7 +121,7 @@ var _ = SIGDescribe("kube-apiserver identity [Feature:APIServerIdentity]", func(
framework.ExpectEqual(len(leases.Items), len(controlPlaneNodes), "unexpected number of leases")

for _, node := range controlPlaneNodes {
hostname, err := getControlPlaneHostname(&node)
hostname, err := getControlPlaneHostname(ctx, &node)
framework.ExpectNoError(err)

hash := sha256.Sum256([]byte(hostname))
Expand All @@ -132,7 +132,7 @@ var _ = SIGDescribe("kube-apiserver identity [Feature:APIServerIdentity]", func(
oldHolderIdentity := lease.Spec.HolderIdentity
lastRenewedTime := lease.Spec.RenewTime

err = restartAPIServer(&node)
err = restartAPIServer(ctx, &node)
framework.ExpectNoError(err)

err = wait.PollImmediate(time.Second, wait.ForeverTestTimeout, func() (bool, error) {
Expand Down
76 changes: 38 additions & 38 deletions test/e2e/apimachinery/apply.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ var _ = SIGDescribe("ServerSideApply", func() {
ns = f.Namespace.Name
})

ginkgo.AfterEach(func() {
_ = client.AppsV1().Deployments(ns).Delete(context.TODO(), "deployment", metav1.DeleteOptions{})
_ = client.AppsV1().Deployments(ns).Delete(context.TODO(), "deployment-shared-unset", metav1.DeleteOptions{})
_ = client.AppsV1().Deployments(ns).Delete(context.TODO(), "deployment-shared-map-item-removal", metav1.DeleteOptions{})
_ = client.CoreV1().Pods(ns).Delete(context.TODO(), "test-pod", metav1.DeleteOptions{})
ginkgo.AfterEach(func(ctx context.Context) {
_ = client.AppsV1().Deployments(ns).Delete(ctx, "deployment", metav1.DeleteOptions{})
_ = client.AppsV1().Deployments(ns).Delete(ctx, "deployment-shared-unset", metav1.DeleteOptions{})
_ = client.AppsV1().Deployments(ns).Delete(ctx, "deployment-shared-map-item-removal", metav1.DeleteOptions{})
_ = client.CoreV1().Pods(ns).Delete(ctx, "test-pod", metav1.DeleteOptions{})
})

/*
Expand Down Expand Up @@ -119,13 +119,13 @@ var _ = SIGDescribe("ServerSideApply", func() {
Name(tc.name).
Param("fieldManager", "apply_test").
Body([]byte(tc.body)).
Do(context.TODO()).
Do(ctx).
Get()
if err != nil {
framework.Failf("Failed to create object using Apply patch: %v", err)
}

_, err = client.CoreV1().RESTClient().Get().Namespace(ns).Resource(tc.resource).Name(tc.name).Do(context.TODO()).Get()
_, err = client.CoreV1().RESTClient().Get().Namespace(ns).Resource(tc.resource).Name(tc.name).Do(ctx).Get()
if err != nil {
framework.Failf("Failed to retrieve object: %v", err)
}
Expand All @@ -137,7 +137,7 @@ var _ = SIGDescribe("ServerSideApply", func() {
Name(tc.name).
Param("fieldManager", "apply_test_2").
Body([]byte(tc.body)).
Do(context.TODO()).
Do(ctx).
Get()
if err != nil {
framework.Failf("Failed to re-apply object using Apply patch: %v", err)
Expand Down Expand Up @@ -203,13 +203,13 @@ var _ = SIGDescribe("ServerSideApply", func() {
Name(tc.name).
Param("fieldManager", "apply_test").
Body([]byte(tc.body)).
Do(context.TODO()).
Do(ctx).
Get()
if err != nil {
framework.Failf("Failed to create object using Apply patch: %v", err)
}

_, err = client.CoreV1().RESTClient().Get().Namespace(ns).Resource(tc.resource).Name(tc.name).Do(context.TODO()).Get()
_, err = client.CoreV1().RESTClient().Get().Namespace(ns).Resource(tc.resource).Name(tc.name).Do(ctx).Get()
if err != nil {
framework.Failf("Failed to retrieve object: %v", err)
}
Expand All @@ -221,12 +221,12 @@ var _ = SIGDescribe("ServerSideApply", func() {
Name(tc.name).
Param("fieldManager", "apply_test2").
Body([]byte(tc.statusPatch)).
Do(context.TODO()).
Do(ctx).
Get()
if err != nil {
framework.Failf("Failed to Apply Status using Apply patch: %v", err)
}
pod, err := client.CoreV1().Pods(ns).Get(context.TODO(), "test-pod", metav1.GetOptions{})
pod, err := client.CoreV1().Pods(ns).Get(ctx, "test-pod", metav1.GetOptions{})
framework.ExpectNoError(err, "retrieving test pod")
for _, c := range pod.Status.Conditions {
if c.Type == "MyStatus" {
Expand All @@ -242,13 +242,13 @@ var _ = SIGDescribe("ServerSideApply", func() {
Name(tc.name).
Param("fieldManager", "apply_test2").
Body([]byte(tc.statusPatch)).
Do(context.TODO()).
Do(ctx).
Get()
if err != nil {
framework.Failf("Failed to Apply Status using Apply patch: %v", err)
}

pod, err = client.CoreV1().Pods(ns).Get(context.TODO(), "test-pod", metav1.GetOptions{})
pod, err = client.CoreV1().Pods(ns).Get(ctx, "test-pod", metav1.GetOptions{})
framework.ExpectNoError(err, "retrieving test pod")

myStatusFound := false
Expand Down Expand Up @@ -311,7 +311,7 @@ var _ = SIGDescribe("ServerSideApply", func() {
Resource("deployments").
Name("deployment").
Param("fieldManager", "apply_test").
Body(obj).Do(context.TODO()).Get()
Body(obj).Do(ctx).Get()
if err != nil {
framework.Failf("Failed to create object using Apply patch: %v", err)
}
Expand Down Expand Up @@ -352,12 +352,12 @@ var _ = SIGDescribe("ServerSideApply", func() {
Resource("deployments").
Name("deployment").
Param("fieldManager", "apply_test").
Body(obj).Do(context.TODO()).Get()
Body(obj).Do(ctx).Get()
if err != nil {
framework.Failf("Failed to remove container port using Apply patch: %v", err)
}

deployment, err := client.AppsV1().Deployments(ns).Get(context.TODO(), "deployment", metav1.GetOptions{})
deployment, err := client.AppsV1().Deployments(ns).Get(ctx, "deployment", metav1.GetOptions{})
if err != nil {
framework.Failf("Failed to retrieve object: %v", err)
}
Expand Down Expand Up @@ -415,7 +415,7 @@ var _ = SIGDescribe("ServerSideApply", func() {
Name("deployment-shared-unset").
Param("fieldManager", fieldManager).
Body(apply).
Do(context.TODO()).
Do(ctx).
Get()
if err != nil {
framework.Failf("Failed to create object using Apply patch: %v", err)
Expand Down Expand Up @@ -459,7 +459,7 @@ var _ = SIGDescribe("ServerSideApply", func() {
Name("deployment-shared-unset").
Param("fieldManager", "shared_owner_1").
Body(apply).
Do(context.TODO()).
Do(ctx).
Get()
if err != nil {
framework.Failf("Failed to create object using Apply patch: %v", err)
Expand Down Expand Up @@ -518,7 +518,7 @@ var _ = SIGDescribe("ServerSideApply", func() {
Resource("deployments").
Name("deployment").
Param("fieldManager", "apply_test").
Body(obj).Do(context.TODO()).Get()
Body(obj).Do(ctx).Get()
if err != nil {
framework.Failf("Failed to create object using Apply patch: %v", err)
}
Expand All @@ -528,7 +528,7 @@ var _ = SIGDescribe("ServerSideApply", func() {
Namespace(ns).
Resource("deployments").
Name("deployment").
Body([]byte(`{"spec":{"replicas": 5}}`)).Do(context.TODO()).Get()
Body([]byte(`{"spec":{"replicas": 5}}`)).Do(ctx).Get()
if err != nil {
framework.Failf("Failed to patch object: %v", err)
}
Expand All @@ -539,7 +539,7 @@ var _ = SIGDescribe("ServerSideApply", func() {
Resource("deployments").
Name("deployment").
Param("fieldManager", "apply_test").
Body(obj).Do(context.TODO()).Get()
Body(obj).Do(ctx).Get()
if err == nil {
framework.Failf("Expecting to get conflicts when applying object")
}
Expand All @@ -558,7 +558,7 @@ var _ = SIGDescribe("ServerSideApply", func() {
Name("deployment").
Param("force", "true").
Param("fieldManager", "apply_test").
Body(obj).Do(context.TODO()).Get()
Body(obj).Do(ctx).Get()
if err != nil {
framework.Failf("Failed to apply object with force: %v", err)
}
Expand Down Expand Up @@ -678,7 +678,7 @@ spec:
Name(name).
Param("fieldManager", "apply_test").
Body(yamlBody).
DoRaw(context.TODO())
DoRaw(ctx)
if err != nil {
framework.Failf("failed to create custom resource with apply: %v:\n%v", err, string(result))
}
Expand Down Expand Up @@ -706,7 +706,7 @@ spec:
Name(name).
Param("fieldManager", "apply_test").
Body(yamlBodyBeta).
DoRaw(context.TODO())
DoRaw(ctx)
if err != nil {
framework.Failf("failed to create custom resource with apply: %v:\n%v", err, string(result))
}
Expand All @@ -719,7 +719,7 @@ spec:
AbsPath("/apis", noxuDefinition.Spec.Group, noxuDefinition.Spec.Versions[0].Name, noxuDefinition.Spec.Names.Plural).
Name(name).
Body([]byte(`{"metadata":{"finalizers":[]}}`)).
DoRaw(context.TODO())
DoRaw(ctx)
if err != nil {
framework.Failf("failed to reset finalizers: %v:\n%v", err, string(result))
}
Expand All @@ -730,7 +730,7 @@ spec:
AbsPath("/apis", noxuDefinition.Spec.Group, noxuDefinition.Spec.Versions[0].Name, noxuDefinition.Spec.Names.Plural).
Name(name).
Body([]byte(`{"metadata":{"finalizers":["test-finalizer","another-one"]}}`)).
DoRaw(context.TODO())
DoRaw(ctx)
if err != nil {
framework.Failf("failed to add finalizer with merge patch: %v:\n%v", err, string(result))
}
Expand All @@ -745,7 +745,7 @@ spec:
Param("fieldManager", "apply_test").
SetHeader("Accept", "application/json").
Body(yamlBody).
DoRaw(context.TODO())
DoRaw(ctx)
if err != nil {
framework.Failf("failed to apply same config after adding a finalizer: %v:\n%v", err, string(result))
}
Expand All @@ -758,7 +758,7 @@ spec:
AbsPath("/apis", noxuDefinition.Spec.Group, noxuDefinition.Spec.Versions[0].Name, noxuDefinition.Spec.Names.Plural).
Name(name).
Body([]byte(`{"spec":{"replicas": 5}}`)).
DoRaw(context.TODO())
DoRaw(ctx)
if err != nil {
framework.Failf("failed to update number of replicas with merge patch: %v:\n%v", err, string(result))
}
Expand All @@ -770,7 +770,7 @@ spec:
Name(name).
Param("fieldManager", "apply_test").
Body(yamlBody).
DoRaw(context.TODO())
DoRaw(ctx)
if err == nil {
framework.Failf("Expecting to get conflicts when applying object after updating replicas, got no error: %s", result)
}
Expand All @@ -789,7 +789,7 @@ spec:
Param("force", "true").
Param("fieldManager", "apply_test").
Body(yamlBody).
DoRaw(context.TODO())
DoRaw(ctx)
if err != nil {
framework.Failf("failed to apply object with force after updating replicas: %v:\n%v", err, string(result))
}
Expand All @@ -810,7 +810,7 @@ spec:
- name: "y"
containerPort: 80
protocol: TCP`, apiVersion, kind, name))).
DoRaw(context.TODO())
DoRaw(ctx)
if err == nil {
framework.Failf("Expecting to get conflicts when a different applier updates existing list item, got no error: %s", result)
}
Expand Down Expand Up @@ -838,7 +838,7 @@ spec:
containerPort: 8080
protocol: TCP`, apiVersion, kind, name))).
SetHeader("Accept", "application/json").
DoRaw(context.TODO())
DoRaw(ctx)
if err != nil {
framework.Failf("failed to add a new list item to the object as a different applier: %v:\n%v", err, string(result))
}
Expand Down Expand Up @@ -872,7 +872,7 @@ spec:
Name("should-not-exist").
Param("fieldManager", "apply_test").
Body(notExistingYAMLBody).
DoRaw(context.TODO())
DoRaw(ctx)
if !apierrors.IsNotFound(err) {
framework.Failf("create on update should fail with notFound, got %v", err)
}
Expand Down Expand Up @@ -932,7 +932,7 @@ spec:
Name(name).
Param("fieldManager", "apply_test").
Body(crdYamlBody).
DoRaw(context.TODO())
DoRaw(ctx)
if err != nil {
framework.Failf("failed to create custom resource with apply: %v:\n%v", err, string(result))
}
Expand All @@ -953,7 +953,7 @@ spec:
Param("fieldManager", "apply_test_2").
Param("force", "true").
Body(crdYamlBody).
DoRaw(context.TODO())
DoRaw(ctx)
if err != nil {
framework.Failf("failed to create custom resource with apply: %v:\n%v", err, string(result))
}
Expand Down Expand Up @@ -1006,7 +1006,7 @@ spec:
Name("deployment-shared-map-item-removal").
Param("fieldManager", "test_applier").
Body(apply).
Do(context.TODO()).
Do(ctx).
Get()
if err != nil {
framework.Failf("Failed to create object using Apply patch: %v", err)
Expand Down Expand Up @@ -1055,7 +1055,7 @@ spec:
Name("deployment-shared-map-item-removal").
Param("fieldManager", "test_applier").
Body(apply).
Do(context.TODO()).
Do(ctx).
Get()
if err != nil {
framework.Failf("Failed to create object using Apply patch: %v", err)
Expand Down
Loading

0 comments on commit 2f6c4f5

Please sign in to comment.