Skip to content

Commit 7739fa4

Browse files
committed
Add propagation policy when deleting Job
1 parent a1e885a commit 7739fa4

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

tests/framework/resourcemanager.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@ func (rm *ResourceManager) ApplyFromFiles(files []string, namespace string) erro
124124
}
125125

126126
// Delete deletes Kubernetes resources defined as Go objects.
127-
func (rm *ResourceManager) Delete(resources []client.Object) error {
127+
func (rm *ResourceManager) Delete(resources []client.Object, opts ...client.DeleteOption) error {
128128
for _, resource := range resources {
129129
ctx, cancel := context.WithTimeout(context.Background(), rm.TimeoutConfig.DeleteTimeout)
130130
defer cancel()
131131

132-
if err := rm.K8sClient.Delete(ctx, resource); err != nil && !apierrors.IsNotFound(err) {
132+
if err := rm.K8sClient.Delete(ctx, resource, opts...); err != nil && !apierrors.IsNotFound(err) {
133133
return fmt.Errorf("error deleting resource: %w", err)
134134
}
135135
}

tests/suite/graceful_recovery_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ func restartNginxContainer() {
131131
err = waitForContainerRestart(podNames[0], nginxContainerName, restartCount)
132132
Expect(err).ToNot(HaveOccurred())
133133

134-
err = resourceManager.Delete([]client.Object{job})
134+
// propagation policy is set to delete underlying pod created through job
135+
err = resourceManager.Delete([]client.Object{job}, client.PropagationPolicy(metav1.DeletePropagationBackground))
135136
Expect(err).ToNot(HaveOccurred())
136137
}
137138

@@ -149,7 +150,8 @@ func restartNGFProcess() {
149150
err = waitForContainerRestart(podNames[0], ngfContainerName, restartCount)
150151
Expect(err).ToNot(HaveOccurred())
151152

152-
err = resourceManager.Delete([]client.Object{job})
153+
// propagation policy is set to delete underlying pod created through job
154+
err = resourceManager.Delete([]client.Object{job}, client.PropagationPolicy(metav1.DeletePropagationBackground))
153155
Expect(err).ToNot(HaveOccurred())
154156
}
155157

0 commit comments

Comments
 (0)