Repository: dell/csi-baremetal
Pull request #516 (2021-09-06 07:23:56)

[ISSUE-515] Rename node operator image
## Purpose
### Issue #515

Rename node operator image to get rid of name conflict with csi operator image

## PR checklist
- [x] Add link to the issue
- [x] Choose PR label
- [ ] New unit tests added
- [ ] Modified code has meaningful comments
- [ ] All TODOs are linked with the issues
- [ ] All comments are resolved

## Testing
```
$ pods
NAME                                             READY   STATUS    RESTARTS   AGE   IP           NODE                 NOMINATED NODE   READINESS GATES
csi-baremetal-controller-777f8dc6b4-khctg        4/4     Running   0          27m   10.244.3.5   kind-worker2         <none>           <none>
csi-baremetal-node-controller-779d8fd554-6d52l   1/1     Running   0          27m   10.244.3.3   kind-worker2         <none>           <none>
csi-baremetal-node-kernel-5.4-pj6ws              4/4     Running   0          27m   10.244.3.4   kind-worker2         <none>           <none>
csi-baremetal-node-kernel-5.4-q4nl8              4/4     Running   0          27m   10.244.1.5   kind-worker3         <none>           <none>
csi-baremetal-node-kernel-5.4-qzxz7              4/4     Running   0          27m   10.244.2.6   kind-worker          <none>           <none>
csi-baremetal-operator-66975c9db8-z7bd8          1/1     Running   0          31m   10.244.2.5   kind-worker          <none>           <none>
csi-baremetal-se-p9dqd                           1/1     Running   0          27m   172.18.0.2   kind-control-plane   <none>           <none>
csi-baremetal-se-patcher-dhtj6                   1/1     Running   0          27m   10.244.0.5   kind-control-plane   <none>           <none>
web-0                                            1/1     Running   0          26s   10.244.2.7   kind-worker          <none>           <none>
web-1                                            1/1     Running   0          26s   10.244.1.6   kind-worker3         <none>           <none>
web-2                                            1/1     Running   0          26s   10.244.3.6   kind-worker2         <none>           <none>

$ kubectl describe pod csi-baremetal-node-controller-779d8fd554-6d52l | grep -w Image:
    Image:         csi-baremetal-node-controller:0.4.0-445.a3abd8f
```

