From 0f3fa91d0b449c81af2c11e72e644feed6fd1911 Mon Sep 17 00:00:00 2001 From: Christian Huffman Date: Fri, 6 Nov 2020 15:23:47 -0500 Subject: [PATCH] Don't check for snapshotClass when deleting content --- pkg/sidecar-controller/snapshot_controller.go | 7 +++---- pkg/sidecar-controller/snapshot_delete_test.go | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/sidecar-controller/snapshot_controller.go b/pkg/sidecar-controller/snapshot_controller.go index 51ad1041..7b6ea128 100644 --- a/pkg/sidecar-controller/snapshot_controller.go +++ b/pkg/sidecar-controller/snapshot_controller.go @@ -27,7 +27,6 @@ import ( codes "google.golang.org/grpc/codes" "google.golang.org/grpc/status" v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" klog "k8s.io/klog/v2" ) @@ -338,9 +337,9 @@ func (ctrl *csiSnapshotSideCarController) createSnapshotWrapper(content *crdv1.V func (ctrl *csiSnapshotSideCarController) deleteCSISnapshotOperation(content *crdv1.VolumeSnapshotContent) error { klog.V(5).Infof("deleteCSISnapshotOperation [%s] started", content.Name) - _, snapshotterCredentials, err := ctrl.getCSISnapshotInput(content) - if err != nil && !errors.IsNotFound(err) { - ctrl.eventRecorder.Event(content, v1.EventTypeWarning, "SnapshotDeleteError", "Failed to get snapshot class or credentials") + snapshotterCredentials, err := ctrl.GetCredentialsFromAnnotation(content) + if err != nil { + ctrl.eventRecorder.Event(content, v1.EventTypeWarning, "SnapshotDeleteError", "Failed to get snapshot credentials") return fmt.Errorf("failed to get input parameters to delete snapshot for content %s: %q", content.Name, err) } diff --git a/pkg/sidecar-controller/snapshot_delete_test.go b/pkg/sidecar-controller/snapshot_delete_test.go index d0604fab..7f18abc0 100644 --- a/pkg/sidecar-controller/snapshot_delete_test.go +++ b/pkg/sidecar-controller/snapshot_delete_test.go @@ -339,7 +339,7 @@ func TestDeleteSync(t *testing.T) { { name: "1-15 - (dynamic)deletion of content with no snapshotclass should succeed", initialContents: newContentArrayWithDeletionTimestamp("content1-15", "sid1-15", "snap1-15", "sid1-15", "", "", "snap1-15-volumehandle", deletePolicy, nil, &defaultSize, true, &timeNowMetav1), - expectedContents: newContentArrayWithDeletionTimestamp("content1-15", "sid1-15", "snap1-15", "sid1-15", "", "", "snap1-15-volumehandle", deletePolicy, nil, &defaultSize, true, &timeNowMetav1), + expectedContents: newContentArrayWithDeletionTimestamp("content1-15", "sid1-15", "snap1-15", "", "", "", "snap1-15-volumehandle", deletePolicy, nil, &defaultSize, false, &timeNowMetav1), errors: noerrors, expectedDeleteCalls: []deleteCall{{"sid1-15", nil, nil}}, test: testSyncContent,