Introducing controller sub-package within frontend crd package

aparna0508 · web-flow · commit 73e4626534ef · 2025-12-04T09:14:12.000+05:30
diff --git a/frontend/crd/controller/crd_controller.go b/frontend/crd/controller/crd_controller.go
@@ -1,6 +1,6 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
@@ -25,7 +25,7 @@ import (
 	clik8sclient "github.com/netapp/trident/cli/k8s_client"
 	"github.com/netapp/trident/config"
 	"github.com/netapp/trident/core"
-	"github.com/netapp/trident/frontend/crd/indexers"
+	"github.com/netapp/trident/frontend/crd/controller/indexers"
 	. "github.com/netapp/trident/logging"
 	tridentv1 "github.com/netapp/trident/persistent_store/crd/apis/netapp/v1"
 	tridentv1clientset "github.com/netapp/trident/persistent_store/crd/client/clientset/versioned"
diff --git a/frontend/crd/controller/crd_controller_test.go b/frontend/crd/controller/crd_controller_test.go
@@ -1,5 +1,5 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
-package crd
+package controller
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 	"github.com/netapp/trident/config"
 	. "github.com/netapp/trident/logging"
 	mockcore "github.com/netapp/trident/mocks/mock_core"
-	mockindexers "github.com/netapp/trident/mocks/mock_frontend/crd/indexers"
+	mockindexers "github.com/netapp/trident/mocks/mock_frontend/crd/controller/indexers"
 	persistentstore "github.com/netapp/trident/persistent_store"
 	tridentv1 "github.com/netapp/trident/persistent_store/crd/apis/netapp/v1"
 	"github.com/netapp/trident/storage"
diff --git a/frontend/crd/controller/crd_test.go b/frontend/crd/controller/crd_test.go
@@ -1,6 +1,6 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/indexers/indexers.go b/frontend/crd/controller/indexers/indexers.go
@@ -1,17 +1,17 @@
 // Copyright 2025 NetApp, Inc. All Rights Reserved.
 package indexers
 
-//go:generate mockgen -destination=../../../mocks/mock_frontend/crd/indexers/indexer/mock_vaindexer.go -package=mock_indexer github.com/netapp/trident/frontend/crd/indexers VolumeAttachmentIndexer
-//go:generate mockgen -destination=../../../mocks/mock_frontend/crd/indexers/mock_indexers.go github.com/netapp/trident/frontend/crd/indexers Indexers
-//go:generate mockgen -destination=../../../mocks/mock_cache/mock_indexer.go -package=mock_cache k8s.io/client-go/tools/cache Indexer
+//go:generate mockgen -destination=../../../../mocks/mock_frontend/crd/controller/indexers/indexer/mock_vaindexer.go -package=mock_indexer github.com/netapp/trident/frontend/crd/controller/indexers VolumeAttachmentIndexer
+//go:generate mockgen -destination=../../../../mocks/mock_frontend/crd/controller/indexers/mock_indexers.go github.com/netapp/trident/frontend/crd/controller/indexers Indexers
+//go:generate mockgen -destination=../../../../mocks/mock_cache/mock_indexer.go -package=mock_cache k8s.io/client-go/tools/cache Indexer
 
 import (
 	"context"
 
 	k8sstoragev1 "k8s.io/api/storage/v1"
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/netapp/trident/frontend/crd/indexers/vaindexer"
+	"github.com/netapp/trident/frontend/crd/controller/indexers/vaindexer"
 )
 
 // Indexers interface provides access to all the different indexers
diff --git a/frontend/crd/controller/indexers/indexers_test.go b/frontend/crd/controller/indexers/indexers_test.go
@@ -10,7 +10,7 @@ import (
 	"go.uber.org/mock/gomock"
 	"k8s.io/client-go/kubernetes/fake"
 
-	mock_indexer "github.com/netapp/trident/mocks/mock_frontend/crd/indexers/indexer"
+	mock_indexer "github.com/netapp/trident/mocks/mock_frontend/crd/controller/indexers/indexer"
 )
 
 func TestNewIndexers(t *testing.T) {
diff --git a/frontend/crd/controller/indexers/vaindexer/vaindexer.go b/frontend/crd/controller/indexers/vaindexer/vaindexer.go
diff --git a/frontend/crd/controller/indexers/vaindexer/vaindexer_test.go b/frontend/crd/controller/indexers/vaindexer/vaindexer_test.go
diff --git a/frontend/crd/controller/secret.go b/frontend/crd/controller/secret.go
@@ -1,6 +1,6 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/secret_test.go b/frontend/crd/controller/secret_test.go
@@ -1,6 +1,6 @@
 // Copyright 2025 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/snapshot_restore.go b/frontend/crd/controller/snapshot_restore.go
@@ -1,6 +1,6 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/snapshot_restore_test.go b/frontend/crd/controller/snapshot_restore_test.go
@@ -1,6 +1,6 @@
 // Copyright 2025 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"fmt"
diff --git a/frontend/crd/controller/trident_action_mirror_update.go b/frontend/crd/controller/trident_action_mirror_update.go
@@ -1,6 +1,6 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/trident_action_mirror_update_test.go b/frontend/crd/controller/trident_action_mirror_update_test.go
@@ -1,6 +1,6 @@
 // Copyright 2025 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"fmt"
diff --git a/frontend/crd/controller/trident_backend.go b/frontend/crd/controller/trident_backend.go
@@ -1,6 +1,6 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/trident_backend_config.go b/frontend/crd/controller/trident_backend_config.go
@@ -1,6 +1,6 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/trident_backend_config_test.go b/frontend/crd/controller/trident_backend_config_test.go
@@ -1,6 +1,6 @@
 // Copyright 2025 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/trident_backend_test.go b/frontend/crd/controller/trident_backend_test.go
@@ -1,6 +1,6 @@
 // Copyright 2025 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/trident_mirror_relationship.go b/frontend/crd/controller/trident_mirror_relationship.go
@@ -1,6 +1,6 @@
 // Copyright 2025 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/trident_mirror_relationship_test.go b/frontend/crd/controller/trident_mirror_relationship_test.go
@@ -1,6 +1,6 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/trident_node_remediation.go b/frontend/crd/controller/trident_node_remediation.go
@@ -1,6 +1,6 @@
 // Copyright 2025 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/trident_node_remediation_test.go b/frontend/crd/controller/trident_node_remediation_test.go
@@ -1,6 +1,6 @@
 // Copyright 2025 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"fmt"
@@ -14,9 +14,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	mockcore "github.com/netapp/trident/mocks/mock_core"
-	mock_crd "github.com/netapp/trident/mocks/mock_frontend/crd"
-	mockindexers "github.com/netapp/trident/mocks/mock_frontend/crd/indexers"
-	mockindexer "github.com/netapp/trident/mocks/mock_frontend/crd/indexers/indexer"
+	mock_controller_crd "github.com/netapp/trident/mocks/mock_frontend/crd/controller"
+	mockindexers "github.com/netapp/trident/mocks/mock_frontend/crd/controller/indexers"
+	mockindexer "github.com/netapp/trident/mocks/mock_frontend/crd/controller/indexers/indexer"
 	netappv1 "github.com/netapp/trident/persistent_store/crd/apis/netapp/v1"
 	"github.com/netapp/trident/storage"
 	"github.com/netapp/trident/utils/errors"
@@ -1315,7 +1315,7 @@ func TestFailoverDetach_Success(t *testing.T) {
 	kubeClient := GetTestKubernetesClientset()
 	snapClient := GetTestSnapshotClientset()
 	crdClient := GetTestCrdClientset()
-	remediationUtils := mock_crd.NewMockNodeRemediationUtils(mockCtrl)
+	remediationUtils := mock_controller_crd.NewMockNodeRemediationUtils(mockCtrl)
 
 	testPod := &corev1.Pod{
 		ObjectMeta: metav1.ObjectMeta{
@@ -1376,7 +1376,7 @@ func TestFailoverDetach_GetNodePodsError(t *testing.T) {
 	kubeClient := GetTestKubernetesClientset()
 	snapClient := GetTestSnapshotClientset()
 	crdClient := GetTestCrdClientset()
-	remediationUtils := mock_crd.NewMockNodeRemediationUtils(mockCtrl)
+	remediationUtils := mock_controller_crd.NewMockNodeRemediationUtils(mockCtrl)
 
 	remediationUtils.EXPECT().GetNodePods(ctx(), nodeName).Return([]*corev1.Pod{}, fmt.Errorf("mock error"))
 
@@ -1402,7 +1402,7 @@ func TestFailoverDetach_GetPvcToTvolMapError(t *testing.T) {
 	kubeClient := GetTestKubernetesClientset()
 	snapClient := GetTestSnapshotClientset()
 	crdClient := GetTestCrdClientset()
-	remediationUtils := mock_crd.NewMockNodeRemediationUtils(mockCtrl)
+	remediationUtils := mock_controller_crd.NewMockNodeRemediationUtils(mockCtrl)
 
 	remediationUtils.EXPECT().GetNodePods(ctx(), nodeName).Return([]*corev1.Pod{}, nil)
 	remediationUtils.EXPECT().GetPvcToTvolMap(ctx(), nodeName).Return(nil, fmt.Errorf("mock error"))
@@ -1429,7 +1429,7 @@ func TestFailoverDetach_GetVolumeAttachmentsToDeleteError(t *testing.T) {
 	kubeClient := GetTestKubernetesClientset()
 	snapClient := GetTestSnapshotClientset()
 	crdClient := GetTestCrdClientset()
-	remediationUtils := mock_crd.NewMockNodeRemediationUtils(mockCtrl)
+	remediationUtils := mock_controller_crd.NewMockNodeRemediationUtils(mockCtrl)
 
 	remediationUtils.EXPECT().GetNodePods(ctx(), nodeName).Return([]*corev1.Pod{}, nil)
 	remediationUtils.EXPECT().GetPvcToTvolMap(ctx(), nodeName).Return(map[string]*storage.VolumeExternal{}, nil)
@@ -1459,7 +1459,7 @@ func TestFailoverDetach_UpdateCrVolAttachementsError(t *testing.T) {
 	kubeClient := GetTestKubernetesClientset()
 	snapClient := GetTestSnapshotClientset()
 	crdClient := GetTestCrdClientset()
-	remediationUtils := mock_crd.NewMockNodeRemediationUtils(mockCtrl)
+	remediationUtils := mock_controller_crd.NewMockNodeRemediationUtils(mockCtrl)
 
 	remediationUtils.EXPECT().GetNodePods(ctx(), nodeName).Return([]*corev1.Pod{}, nil)
 	remediationUtils.EXPECT().GetPvcToTvolMap(ctx(), nodeName).Return(map[string]*storage.VolumeExternal{}, nil)
@@ -1483,12 +1483,12 @@ func TestFailoverDetach_UpdateCrVolAttachementsError(t *testing.T) {
 // using a parameterized approach to cover success and error cases systematically.
 func TestFailoverDetach_Scenarios(t *testing.T) {
 	tests := map[string]struct {
-		setupMocks             func(*mock_crd.MockNodeRemediationUtils)
+		setupMocks             func(*mock_controller_crd.MockNodeRemediationUtils)
 		expectError            bool
 		expectedErrorSubstring string
 	}{
 		"Success": {
-			setupMocks: func(remediationUtils *mock_crd.MockNodeRemediationUtils) {
+			setupMocks: func(remediationUtils *mock_controller_crd.MockNodeRemediationUtils) {
 				testPod := &corev1.Pod{
 					ObjectMeta: metav1.ObjectMeta{Name: "test-pod", Namespace: "default"},
 				}
@@ -1508,20 +1508,20 @@ func TestFailoverDetach_Scenarios(t *testing.T) {
 			expectError: false,
 		},
 		"GetNodePodsError": {
-			setupMocks: func(remediationUtils *mock_crd.MockNodeRemediationUtils) {
+			setupMocks: func(remediationUtils *mock_controller_crd.MockNodeRemediationUtils) {
 				remediationUtils.EXPECT().GetNodePods(ctx(), nodeName).Return(nil, fmt.Errorf("mock error"))
 			},
 			expectError: true,
 		},
 		"GetPvcToTvolMapError": {
-			setupMocks: func(remediationUtils *mock_crd.MockNodeRemediationUtils) {
+			setupMocks: func(remediationUtils *mock_controller_crd.MockNodeRemediationUtils) {
 				remediationUtils.EXPECT().GetNodePods(ctx(), nodeName).Return([]*corev1.Pod{}, nil)
 				remediationUtils.EXPECT().GetPvcToTvolMap(ctx(), nodeName).Return(nil, fmt.Errorf("mock error"))
 			},
 			expectError: true,
 		},
 		"GetVolumeAttachmentsToDeleteError": {
-			setupMocks: func(remediationUtils *mock_crd.MockNodeRemediationUtils) {
+			setupMocks: func(remediationUtils *mock_controller_crd.MockNodeRemediationUtils) {
 				remediationUtils.EXPECT().GetNodePods(ctx(), nodeName).Return([]*corev1.Pod{}, nil)
 				remediationUtils.EXPECT().GetPvcToTvolMap(ctx(), nodeName).Return(map[string]*storage.VolumeExternal{}, nil)
 				remediationUtils.EXPECT().GetPodsToDelete(ctx(), gomock.Any(), gomock.Any()).Return([]*corev1.Pod{})
@@ -1531,7 +1531,7 @@ func TestFailoverDetach_Scenarios(t *testing.T) {
 			expectError: true,
 		},
 		"ForceDeletePodError": {
-			setupMocks: func(remediationUtils *mock_crd.MockNodeRemediationUtils) {
+			setupMocks: func(remediationUtils *mock_controller_crd.MockNodeRemediationUtils) {
 				testPod := &corev1.Pod{
 					ObjectMeta: metav1.ObjectMeta{Name: "test-pod", Namespace: "default"},
 				}
@@ -1547,7 +1547,7 @@ func TestFailoverDetach_Scenarios(t *testing.T) {
 			expectError: true,
 		},
 		"DeleteVolumeAttachmentError": {
-			setupMocks: func(remediationUtils *mock_crd.MockNodeRemediationUtils) {
+			setupMocks: func(remediationUtils *mock_controller_crd.MockNodeRemediationUtils) {
 				testPod := &corev1.Pod{
 					ObjectMeta: metav1.ObjectMeta{Name: "test-pod", Namespace: "default"},
 				}
@@ -1575,7 +1575,7 @@ func TestFailoverDetach_Scenarios(t *testing.T) {
 			kubeClient := GetTestKubernetesClientset()
 			snapClient := GetTestSnapshotClientset()
 			crdClient := GetTestCrdClientset()
-			remediationUtils := mock_crd.NewMockNodeRemediationUtils(mockCtrl)
+			remediationUtils := mock_controller_crd.NewMockNodeRemediationUtils(mockCtrl)
 
 			tt.setupMocks(remediationUtils)
 
diff --git a/frontend/crd/controller/trident_node_remediation_utils.go b/frontend/crd/controller/trident_node_remediation_utils.go
@@ -1,6 +1,6 @@
-package crd
+package controller
 
-//go:generate mockgen -destination=../../mocks/mock_frontend/crd/mock_node_remediation.go github.com/netapp/trident/frontend/crd NodeRemediationUtils
+//go:generate mockgen -destination=../../../mocks/mock_frontend/crd/controller/mock_node_remediation.go github.com/netapp/trident/frontend/crd/controller NodeRemediationUtils
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 
 	"github.com/netapp/trident/core"
-	"github.com/netapp/trident/frontend/crd/indexers"
+	"github.com/netapp/trident/frontend/crd/controller/indexers"
 	k8shelper "github.com/netapp/trident/frontend/csi/controller_helpers/kubernetes"
 	. "github.com/netapp/trident/logging"
 	"github.com/netapp/trident/operator/controllers/orchestrator/installer"
diff --git a/frontend/crd/controller/trident_node_remediation_utils_test.go b/frontend/crd/controller/trident_node_remediation_utils_test.go
@@ -1,4 +1,4 @@
-package crd
+package controller
 
 import (
 	"fmt"
@@ -14,11 +14,11 @@ import (
 	"k8s.io/client-go/kubernetes"
 	ktesting "k8s.io/client-go/testing"
 
-	"github.com/netapp/trident/frontend/crd/indexers"
+	"github.com/netapp/trident/frontend/crd/controller/indexers"
 	k8shelper "github.com/netapp/trident/frontend/csi/controller_helpers/kubernetes"
 	mockcore "github.com/netapp/trident/mocks/mock_core"
-	mockindexers "github.com/netapp/trident/mocks/mock_frontend/crd/indexers"
-	mockindexer "github.com/netapp/trident/mocks/mock_frontend/crd/indexers/indexer"
+	mockindexers "github.com/netapp/trident/mocks/mock_frontend/crd/controller/indexers"
+	mockindexer "github.com/netapp/trident/mocks/mock_frontend/crd/controller/indexers/indexer"
 	"github.com/netapp/trident/storage"
 	"github.com/netapp/trident/utils/models"
 )
diff --git a/frontend/crd/controller/trident_snapshot_info.go b/frontend/crd/controller/trident_snapshot_info.go
@@ -1,6 +1,6 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/frontend/crd/controller/trident_snapshot_info_test.go b/frontend/crd/controller/trident_snapshot_info_test.go
@@ -1,6 +1,6 @@
 // Copyright 2023 NetApp, Inc. All Rights Reserved.
 
-package crd
+package controller
 
 import (
 	"context"
diff --git a/main.go b/main.go
@@ -20,7 +20,7 @@ import (
 	"github.com/netapp/trident/config"
 	"github.com/netapp/trident/core"
 	"github.com/netapp/trident/frontend"
-	"github.com/netapp/trident/frontend/crd"
+	"github.com/netapp/trident/frontend/crd/controller"
 	"github.com/netapp/trident/frontend/csi"
 	controllerhelpers "github.com/netapp/trident/frontend/csi/controller_helpers"
 	k8sctrlhelper "github.com/netapp/trident/frontend/csi/controller_helpers/kubernetes"
@@ -530,7 +530,7 @@ func main() {
 		postBootstrapFrontends = append(postBootstrapFrontends, csiFrontend)
 
 		if *useCRD {
-			crdController, err := crd.NewTridentCrdController(orchestrator, *k8sAPIServer, *k8sConfigPath)
+			crdController, err := controller.NewTridentCrdController(orchestrator, *k8sAPIServer, *k8sConfigPath)
 			if err != nil {
 				Log().Fatalf("Unable to start the Trident CRD controller frontend. %v", err)
 			}
diff --git a/mocks/mock_frontend/crd/controller/indexers/indexer/mock_vaindexer.go b/mocks/mock_frontend/crd/controller/indexers/indexer/mock_vaindexer.go
diff --git a/mocks/mock_frontend/crd/controller/indexers/mock_indexers.go b/mocks/mock_frontend/crd/controller/indexers/mock_indexers.go
diff --git a/mocks/mock_frontend/crd/controller/mock_node_remediation.go b/mocks/mock_frontend/crd/controller/mock_node_remediation.go

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"go.uber.org/mock/gomock"`
`11`	`11`	`"k8s.io/client-go/kubernetes/fake"`
`12`	`12`
`13`		`- mock_indexer "github.com/netapp/trident/mocks/mock_frontend/crd/indexers/indexer"`
	`13`	`+ mock_indexer "github.com/netapp/trident/mocks/mock_frontend/crd/controller/indexers/indexer"`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func TestNewIndexers(t *testing.T) {`