codecov[bot]: # [Codecov](https://codecov.io/gh/dell/csi-baremetal/pull/516?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell) Report
> Merging [#516](https://codecov.io/gh/dell/csi-baremetal/pull/516?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell) (a3abd8f) into [master](https://codecov.io/gh/dell/csi-baremetal/commit/a522c26e5bda838aad1c48437fddf1018a18e167?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell) (a522c26) will **not change** coverage.
> The diff coverage is `n/a`.

[![Impacted file tree graph](https://codecov.io/gh/dell/csi-baremetal/pull/516/graphs/tree.svg?width=650&height=150&src=pr&token=4D8WVNWX5O&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell)](https://codecov.io/gh/dell/csi-baremetal/pull/516?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell)

```diff
@@           Coverage Diff           @@
##           master     #516   +/-   ##
=======================================
  Coverage   60.31%   60.31%           
=======================================
  Files          60       60           
  Lines        5960     5960           
=======================================
  Hits         3595     3595           
  Misses       2155     2155           
  Partials      210      210           
```

| Flag | Coverage Δ | |
|---|---|---|
| unittests | `60.31% <ø> (ø)` | |

Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell#carryforward-flags-in-the-pull-request-comment) to find out more.

| [Impacted Files](https://codecov.io/gh/dell/csi-baremetal/pull/516?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell) | Coverage Δ | |
|---|---|---|
| [pkg/controller/controller.go](https://codecov.io/gh/dell/csi-baremetal/pull/516/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell#diff-cGtnL2NvbnRyb2xsZXIvY29udHJvbGxlci5nbw==) | `0.00% <ø> (ø)` | |
| [pkg/crcontrollers/node/common/annotation.go](https://codecov.io/gh/dell/csi-baremetal/pull/516/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell#diff-cGtnL2NyY29udHJvbGxlcnMvbm9kZS9jb21tb24vYW5ub3RhdGlvbi5nbw==) | `91.66% <ø> (ø)` | |
| [pkg/crcontrollers/node/controller.go](https://codecov.io/gh/dell/csi-baremetal/pull/516/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell#diff-cGtnL2NyY29udHJvbGxlcnMvbm9kZS9jb250cm9sbGVyLmdv) | `72.50% <ø> (ø)` | |
| [pkg/node/node.go](https://codecov.io/gh/dell/csi-baremetal/pull/516/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell#diff-cGtnL25vZGUvbm9kZS5nbw==) | `71.35% <ø> (ø)` | |
| [pkg/scheduler/extender/extender.go](https://codecov.io/gh/dell/csi-baremetal/pull/516/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell#diff-cGtnL3NjaGVkdWxlci9leHRlbmRlci9leHRlbmRlci5nbw==) | `36.01% <ø> (ø)` | |

------

[Continue to review full report at Codecov](https://codecov.io/gh/dell/csi-baremetal/pull/516?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/dell/csi-baremetal/pull/516?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell). Last update [a522c26...a3abd8f](https://codecov.io/gh/dell/csi-baremetal/pull/516?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=dell).


Patch:
diff --git a/Makefile b/Makefile
index f03ec7a..fe6f283 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ build-scheduler:
 	CGO_ENABLED=0 GOOS=linux go build -o ./build/${SCHEDULING_PKG}/${SCHEDULER}/${SCHEDULER} ./cmd/${SCHEDULING_PKG}/${SCHEDULER}/main.go
 
 build-node-controller:
-	CGO_ENABLED=0 GOOS=linux go build -o ./build/${CR_CONTROLLERS}/${OPERATOR}/${OPERATOR} ./cmd/${OPERATOR}/main.go
+	CGO_ENABLED=0 GOOS=linux go build -o ./build/${CR_CONTROLLERS}/${NODE_CONTROLLER}/${CONTROLLER} ./cmd/${NODE_CONTROLLER}/main.go
 
 ### Clean artifacts
 clean-all: clean clean-images
diff --git a/Makefile.docker b/Makefile.docker
index f511a99..1b07bc2 100644
--- a/Makefile.docker
+++ b/Makefile.docker
@@ -9,7 +9,7 @@ image-controller \
 image-extender \
 image-extender-patcher \
 image-scheduler \
-image-operator
+image-node-controller
 
 base-images: base-image-drivemgr base-image-node base-image-controller
 
@@ -61,11 +61,10 @@ image-scheduler:
 	cp ./pkg/${SCHEDULER}/${PLUGIN}/Dockerfile ./build/${SCHEDULING_PKG}/${SCHEDULER}/
 	docker build --network host --force-rm --tag ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG} ./build/${SCHEDULING_PKG}/${SCHEDULER}
 
-image-operator:
-	cp -r ./${DRIVER_CHART_PATH} ./build/${CR_CONTROLLERS}/${OPERATOR}/
-	cp ./pkg/${CR_CONTROLLERS}/${OPERATOR}/Dockerfile ./build/${CR_CONTROLLERS}/${OPERATOR}/
-	docker build --network host --force-rm --tag ${REGISTRY}/${PROJECT}-${OPERATOR}:${TAG} \
-	./build/${CR_CONTROLLERS}/${OPERATOR}
+image-node-controller:
+	cp ./pkg/${CR_CONTROLLERS}/${NODE_CONTROLLER_PKG}/Dockerfile ./build/${CR_CONTROLLERS}/${NODE_CONTROLLER}/
+	docker build --network host --force-rm --tag ${REGISTRY}/${PROJECT}-${NODE_CONTROLLER}:${TAG} \
+	./build/${CR_CONTROLLERS}/${NODE_CONTROLLER}
 
 ###################
 ### Push images ###
@@ -76,7 +75,7 @@ push-controller \
 push-extender \
 push-extender-patcher \
 push-scheduler \
-push-operator
+push-node-controller
 
 push-drivemgr:
 	docker push ${REGISTRY}/${PROJECT}-${DRIVE_MANAGER_TYPE}:${TAG}
@@ -97,8 +96,8 @@ push-extender-patcher:
 push-scheduler:
 	docker push ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG}
 
-push-operator:
-	docker push ${REGISTRY}/${PROJECT}-${OPERATOR}:${TAG}
+push-node-controller:
+	docker push ${REGISTRY}/${PROJECT}-${NODE_CONTROLLER}:${TAG}
 
 ####################
 ### Clean images ###
@@ -109,7 +108,7 @@ clean-image-drivemgr \
 clean-image-extender \
 clean-image-extender-patcher \
 clean-image-scheduler \
-clean-image-operator
+clean-image-node-controller
 
 clean-image-drivemgr:
 	docker rmi ${REGISTRY}/${PROJECT}-${DRIVE_MANAGER_TYPE}:${TAG}
@@ -130,5 +129,5 @@ clean-image-extender-patcher:
 clean-image-scheduler:
 	docker rmi ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG}
 
-clean-image-operator:
-	docker rmi ${REGISTRY}/${PROJECT}-${OPERATOR}:${TAG}
+clean-image-node-controller:
+	docker rmi ${REGISTRY}/${PROJECT}-${NODE_CONTROLLER}:${TAG}
diff --git a/Makefile.validation b/Makefile.validation
index 7d19cf4..0dcb3c8 100644
--- a/Makefile.validation
+++ b/Makefile.validation
@@ -62,7 +62,7 @@ kind-pull-images: kind-pull-sidecar-images
 	docker pull ${REGISTRY}/${PROJECT}-${SCHEDULER}-${EXTENDER}:${TAG}
 	docker pull ${REGISTRY}/${PROJECT}-${EXTENDER_PATCHER}:${TAG}
 	docker pull ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG}
-	docker pull ${REGISTRY}/${PROJECT}-${OPERATOR}:${TAG}
+	docker pull ${REGISTRY}/${PROJECT}-${NODE_CONTROLLER}:${TAG}
 
 kind-pull-sidecar-images:
 	docker pull ${REGISTRY}/${CSI_PROVISIONER}:${CSI_PROVISIONER_TAG}
@@ -90,7 +90,7 @@ kind-tag-images:
 	docker tag ${REGISTRY}/${PROJECT}-${SCHEDULER}-${EXTENDER}:${TAG} ${PROJECT}-${SCHEDULER}-${EXTENDER}:${TAG}
 	docker tag ${REGISTRY}/${PROJECT}-${EXTENDER_PATCHER}:${TAG} ${PROJECT}-${EXTENDER_PATCHER}:${TAG}
 	docker tag ${REGISTRY}/${PROJECT}-${SCHEDULER}:${TAG} ${PROJECT}-${SCHEDULER}:${TAG}
-	docker tag ${REGISTRY}/${PROJECT}-${OPERATOR}:${TAG} ${PROJECT}-${OPERATOR}:${TAG}
+	docker tag ${REGISTRY}/${PROJECT}-${NODE_CONTROLLER}:${TAG} ${PROJECT}-${NODE_CONTROLLER}:${TAG}
 
 kind-load-images:
 	$(KIND) load docker-image ${CSI_PROVISIONER}:${CSI_PROVISIONER_TAG}
@@ -108,7 +108,7 @@ kind-load-images:
 	$(KIND) load docker-image ${PROJECT}-${SCHEDULER}-${EXTENDER}:${TAG}
 	$(KIND) load docker-image ${PROJECT}-${EXTENDER_PATCHER}:${TAG}
 	$(KIND) load docker-image ${PROJECT}-${SCHEDULER}:${TAG}
-	$(KIND) load docker-image ${PROJECT}-${OPERATOR}:${TAG}
+	$(KIND) load docker-image ${PROJECT}-${NODE_CONTROLLER}:${TAG}
 
 kind-build:
 	# Get kind sources
diff --git a/cmd/drivemgr/loopbackmgr/main.go b/cmd/drivemgr/loopbackmgr/main.go
index 72ea827..6d0c3d4 100644
--- a/cmd/drivemgr/loopbackmgr/main.go
+++ b/cmd/drivemgr/loopbackmgr/main.go
@@ -29,7 +29,7 @@ import (
 	"github.com/dell/csi-baremetal/pkg/base/featureconfig"
 	"github.com/dell/csi-baremetal/pkg/base/k8s"
 	"github.com/dell/csi-baremetal/pkg/base/rpc"
-	annotations "github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	annotations "github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 	"github.com/dell/csi-baremetal/pkg/drivemgr/loopbackmgr"
 )
 
diff --git a/cmd/operator/main.go b/cmd/node-controller/main.go
similarity index 94%
rename from cmd/operator/main.go
rename to cmd/node-controller/main.go
index 30fb240..3fd52c3 100644
--- a/cmd/operator/main.go
+++ b/cmd/node-controller/main.go
@@ -29,7 +29,7 @@ import (
 	"github.com/dell/csi-baremetal/api/v1/nodecrd"
 	"github.com/dell/csi-baremetal/pkg/base"
 	"github.com/dell/csi-baremetal/pkg/base/k8s"
-	"github.com/dell/csi-baremetal/pkg/crcontrollers/operator"
+	"github.com/dell/csi-baremetal/pkg/crcontrollers/node"
 )
 
 var (
@@ -66,7 +66,7 @@ func main() {
 	}
 	kubeClient := k8s.NewKubeClient(k8sClient, logger, *namespace)
 
-	nodeCtrl, err := operator.NewController(*nodeSelector, *useExternalAnnotation, *nodeIDAnnotation, kubeClient, logger)
+	nodeCtrl, err := node.NewController(*nodeSelector, *useExternalAnnotation, *nodeIDAnnotation, kubeClient, logger)
 	if err != nil {
 		logger.Fatal(err)
 	}
diff --git a/cmd/node/main.go b/cmd/node/main.go
index 0c1be00..0794b7e 100644
--- a/cmd/node/main.go
+++ b/cmd/node/main.go
@@ -49,7 +49,7 @@ import (
 	"github.com/dell/csi-baremetal/pkg/base/util"
 	"github.com/dell/csi-baremetal/pkg/crcontrollers/drive"
 	"github.com/dell/csi-baremetal/pkg/crcontrollers/lvg"
-	annotations "github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	annotations "github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 	"github.com/dell/csi-baremetal/pkg/events"
 	"github.com/dell/csi-baremetal/pkg/metrics"
 	"github.com/dell/csi-baremetal/pkg/node"
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index de7f4cc..8f6c7c6 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -40,7 +40,7 @@ import (
 	"github.com/dell/csi-baremetal/pkg/base/util"
 	"github.com/dell/csi-baremetal/pkg/common"
 	"github.com/dell/csi-baremetal/pkg/controller/node"
-	csibmnodeconst "github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	csibmnodeconst "github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 )
 
 // NodeID is the type for node hostname
diff --git a/pkg/crcontrollers/operator/Dockerfile b/pkg/crcontrollers/node/Dockerfile
similarity index 50%
rename from pkg/crcontrollers/operator/Dockerfile
rename to pkg/crcontrollers/node/Dockerfile
index e38eaac..0cb84da 100644
--- a/pkg/crcontrollers/operator/Dockerfile
+++ b/pkg/crcontrollers/node/Dockerfile
@@ -2,6 +2,6 @@ FROM    alpine:3.14
 
 LABEL   description="Baremetal CSI Operator"
 
-ADD     operator  csi-operator
+ADD     controller  node-controller
 
-ENTRYPOINT ["/csi-operator"]
+ENTRYPOINT ["/node-controller"]
diff --git a/pkg/crcontrollers/operator/common/annotation.go b/pkg/crcontrollers/node/common/annotation.go
similarity index 100%
rename from pkg/crcontrollers/operator/common/annotation.go
rename to pkg/crcontrollers/node/common/annotation.go
diff --git a/pkg/crcontrollers/operator/common/annotation_test.go b/pkg/crcontrollers/node/common/annotation_test.go
similarity index 100%
rename from pkg/crcontrollers/operator/common/annotation_test.go
rename to pkg/crcontrollers/node/common/annotation_test.go
diff --git a/pkg/crcontrollers/operator/common/const.go b/pkg/crcontrollers/node/common/const.go
similarity index 100%
rename from pkg/crcontrollers/operator/common/const.go
rename to pkg/crcontrollers/node/common/const.go
diff --git a/pkg/crcontrollers/operator/controller.go b/pkg/crcontrollers/node/controller.go
similarity index 99%
rename from pkg/crcontrollers/operator/controller.go
rename to pkg/crcontrollers/node/controller.go
index 89d55e3..d561746 100644
--- a/pkg/crcontrollers/operator/controller.go
+++ b/pkg/crcontrollers/node/controller.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package operator
+package node
 
 import (
 	"context"
@@ -38,7 +38,7 @@ import (
 	api "github.com/dell/csi-baremetal/api/generated/v1"
 	"github.com/dell/csi-baremetal/api/v1/nodecrd"
 	"github.com/dell/csi-baremetal/pkg/base/k8s"
-	"github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	"github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 )
 
 const (
diff --git a/pkg/node/node.go b/pkg/node/node.go
index 6e16355..78848b4 100644
--- a/pkg/node/node.go
+++ b/pkg/node/node.go
@@ -45,7 +45,7 @@ import (
 	"github.com/dell/csi-baremetal/pkg/base/util"
 	"github.com/dell/csi-baremetal/pkg/common"
 	"github.com/dell/csi-baremetal/pkg/controller"
-	csibmnodeconst "github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	csibmnodeconst "github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 	"github.com/dell/csi-baremetal/pkg/eventing"
 )
 
diff --git a/pkg/scheduler/extender/extender.go b/pkg/scheduler/extender/extender.go
index e195f88..3d1ae38 100644
--- a/pkg/scheduler/extender/extender.go
+++ b/pkg/scheduler/extender/extender.go
@@ -44,7 +44,7 @@ import (
 	fc "github.com/dell/csi-baremetal/pkg/base/featureconfig"
 	"github.com/dell/csi-baremetal/pkg/base/k8s"
 	"github.com/dell/csi-baremetal/pkg/base/util"
-	annotations "github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	annotations "github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 )
 
 // Extender holds http handlers for scheduler extender endpoints and implements logic for nodes filtering
diff --git a/variables.mk b/variables.mk
index e76de17..2f26ed6 100644
--- a/variables.mk
+++ b/variables.mk
@@ -34,6 +34,7 @@ SCHEDULING_PKG := scheduling
 SCHEDULER_EXTENDER_PKG := extender
 SCHEDULER_EXTENDER_PATCHER_PKG := scheduler/patcher
 CR_CONTROLLERS := crcontrollers
+NODE_CONTROLLER_PKG := node
 
 ### components
 NODE             := node
@@ -42,7 +43,7 @@ CONTROLLER       := controller
 SCHEDULER        := scheduler
 EXTENDER         := extender
 EXTENDER_PATCHER := scheduler-patcher
-OPERATOR      	 := operator
+NODE_CONTROLLER  := ${NODE_CONTROLLER_PKG}-${CONTROLLER}
 PLUGIN           := plugin
 
 BASE_DRIVE_MGR     := basemgr


Test patch:
diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
index 9159b76..61294a1 100644
--- a/pkg/controller/controller_test.go
+++ b/pkg/controller/controller_test.go
@@ -48,7 +48,7 @@ import (
 	"github.com/dell/csi-baremetal/pkg/base/k8s"
 	"github.com/dell/csi-baremetal/pkg/base/linuxutils/fs"
 	"github.com/dell/csi-baremetal/pkg/common"
-	csibmnodeconst "github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	csibmnodeconst "github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 	"github.com/dell/csi-baremetal/pkg/testutils"
 )
 
diff --git a/pkg/crcontrollers/operator/controller_test.go b/pkg/crcontrollers/node/controller_test.go
similarity index 99%
rename from pkg/crcontrollers/operator/controller_test.go
rename to pkg/crcontrollers/node/controller_test.go
index 688cee9..e8a44cb 100644
--- a/pkg/crcontrollers/operator/controller_test.go
+++ b/pkg/crcontrollers/node/controller_test.go
@@ -1,4 +1,4 @@
-package operator
+package node
 
 import (
 	"context"
@@ -18,7 +18,7 @@ import (
 	crdV1 "github.com/dell/csi-baremetal/api/v1"
 	"github.com/dell/csi-baremetal/api/v1/nodecrd"
 	"github.com/dell/csi-baremetal/pkg/base/k8s"
-	"github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	"github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 )
 
 var (
diff --git a/pkg/node/node_test.go b/pkg/node/node_test.go
index 2e22039..a34b84d 100644
--- a/pkg/node/node_test.go
+++ b/pkg/node/node_test.go
@@ -40,7 +40,7 @@ import (
 	"github.com/dell/csi-baremetal/pkg/base/featureconfig"
 	"github.com/dell/csi-baremetal/pkg/base/k8s"
 	"github.com/dell/csi-baremetal/pkg/base/util"
-	csibmnodeconst "github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	csibmnodeconst "github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 	"github.com/dell/csi-baremetal/pkg/mocks"
 	mockProv "github.com/dell/csi-baremetal/pkg/mocks/provisioners"
 	p "github.com/dell/csi-baremetal/pkg/node/provisioners"
diff --git a/pkg/scheduler/extender/extender_test.go b/pkg/scheduler/extender/extender_test.go
index da32c23..7ddd1c8 100644
--- a/pkg/scheduler/extender/extender_test.go
+++ b/pkg/scheduler/extender/extender_test.go
@@ -40,7 +40,7 @@ import (
 	baseerr "github.com/dell/csi-baremetal/pkg/base/error"
 	fc "github.com/dell/csi-baremetal/pkg/base/featureconfig"
 	"github.com/dell/csi-baremetal/pkg/base/k8s"
-	annotations "github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	annotations "github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 )
 
 // todo review all tests. some might not be relevant
diff --git a/test/e2e/scenarios/drive-health-change.go b/test/e2e/scenarios/drive-health-change.go
index d74f028..5fefe20 100644
--- a/test/e2e/scenarios/drive-health-change.go
+++ b/test/e2e/scenarios/drive-health-change.go
@@ -34,7 +34,7 @@ import (
 	"k8s.io/kubernetes/test/e2e/storage/testsuites"
 
 	apiV1 "github.com/dell/csi-baremetal/api/v1"
-	akey "github.com/dell/csi-baremetal/pkg/crcontrollers/operator/common"
+	akey "github.com/dell/csi-baremetal/pkg/crcontrollers/node/common"
 	"github.com/dell/csi-baremetal/pkg/eventing"
 	"github.com/dell/csi-baremetal/test/e2e/common"
 )