File tree Expand file tree Collapse file tree 3 files changed +6
-4
lines changed Expand file tree Collapse file tree 3 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ package wrappers
3
3
4
4
import (
5
5
"context"
6
+
6
7
"github.com/pkg/errors"
7
8
appsv1 "k8s.io/api/apps/v1"
8
9
corev1 "k8s.io/api/core/v1"
@@ -102,7 +103,8 @@ func (c *InstallStrategyDeploymentClientForNamespace) CreateDeployment(deploymen
102
103
103
104
func (c * InstallStrategyDeploymentClientForNamespace ) DeleteDeployment (name string ) error {
104
105
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 )
106
108
immediateForegroundDelete := & metav1.DeleteOptions {GracePeriodSeconds : & immediate , PropagationPolicy : & foregroundDelete }
107
109
return c .opClient .DeleteDeployment (c .Namespace , name , immediateForegroundDelete )
108
110
}
Original file line number Diff line number Diff line change 49
49
ctx context.Context
50
50
51
51
scheme = runtime .NewScheme ()
52
- gracePeriod int64 = 0
52
+ gracePeriod int64 = 1
53
53
propagation = metav1 .DeletePropagationForeground
54
54
deleteOpts = & client.DeleteOptions {
55
55
GracePeriodSeconds : & gracePeriod ,
Original file line number Diff line number Diff line change 7
7
"testing"
8
8
"time"
9
9
10
- "github.com/operator-framework/api/pkg/operators/v1"
10
+ v1 "github.com/operator-framework/api/pkg/operators/v1"
11
11
"github.com/operator-framework/api/pkg/operators/v1alpha1"
12
12
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
13
13
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
26
26
pollDuration = 20 * time .Minute
27
27
terminationDuration = 5 * time .Minute
28
28
29
- immediate = int64 (0 )
29
+ immediate = int64 (1 )
30
30
immediateDeleteOption = & metav1.DeleteOptions {GracePeriodSeconds : & immediate }
31
31
)
32
32
You can’t perform that action at this time.
0 commit comments