Skip to content

Commit

Permalink
Merge pull request rook#14820 from BlaineEXE/multus-validation-do-not…
Browse files Browse the repository at this point in the history
…-force-delete

multus: do not force delete in validation cleanup
  • Loading branch information
BlaineEXE authored Oct 9, 2024
2 parents 0465908 + 936fe60 commit 4c87cf9
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions pkg/daemon/multus/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -386,12 +386,11 @@ func (vt *ValidationTest) cleanUpTestResources() (string, error) {
ctx := context.Background()

// delete the config object in the foreground so we wait until all validation test resources are
// gone before stopping, and do it now because there's no need to wait for just a test
var gracePeriodZero int64 = 0
// gone before stopping
deleteForeground := meta.DeletePropagationForeground
delOpts := meta.DeleteOptions{
PropagationPolicy: &deleteForeground,
GracePeriodSeconds: &gracePeriodZero,
PropagationPolicy: &deleteForeground,
// GracePeriodSeconds // leave at default; do not force delete, which can exhaust CNI IPAM addresses
}
err := vt.Clientset.CoreV1().ConfigMaps(vt.Namespace).Delete(ctx, ownerConfigMapName, delOpts)
if err != nil {
Expand Down

0 comments on commit 4c87cf9

Please sign in to comment.