diff --git a/pkg/component/delete/interface.go b/pkg/component/delete/interface.go index 494c26ab536..eee839e4b09 100644 --- a/pkg/component/delete/interface.go +++ b/pkg/component/delete/interface.go @@ -6,8 +6,8 @@ import ( ) type Client interface { - // ListResourcesToDelete lists Kubernetes resources from cluster in namespace for a given odo component - ListResourcesToDelete(componentName string, namespace string) ([]unstructured.Unstructured, error) + // ListClusterResourceToDelete lists Kubernetes resources from cluster in namespace for a given odo component + ListClusterResourceToDelete(componentName string, namespace string) ([]unstructured.Unstructured, error) // DeleteResources deletes the unstuctured resources and return the resources that failed to be deleted DeleteResources([]unstructured.Unstructured) []unstructured.Unstructured // ExecutePreStopEvents executes preStop events if any, as a precondition to deleting a devfile component deployment diff --git a/pkg/component/delete/mock.go b/pkg/component/delete/mock.go index 038bb54b867..d2a21908b77 100644 --- a/pkg/component/delete/mock.go +++ b/pkg/component/delete/mock.go @@ -35,7 +35,22 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { return m.recorder } -// DeleteResources mocks base method. +// ListClusterResourceToDelete mocks base method +func (m *MockClient) ListClusterResourceToDelete(componentName, namespace string) ([]unstructured.Unstructured, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "ListClusterResourceToDelete", componentName, namespace) + ret0, _ := ret[0].([]unstructured.Unstructured) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// ListClusterResourceToDelete indicates an expected call of ListClusterResourceToDelete +func (mr *MockClientMockRecorder) ListClusterResourceToDelete(componentName, namespace interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListClusterResourceToDelete", reflect.TypeOf((*MockClient)(nil).ListClusterResourceToDelete), componentName, namespace) +} + +// DeleteResources mocks base method func (m *MockClient) DeleteResources(arg0 []unstructured.Unstructured) []unstructured.Unstructured { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeleteResources", arg0) @@ -63,21 +78,6 @@ func (mr *MockClientMockRecorder) ExecutePreStopEvents(devfileObj, appName inter return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ExecutePreStopEvents", reflect.TypeOf((*MockClient)(nil).ExecutePreStopEvents), devfileObj, appName) } -// ListResourcesToDelete mocks base method. -func (m *MockClient) ListResourcesToDelete(componentName, namespace string) ([]unstructured.Unstructured, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ListResourcesToDelete", componentName, namespace) - ret0, _ := ret[0].([]unstructured.Unstructured) - ret1, _ := ret[1].(error) - return ret0, ret1 -} - -// ListResourcesToDelete indicates an expected call of ListResourcesToDelete. -func (mr *MockClientMockRecorder) ListResourcesToDelete(componentName, namespace interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListResourcesToDelete", reflect.TypeOf((*MockClient)(nil).ListResourcesToDelete), componentName, namespace) -} - // ListResourcesToDeleteFromDevfile mocks base method. func (m *MockClient) ListResourcesToDeleteFromDevfile(devfileObj parser.DevfileObj, appName string) (bool, []unstructured.Unstructured, error) { m.ctrl.T.Helper() diff --git a/pkg/odo/cli/delete/component.go b/pkg/odo/cli/delete/component.go index 16d633d2a67..3400fa43e6f 100644 --- a/pkg/odo/cli/delete/component.go +++ b/pkg/odo/cli/delete/component.go @@ -91,7 +91,7 @@ func (o *ComponentOptions) Run(ctx context.Context) error { // deleteNamedComponent deletes a component given its name func (o *ComponentOptions) deleteNamedComponent() error { log.Info("Searching resources to delete, please wait...") - list, err := o.clientset.DeleteClient.ListResourcesToDelete(o.name, o.namespace) + list, err := o.clientset.DeleteClient.ListClusterResourceToDelete(o.name, o.namespace) if err != nil { return err } @@ -130,7 +130,7 @@ func (o *ComponentOptions) deleteDevfileComponent() error { return nil } var remainingResources []unstructured.Unstructured - k8sResources, _ := o.clientset.DeleteClient.ListResourcesToDelete(componentName, namespace) + k8sResources, _ := o.clientset.DeleteClient.ListClusterResourceToDelete(componentName, namespace) // get resources present in k8sResources(present on the cluster) but not in devfileResources(not present in the devfile) for _, k8sresource := range k8sResources { var present bool