Skip to content

K
k3s
Unverified Commit b7579ccd authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #67136 from apelisse/dry-run-tests

Automatic merge from submit-queue (batch tested with PRs 66177, 66185, 67136, 67157, 65065). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. dry-run: Add resttests Add Resttests **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Partially #67128 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 803e96eb f3b8e85a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 2 deletions
staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go
View file @ b7579ccd
...@@ -1004,8 +1004,15 @@ func (e *Store) Delete(ctx context.Context, name string, options *metav1.DeleteO ...@@ -1004,8 +1004,15 @@ func (e *Store) Delete(ctx context.Context, name string, options *metav1.DeleteO
return out, false, err return out, false, err
} }
// If dry-run, then just return the object as just saved. // Going further in this function is not useful when we are
if dryrun.IsDryRun(options.DryRun) { // performing a dry-run request. Worse, it will actually
// override "out" with the version of the object in database
// that doesn't have the finalizer and deletiontimestamp set
// (because the update above was dry-run too). If we already
// have that version available, let's just return it now,
// otherwise, we can call dry-run delete that will get us the
// latest version of the object.
if dryrun.IsDryRun(options.DryRun) && out != nil {
return out, true, nil return out, true, nil
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment