Skip to content

Commit 0acd9f3

Browse files
committed
pkg,test: Avoid setting metadata.GracePeriodSeconds to zero seconds
Update any references where we set the metadata.GracePeriodSeconds field to zero seconds. If we need a Pod to be deleted as quick as possible, use a single second. Signed-off-by: timflannagan <[email protected]>
1 parent 76d665c commit 0acd9f3

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

pkg/api/wrappers/deployment_install_client.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package wrappers
33

44
import (
55
"context"
6+
67
"github.com/pkg/errors"
78
appsv1 "k8s.io/api/apps/v1"
89
corev1 "k8s.io/api/core/v1"
@@ -102,7 +103,8 @@ func (c *InstallStrategyDeploymentClientForNamespace) CreateDeployment(deploymen
102103

103104
func (c *InstallStrategyDeploymentClientForNamespace) DeleteDeployment(name string) error {
104105
foregroundDelete := metav1.DeletePropagationForeground // cascading delete
105-
immediate := int64(0)
106+
// Note(tflannag): See https://bugzilla.redhat.com/show_bug.cgi?id=1939294.
107+
immediate := int64(1)
106108
immediateForegroundDelete := &metav1.DeleteOptions{GracePeriodSeconds: &immediate, PropagationPolicy: &foregroundDelete}
107109
return c.opClient.DeleteDeployment(c.Namespace, name, immediateForegroundDelete)
108110
}

pkg/controller/operators/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var (
4949
ctx context.Context
5050

5151
scheme = runtime.NewScheme()
52-
gracePeriod int64 = 0
52+
gracePeriod int64 = 1
5353
propagation = metav1.DeletePropagationForeground
5454
deleteOpts = &client.DeleteOptions{
5555
GracePeriodSeconds: &gracePeriod,

test/rh-operators/operator_util.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/operator-framework/api/pkg/operators/v1"
10+
v1 "github.com/operator-framework/api/pkg/operators/v1"
1111
"github.com/operator-framework/api/pkg/operators/v1alpha1"
1212
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
1313
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
@@ -26,7 +26,7 @@ var (
2626
pollDuration = 20 * time.Minute
2727
terminationDuration = 5 * time.Minute
2828

29-
immediate = int64(0)
29+
immediate = int64(1)
3030
immediateDeleteOption = &metav1.DeleteOptions{GracePeriodSeconds: &immediate}
3131
)
3232

0 commit comments

Comments
 (0)