diff --git a/Makefile b/Makefile index a67d02d9..cdf0ab04 100644 --- a/Makefile +++ b/Makefile @@ -96,16 +96,16 @@ test: manifests gen-semver fmt vet envtest ## Run tests. KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test ./... -coverprofile cover.out controller-unit-test: - go clean -cache && go test -v -coverprofile=c.out github.com/dell/csm-operator/controllers + go clean -cache && go test -v -coverprofile=c.out eos2git.cec.lab.emc.com/CSM/csm-operator/controllers driver-unit-test: - go clean -cache && go test -v -coverprofile=c.out github.com/dell/csm-operator/pkg/drivers + go clean -cache && go test -v -coverprofile=c.out eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers module-unit-test: - go clean -cache && go test -v -coverprofile=c.out github.com/dell/csm-operator/pkg/modules + go clean -cache && go test -v -coverprofile=c.out eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/modules operatorutils-unit-test: - go clean -cache && go test -v -coverprofile=c.out github.com/dell/csm-operator/pkg/operatorutils + go clean -cache && go test -v -coverprofile=c.out eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils .PHONY: actions action-help actions: ## Run all GitHub Action checks that run on a pull request creation diff --git a/PROJECT b/PROJECT index 1ba4adc2..8e63507e 100644 --- a/PROJECT +++ b/PROJECT @@ -5,7 +5,7 @@ plugins: manifests.sdk.operatorframework.io/v2: {} scorecard.sdk.operatorframework.io/v2: {} projectName: dell-csm-operator -repo: github.com/dell/csm-operator +repo: eos2git.cec.lab.emc.com/CSM/csm-operator resources: - api: crdVersion: v1 @@ -14,6 +14,6 @@ resources: domain: dell.com group: storage kind: ContainerStorageModule - path: github.com/dell/csm-operator/api/v1 + path: eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1 version: v1 version: "3" diff --git a/README.md b/README.md index 4a915793..40dc45e1 100644 --- a/README.md +++ b/README.md @@ -11,11 +11,11 @@ You may obtain a copy of the License at # Dell Technologies Container Storage Modules (CSM) Operator -[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](https://github.com/dell/csm/blob/main/docs/CODE_OF_CONDUCT.md) +[![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](https://eos2git.cec.lab.emc.com/CSM/csm/blob/main/docs/CODE_OF_CONDUCT.md) [![License](https://img.shields.io/github/license/dell/csm-operator)](LICENSE) [![Docker Pulls](https://img.shields.io/docker/pulls/dellemc/dell-csm-operator)](https://hub.docker.com/r/dellemc/dell-csm-operator) [![Go version](https://img.shields.io/github/go-mod/go-version/dell/csm-operator)](go.mod) -[![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/dell/csm-operator?include_prereleases&label=latest&style=flat-square)](https://github.com/dell/csm-operator/releases/latest) +[![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/dell/csm-operator?include_prereleases&label=latest&style=flat-square)](https://eos2git.cec.lab.emc.com/CSM/csm-operator/releases/latest) Dell Technologies Container Storage Modules (CSM) Operator is an open-source Kubernetes operator which can be used to install and manage various CSI Drivers and CSM Modules. diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index 798c58be..4feee31b 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -1494,7 +1494,7 @@ metadata: features.operators.openshift.io/token-auth-gcp: "false" operators.operatorframework.io/builder: operator-sdk-v1.37.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - repository: https://github.com/dell/csm-operator + repository: https://eos2git.cec.lab.emc.com/CSM/csm-operator support: Dell Technologies name: dell-csm-operator.v1.10.0 namespace: placeholder @@ -4450,7 +4450,7 @@ spec: minKubeVersion: 1.24.0 provider: name: Dell Technologies - url: https://github.com/dell/csm-operator + url: https://eos2git.cec.lab.emc.com/CSM/csm-operator relatedImages: - image: quay.io/dell/container-storage-modules/dell-csm-operator:v1.10.0 name: dell-csm-operator diff --git a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml index d414ddfd..8411640f 100644 --- a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml @@ -15,7 +15,7 @@ metadata: features.operators.openshift.io/token-auth-aws: "false" features.operators.openshift.io/token-auth-azure: "false" features.operators.openshift.io/token-auth-gcp: "false" - repository: https://github.com/dell/csm-operator + repository: https://eos2git.cec.lab.emc.com/CSM/csm-operator support: Dell Technologies name: dell-csm-operator.v1.10.0 namespace: placeholder @@ -1750,7 +1750,7 @@ spec: minKubeVersion: 1.24.0 provider: name: Dell Technologies - url: https://github.com/dell/csm-operator + url: https://eos2git.cec.lab.emc.com/CSM/csm-operator relatedImages: - image: quay.io/dell/container-storage-modules/dell-csm-operator:v1.10.0 name: dell-csm-operator diff --git a/controllers/csm_controller.go b/controllers/csm_controller.go index 094f741e..87004a4b 100644 --- a/controllers/csm_controller.go +++ b/controllers/csm_controller.go @@ -23,22 +23,22 @@ import ( "sync/atomic" "time" - "github.com/dell/csm-operator/pkg/drivers" - "github.com/dell/csm-operator/pkg/modules" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/modules" "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/constants" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" - "github.com/dell/csm-operator/pkg/resources/configmap" - "github.com/dell/csm-operator/pkg/resources/csidriver" - "github.com/dell/csm-operator/pkg/resources/daemonset" - "github.com/dell/csm-operator/pkg/resources/deployment" - "github.com/dell/csm-operator/pkg/resources/rbac" - "github.com/dell/csm-operator/pkg/resources/serviceaccount" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/constants" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/resources/configmap" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/resources/csidriver" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/resources/daemonset" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/resources/deployment" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/resources/rbac" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/resources/serviceaccount" "go.uber.org/zap" appsv1 "k8s.io/api/apps/v1" diff --git a/controllers/csm_controller_test.go b/controllers/csm_controller_test.go index 18b31442..c836ce6f 100644 --- a/controllers/csm_controller_test.go +++ b/controllers/csm_controller_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - "github.com/dell/csm-operator/pkg/constants" - "github.com/dell/csm-operator/pkg/modules" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/constants" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/modules" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" - csmv1 "github.com/dell/csm-operator/api/v1" - v1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/logger" - "github.com/dell/csm-operator/tests/shared" - "github.com/dell/csm-operator/tests/shared/clientgoclient" - "github.com/dell/csm-operator/tests/shared/crclient" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + v1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared/clientgoclient" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared/crclient" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" diff --git a/docs/BRANCHING.md b/docs/BRANCHING.md index 658ba45d..50673208 100644 --- a/docs/BRANCHING.md +++ b/docs/BRANCHING.md @@ -32,5 +32,5 @@ CSM follows a scaled trunk branching strategy where short-lived branches are cre 2. Create a branch off of the main branch. The branch name should follow [branch naming convention](#branch-naming-convention). 3. Make your changes and commit them to your branch. 4. If other code changes have merged into the upstream main branch, perform a rebase of those changes into your branch. -5. Open a [pull request](https://github.com/dell/csm/pulls) between your branch and the upstream main branch. +5. Open a [pull request](https://eos2git.cec.lab.emc.com/CSM/csm/pulls) between your branch and the upstream main branch. 6. Once your pull request has merged, your branch can be deleted. diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 80bcd619..ec92a252 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -40,15 +40,15 @@ You can contribute to this project in several ways. Here are some examples: ## Submitting issues -All issues related to CSM, regardless of the service/repository the issue belongs to (see table above), should be submitted [here](https://github.com/dell/csm/issues). Issues will be triaged and labels will be used to indicate the type of issue. This section outlines the types of issues that can be submitted. +All issues related to CSM, regardless of the service/repository the issue belongs to (see table above), should be submitted [here](https://eos2git.cec.lab.emc.com/CSM/csm/issues). Issues will be triaged and labels will be used to indicate the type of issue. This section outlines the types of issues that can be submitted. ### Report bugs We aim to track and document everything related to CSM via the Issues page. The code and documentation are released with no warranties or SLAs and are intended to be supported through a community driven process. -Before submitting a new issue, make sure someone hasn't already reported the problem. Look through the [existing issues](https://github.com/dell/csm/issues) for similar issues. +Before submitting a new issue, make sure someone hasn't already reported the problem. Look through the [existing issues](https://eos2git.cec.lab.emc.com/CSM/csm/issues) for similar issues. -Report a bug by submitting a [bug report](https://github.com/dell/csm/issues/new?labels=type%2Fbug%2C+needs-triage&template=bug_report.md&title=%5BBUG%5D%3A). Make sure that you provide as much information as possible on how to reproduce the bug. +Report a bug by submitting a [bug report](https://eos2git.cec.lab.emc.com/CSM/csm/issues/new?labels=type%2Fbug%2C+needs-triage&template=bug_report.md&title=%5BBUG%5D%3A). Make sure that you provide as much information as possible on how to reproduce the bug. When opening a Bug please include the following information to help with debugging: @@ -61,11 +61,11 @@ An Issue __must__ be created before submitting any pull request. Any pull reques ### Feature request -If you have an idea of how to improve this project, submit a [feature request](https://github.com/dell/csm/issues/new?labels=type%2Ffeature-request%2C+needs-triage&template=feature_request.md&title=%5BFEATURE%5D%3A). +If you have an idea of how to improve this project, submit a [feature request](https://eos2git.cec.lab.emc.com/CSM/csm/issues/new?labels=type%2Ffeature-request%2C+needs-triage&template=feature_request.md&title=%5BFEATURE%5D%3A). ### Answering questions -If you have a question and you can't find the answer in the documentation or issues, the next step is to submit a [question.](https://github.com/dell/csm/issues/new?labels=type%2Fquestion&template=ask-a-question.md&title=%5BQUESTION%5D%3A) +If you have a question and you can't find the answer in the documentation or issues, the next step is to submit a [question.](https://eos2git.cec.lab.emc.com/CSM/csm/issues/new?labels=type%2Fquestion&template=ask-a-question.md&title=%5BQUESTION%5D%3A) We'd love your help answering questions being asked by other CSM users. @@ -86,8 +86,8 @@ Read more about the ways you can [Triage issues](ISSUE_TRIAGE.md). Unsure where to begin contributing? Start by browsing issues labeled `beginner friendly` or `help wanted`. -* [Beginner-friendly](https://github.com/dell/csm/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) issues are generally straightforward to complete. -* [Help wanted](https://github.com/dell/csm/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) issues are problems we would like the community to help us with regardless of complexity. +* [Beginner-friendly](https://eos2git.cec.lab.emc.com/CSM/csm/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22) issues are generally straightforward to complete. +* [Help wanted](https://eos2git.cec.lab.emc.com/CSM/csm/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22) issues are problems we would like the community to help us with regardless of complexity. When you're ready to contribute, it's time to create a pull request. @@ -153,28 +153,28 @@ GitHub Actions are used to enforce quality gates when a pull request is created #### Security scans * [Golang Security Checker](https://github.com/securego/gosec) inspects source code for security vulnerabilities by scanning the Go AST. -* [Malware Scanner](https://github.com/dell/common-github-actions/tree/main/malware-scanner) inspects source code for malware. +* [Malware Scanner](https://eos2git.cec.lab.emc.com/CSM/common-github-actions/tree/main/malware-scanner) inspects source code for malware. * [Container Scanner](https://github.com/Azure/container-scan) scans containers for security vulnerabilities. #### Code vetting -[GitHub action](https://github.com/dell/common-github-actions/tree/main/go-code-formatter-linter-vetter) that analyzes source code to report suspicious constructs such as Printf calls whose arguments do not align with the format string, abnormal or not used code in pull requests. Please refer to [vet](https://golang.org/cmd/vet/) for more information. +[GitHub action](https://eos2git.cec.lab.emc.com/CSM/common-github-actions/tree/main/go-code-formatter-linter-vetter) that analyzes source code to report suspicious constructs such as Printf calls whose arguments do not align with the format string, abnormal or not used code in pull requests. Please refer to [vet](https://golang.org/cmd/vet/) for more information. #### Code linting -[GitHub action](https://github.com/dell/common-github-actions/tree/main/go-code-formatter-linter-vetter) that analyzes source code to flag programming errors, stylistics errors, and suspicious constructs. Please refer to [Go lint](https://github.com/golang/lint) for more information. +[GitHub action](https://eos2git.cec.lab.emc.com/CSM/common-github-actions/tree/main/go-code-formatter-linter-vetter) that analyzes source code to flag programming errors, stylistics errors, and suspicious constructs. Please refer to [Go lint](https://github.com/golang/lint) for more information. #### Code formatting -[GitHub action](https://github.com/dell/common-github-actions/tree/main/go-code-formatter-linter-vetter) that analyzes source code to flag formatting errors. Please refer to [gofmt](https://golang.org/cmd/gofmt/) for more information. +[GitHub action](https://eos2git.cec.lab.emc.com/CSM/common-github-actions/tree/main/go-code-formatter-linter-vetter) that analyzes source code to flag formatting errors. Please refer to [gofmt](https://golang.org/cmd/gofmt/) for more information. #### Code sanitization -[GitHub action](https://github.com/dell/common-github-actions/tree/main/code-sanitizer) that analyzes source code for non-inclusive words and language. +[GitHub action](https://eos2git.cec.lab.emc.com/CSM/common-github-actions/tree/main/code-sanitizer) that analyzes source code for non-inclusive words and language. #### Code build/test/coverage -[GitHub action](https://github.com/dell/common-github-actions/tree/main/go-code-tester) that runs Go unit tests and checks that the code coverage of each package meets a configured threshold (currently 90%). An error is flagged if a given pull request does not meet the test coverage threshold and blocks the pull request from being merged. +[GitHub action](https://eos2git.cec.lab.emc.com/CSM/common-github-actions/tree/main/go-code-tester) that runs Go unit tests and checks that the code coverage of each package meets a configured threshold (currently 90%). An error is flagged if a given pull request does not meet the test coverage threshold and blocks the pull request from being merged. ## Code Reviews diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md index 96ac294b..a982d3db 100644 --- a/docs/SUPPORT.md +++ b/docs/SUPPORT.md @@ -14,7 +14,7 @@ # Support -We use GitHub for creating/tracking various [issues](https://github.com/dell/csm/issues/new/choose) such as bugs, feature requests, features, and questions. The following resources are also available. +We use GitHub for creating/tracking various [issues](https://eos2git.cec.lab.emc.com/CSM/csm/issues/new/choose) such as bugs, feature requests, features, and questions. The following resources are also available. ## Documentation diff --git a/go.mod b/go.mod index 6548f72c..415cd071 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/dell/csm-operator +module eos2git.cec.lab.emc.com/CSM/csm-operator go 1.24.0 diff --git a/k8s/client_test.go b/k8s/client_test.go index 376171fc..0aa2ff27 100644 --- a/k8s/client_test.go +++ b/k8s/client_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" - "github.com/dell/csm-operator/pkg/logger" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" "k8s.io/apimachinery/pkg/version" discoveryfake "k8s.io/client-go/discovery/fake" ) diff --git a/main.go b/main.go index e5d143d1..a69fa6af 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ import ( // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -46,11 +46,11 @@ import ( "sigs.k8s.io/yaml" certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/controllers" - "github.com/dell/csm-operator/core" - k8sClient "github.com/dell/csm-operator/k8s" - "github.com/dell/csm-operator/pkg/logger" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/controllers" + "eos2git.cec.lab.emc.com/CSM/csm-operator/core" + k8sClient "eos2git.cec.lab.emc.com/CSM/csm-operator/k8s" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" "go.uber.org/zap" corev1 "k8s.io/api/core/v1" diff --git a/main_test.go b/main_test.go index 2f91f5cd..ee589e10 100644 --- a/main_test.go +++ b/main_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/dell/csm-operator/controllers" - "github.com/dell/csm-operator/k8s" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + "eos2git.cec.lab.emc.com/CSM/csm-operator/controllers" + "eos2git.cec.lab.emc.com/CSM/csm-operator/k8s" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "github.com/go-logr/logr" "github.com/stretchr/testify/assert" "go.uber.org/zap" diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index f65181be..1f4fade0 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -15,7 +15,7 @@ package constants import ( "time" - csmv1 "github.com/dell/csm-operator/api/v1" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/pkg/drivers/common_test.go b/pkg/drivers/common_test.go index 7032525f..83ed5d8f 100644 --- a/pkg/drivers/common_test.go +++ b/pkg/drivers/common_test.go @@ -13,9 +13,9 @@ package drivers import ( - csmv1 "github.com/dell/csm-operator/api/v1" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" - "github.com/dell/csm-operator/tests/shared" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" corev1 "k8s.io/api/core/v1" ) diff --git a/pkg/drivers/commonconfig.go b/pkg/drivers/commonconfig.go index d41675aa..6ca6e5cc 100644 --- a/pkg/drivers/commonconfig.go +++ b/pkg/drivers/commonconfig.go @@ -19,9 +19,9 @@ import ( "path/filepath" "strings" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" corev1 "k8s.io/api/core/v1" storagev1 "k8s.io/api/storage/v1" diff --git a/pkg/drivers/commonconfig_test.go b/pkg/drivers/commonconfig_test.go index 8e5b19b5..0ef760ca 100644 --- a/pkg/drivers/commonconfig_test.go +++ b/pkg/drivers/commonconfig_test.go @@ -16,8 +16,8 @@ import ( "context" "testing" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/tests/shared" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" "github.com/stretchr/testify/assert" storagev1 "k8s.io/api/storage/v1" ctrlClientFake "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/pkg/drivers/powerflex.go b/pkg/drivers/powerflex.go index abf9e51e..e041daca 100644 --- a/pkg/drivers/powerflex.go +++ b/pkg/drivers/powerflex.go @@ -20,9 +20,9 @@ import ( "regexp" "strings" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" corev1 "k8s.io/api/core/v1" v1 "k8s.io/client-go/applyconfigurations/apps/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/drivers/powerflex_test.go b/pkg/drivers/powerflex_test.go index 84d89e13..c82ee5ee 100644 --- a/pkg/drivers/powerflex_test.go +++ b/pkg/drivers/powerflex_test.go @@ -17,9 +17,9 @@ import ( "fmt" "testing" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/tests/shared" - "github.com/dell/csm-operator/tests/shared/crclient" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared/crclient" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/drivers/powermax.go b/pkg/drivers/powermax.go index 19ac8087..859ad380 100644 --- a/pkg/drivers/powermax.go +++ b/pkg/drivers/powermax.go @@ -21,12 +21,12 @@ import ( "strconv" "strings" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" v1 "k8s.io/client-go/applyconfigurations/apps/v1" acorev1 "k8s.io/client-go/applyconfigurations/core/v1" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/logger" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/drivers/powermax_test.go b/pkg/drivers/powermax_test.go index 159ccd1b..a53c9e5f 100644 --- a/pkg/drivers/powermax_test.go +++ b/pkg/drivers/powermax_test.go @@ -18,9 +18,9 @@ import ( "fmt" "testing" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/tests/shared" - "github.com/dell/csm-operator/tests/shared/crclient" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared/crclient" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" v1 "k8s.io/client-go/applyconfigurations/apps/v1" diff --git a/pkg/drivers/powerscale.go b/pkg/drivers/powerscale.go index f2f14a77..b884587e 100644 --- a/pkg/drivers/powerscale.go +++ b/pkg/drivers/powerscale.go @@ -19,9 +19,9 @@ import ( "strconv" "strings" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/drivers/powerscale_test.go b/pkg/drivers/powerscale_test.go index 92016dba..cec97fd0 100644 --- a/pkg/drivers/powerscale_test.go +++ b/pkg/drivers/powerscale_test.go @@ -17,9 +17,9 @@ import ( "fmt" "testing" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/tests/shared" - "github.com/dell/csm-operator/tests/shared/crclient" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared/crclient" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/drivers/powerstore.go b/pkg/drivers/powerstore.go index 7be320be..0535f38a 100644 --- a/pkg/drivers/powerstore.go +++ b/pkg/drivers/powerstore.go @@ -19,9 +19,9 @@ import ( "strconv" "strings" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/drivers/powerstore_test.go b/pkg/drivers/powerstore_test.go index d6344587..dce4d683 100644 --- a/pkg/drivers/powerstore_test.go +++ b/pkg/drivers/powerstore_test.go @@ -17,9 +17,9 @@ import ( "fmt" "testing" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/tests/shared" - "github.com/dell/csm-operator/tests/shared/crclient" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared/crclient" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/drivers/unity.go b/pkg/drivers/unity.go index 0d5317f3..d81ffda9 100644 --- a/pkg/drivers/unity.go +++ b/pkg/drivers/unity.go @@ -19,9 +19,9 @@ import ( "strconv" "strings" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/drivers/unity_test.go b/pkg/drivers/unity_test.go index 3fd284dc..674a7621 100644 --- a/pkg/drivers/unity_test.go +++ b/pkg/drivers/unity_test.go @@ -17,9 +17,9 @@ import ( "fmt" "testing" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/tests/shared" - "github.com/dell/csm-operator/tests/shared/crclient" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared/crclient" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/modules/application_mobility.go b/pkg/modules/application_mobility.go index ef9f9432..3d6cf0b9 100644 --- a/pkg/modules/application_mobility.go +++ b/pkg/modules/application_mobility.go @@ -19,9 +19,9 @@ import ( "path/filepath" "strings" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/modules/application_mobility_test.go b/pkg/modules/application_mobility_test.go index cb50f12a..e448e06c 100644 --- a/pkg/modules/application_mobility_test.go +++ b/pkg/modules/application_mobility_test.go @@ -13,8 +13,8 @@ import ( "testing" certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" - csmv1 "github.com/dell/csm-operator/api/v1" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "github.com/stretchr/testify/assert" velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" appsv1 "k8s.io/api/apps/v1" diff --git a/pkg/modules/authorization.go b/pkg/modules/authorization.go index 5503b802..a28b3def 100644 --- a/pkg/modules/authorization.go +++ b/pkg/modules/authorization.go @@ -26,10 +26,10 @@ import ( certificate "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" cmmetav1 "github.com/cert-manager/cert-manager/pkg/apis/meta/v1" - csmv1 "github.com/dell/csm-operator/api/v1" - drivers "github.com/dell/csm-operator/pkg/drivers" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + drivers "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "golang.org/x/mod/semver" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/modules/authorization_test.go b/pkg/modules/authorization_test.go index 3b9989f8..d0902f0e 100644 --- a/pkg/modules/authorization_test.go +++ b/pkg/modules/authorization_test.go @@ -14,9 +14,9 @@ import ( "strings" "testing" - csmv1 "github.com/dell/csm-operator/api/v1" - drivers "github.com/dell/csm-operator/pkg/drivers" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + drivers "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/modules/commonconfig.go b/pkg/modules/commonconfig.go index c3d27d01..194ce6a4 100644 --- a/pkg/modules/commonconfig.go +++ b/pkg/modules/commonconfig.go @@ -19,8 +19,8 @@ import ( "path/filepath" "strings" - csmv1 "github.com/dell/csm-operator/api/v1" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" crclient "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/pkg/modules/commonconfig_test.go b/pkg/modules/commonconfig_test.go index d312e150..b66dfb01 100644 --- a/pkg/modules/commonconfig_test.go +++ b/pkg/modules/commonconfig_test.go @@ -15,8 +15,8 @@ import ( "os" "testing" - csmv1 "github.com/dell/csm-operator/api/v1" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/modules/observability.go b/pkg/modules/observability.go index e76db611..f350fe63 100644 --- a/pkg/modules/observability.go +++ b/pkg/modules/observability.go @@ -16,11 +16,11 @@ import ( k8serrors "k8s.io/apimachinery/pkg/api/errors" - csmv1 "github.com/dell/csm-operator/api/v1" - drivers "github.com/dell/csm-operator/pkg/drivers" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" - "github.com/dell/csm-operator/pkg/resources/deployment" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + drivers "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/resources/deployment" appsv1 "k8s.io/api/apps/v1" confv1 "k8s.io/client-go/applyconfigurations/apps/v1" acorev1 "k8s.io/client-go/applyconfigurations/core/v1" diff --git a/pkg/modules/observability_test.go b/pkg/modules/observability_test.go index 1db59f73..2ce4a4e6 100644 --- a/pkg/modules/observability_test.go +++ b/pkg/modules/observability_test.go @@ -13,11 +13,11 @@ import ( "testing" certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" - csmv1 "github.com/dell/csm-operator/api/v1" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" - "github.com/dell/csm-operator/tests/shared" - "github.com/dell/csm-operator/tests/shared/clientgoclient" - "github.com/dell/csm-operator/tests/shared/crclient" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared/clientgoclient" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared/crclient" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/pkg/modules/replication.go b/pkg/modules/replication.go index a2b1e424..024a6867 100644 --- a/pkg/modules/replication.go +++ b/pkg/modules/replication.go @@ -22,11 +22,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" t1 "k8s.io/apimachinery/pkg/types" - csmv1 "github.com/dell/csm-operator/api/v1" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/drivers" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" rbacv1 "k8s.io/api/rbac/v1" applyv1 "k8s.io/client-go/applyconfigurations/apps/v1" diff --git a/pkg/modules/replication_test.go b/pkg/modules/replication_test.go index 0fcf8f62..d8d5160b 100644 --- a/pkg/modules/replication_test.go +++ b/pkg/modules/replication_test.go @@ -13,10 +13,10 @@ import ( "fmt" "testing" - csmv1 "github.com/dell/csm-operator/api/v1" - drivers "github.com/dell/csm-operator/pkg/drivers" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" - "github.com/dell/csm-operator/tests/shared" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + drivers "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/pkg/modules/resiliency.go b/pkg/modules/resiliency.go index b6e30dc0..140c0f58 100644 --- a/pkg/modules/resiliency.go +++ b/pkg/modules/resiliency.go @@ -17,10 +17,10 @@ import ( "fmt" "strings" - csmv1 "github.com/dell/csm-operator/api/v1" - drivers "github.com/dell/csm-operator/pkg/drivers" - "github.com/dell/csm-operator/pkg/logger" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + drivers "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" applyv1 "k8s.io/client-go/applyconfigurations/apps/v1" diff --git a/pkg/modules/resiliency_test.go b/pkg/modules/resiliency_test.go index 921f9aae..ae41b7fc 100644 --- a/pkg/modules/resiliency_test.go +++ b/pkg/modules/resiliency_test.go @@ -17,9 +17,9 @@ import ( "fmt" "testing" - csmv1 "github.com/dell/csm-operator/api/v1" - drivers "github.com/dell/csm-operator/pkg/drivers" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + drivers "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "github.com/stretchr/testify/assert" rbacv1 "k8s.io/api/rbac/v1" applyv1 "k8s.io/client-go/applyconfigurations/apps/v1" diff --git a/pkg/modules/reverseproxy.go b/pkg/modules/reverseproxy.go index d3e1bfaa..764229cb 100644 --- a/pkg/modules/reverseproxy.go +++ b/pkg/modules/reverseproxy.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" @@ -32,9 +32,9 @@ import ( crclient "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/drivers" - "github.com/dell/csm-operator/pkg/logger" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" ) // Constants to be used in reverse proxy config files diff --git a/pkg/modules/reverseproxy_test.go b/pkg/modules/reverseproxy_test.go index e284ce08..d7a62403 100644 --- a/pkg/modules/reverseproxy_test.go +++ b/pkg/modules/reverseproxy_test.go @@ -18,13 +18,13 @@ import ( "strings" "testing" - "github.com/dell/csm-operator/pkg/drivers" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/drivers" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" applyv1 "k8s.io/client-go/applyconfigurations/apps/v1" - csmv1 "github.com/dell/csm-operator/api/v1" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" "github.com/stretchr/testify/assert" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/operatorutils/status.go b/pkg/operatorutils/status.go index 2d6941b2..96a67598 100644 --- a/pkg/operatorutils/status.go +++ b/pkg/operatorutils/status.go @@ -20,9 +20,9 @@ import ( "sync" "time" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/constants" - "github.com/dell/csm-operator/pkg/logger" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/constants" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/operatorutils/status_test.go b/pkg/operatorutils/status_test.go index 0eae38e6..6b365872 100644 --- a/pkg/operatorutils/status_test.go +++ b/pkg/operatorutils/status_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/constants" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/constants" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/operatorutils/utils.go b/pkg/operatorutils/utils.go index d83e0ca3..97f7dc2d 100644 --- a/pkg/operatorutils/utils.go +++ b/pkg/operatorutils/utils.go @@ -23,8 +23,8 @@ import ( "strconv" "strings" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/logger" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" goYAML "gopkg.in/yaml.v3" certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" @@ -48,7 +48,7 @@ import ( "k8s.io/client-go/tools/clientcmd" crclient "sigs.k8s.io/controller-runtime/pkg/client" - k8sClient "github.com/dell/csm-operator/k8s" + k8sClient "eos2git.cec.lab.emc.com/CSM/csm-operator/k8s" ) // wrapper for UT to allow more coverage when testing diff --git a/pkg/operatorutils/utils_test.go b/pkg/operatorutils/utils_test.go index 60265079..3357f9b7 100644 --- a/pkg/operatorutils/utils_test.go +++ b/pkg/operatorutils/utils_test.go @@ -25,7 +25,7 @@ import ( "testing" certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1" - csmv1 "github.com/dell/csm-operator/api/v1" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" "github.com/stretchr/testify/assert" velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" admissionregistration "k8s.io/api/admissionregistration/v1" diff --git a/pkg/resources/configmap/configmap.go b/pkg/resources/configmap/configmap.go index 92cc50f0..281ccc69 100644 --- a/pkg/resources/configmap/configmap.go +++ b/pkg/resources/configmap/configmap.go @@ -18,7 +18,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/dell/csm-operator/pkg/logger" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/resources/configmap/configmap_test.go b/pkg/resources/configmap/configmap_test.go index 84058a06..86186214 100644 --- a/pkg/resources/configmap/configmap_test.go +++ b/pkg/resources/configmap/configmap_test.go @@ -17,7 +17,7 @@ import ( "errors" "testing" - common "github.com/dell/csm-operator/pkg/operatorutils" + common "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/resources/csidriver/csidriver.go b/pkg/resources/csidriver/csidriver.go index 06c4785c..8c104721 100644 --- a/pkg/resources/csidriver/csidriver.go +++ b/pkg/resources/csidriver/csidriver.go @@ -18,7 +18,7 @@ import ( storagev1 "k8s.io/api/storage/v1" - "github.com/dell/csm-operator/pkg/logger" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/resources/csidriver/csidriver_test.go b/pkg/resources/csidriver/csidriver_test.go index 33554974..f1cf82af 100644 --- a/pkg/resources/csidriver/csidriver_test.go +++ b/pkg/resources/csidriver/csidriver_test.go @@ -17,7 +17,7 @@ import ( "errors" "testing" - common "github.com/dell/csm-operator/pkg/operatorutils" + common "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "github.com/stretchr/testify/assert" storagev1 "k8s.io/api/storage/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/resources/daemonset/daemonset.go b/pkg/resources/daemonset/daemonset.go index 450e61b4..d4b20080 100644 --- a/pkg/resources/daemonset/daemonset.go +++ b/pkg/resources/daemonset/daemonset.go @@ -15,7 +15,7 @@ package daemonset import ( "context" - "github.com/dell/csm-operator/pkg/logger" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" appsv1 "k8s.io/client-go/applyconfigurations/apps/v1" diff --git a/pkg/resources/deployment/deployment.go b/pkg/resources/deployment/deployment.go index e6c7021b..93341412 100644 --- a/pkg/resources/deployment/deployment.go +++ b/pkg/resources/deployment/deployment.go @@ -18,7 +18,7 @@ import ( //"fmt" - "github.com/dell/csm-operator/pkg/logger" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" appsv1 "k8s.io/client-go/applyconfigurations/apps/v1" "k8s.io/client-go/kubernetes" diff --git a/pkg/resources/rbac/clusterrole.go b/pkg/resources/rbac/clusterrole.go index 732c3d16..a7839899 100644 --- a/pkg/resources/rbac/clusterrole.go +++ b/pkg/resources/rbac/clusterrole.go @@ -15,7 +15,7 @@ package rbac import ( "context" - "github.com/dell/csm-operator/pkg/logger" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/resources/rbac/clusterrole_test.go b/pkg/resources/rbac/clusterrole_test.go index 6eed36b1..24c83f6a 100644 --- a/pkg/resources/rbac/clusterrole_test.go +++ b/pkg/resources/rbac/clusterrole_test.go @@ -17,7 +17,7 @@ import ( "errors" "testing" - common "github.com/dell/csm-operator/pkg/operatorutils" + common "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "github.com/stretchr/testify/assert" rbacv1 "k8s.io/api/rbac/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/pkg/resources/rbac/rolebindings.go b/pkg/resources/rbac/rolebindings.go index 36693f6e..0fcc2d1c 100644 --- a/pkg/resources/rbac/rolebindings.go +++ b/pkg/resources/rbac/rolebindings.go @@ -15,7 +15,7 @@ package rbac import ( "context" - "github.com/dell/csm-operator/pkg/logger" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/resources/rbac/rolebindings_test.go b/pkg/resources/rbac/rolebindings_test.go index 149447bc..ebbe7acf 100644 --- a/pkg/resources/rbac/rolebindings_test.go +++ b/pkg/resources/rbac/rolebindings_test.go @@ -17,7 +17,7 @@ import ( "errors" "testing" - common "github.com/dell/csm-operator/pkg/operatorutils" + common "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/resources/serviceaccount/serviceaccount.go b/pkg/resources/serviceaccount/serviceaccount.go index df5b57c0..8e042aed 100644 --- a/pkg/resources/serviceaccount/serviceaccount.go +++ b/pkg/resources/serviceaccount/serviceaccount.go @@ -16,7 +16,7 @@ import ( "context" "fmt" - "github.com/dell/csm-operator/pkg/logger" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/logger" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/resources/serviceaccount/serviceaccount_test.go b/pkg/resources/serviceaccount/serviceaccount_test.go index 841281d2..33815c5a 100644 --- a/pkg/resources/serviceaccount/serviceaccount_test.go +++ b/pkg/resources/serviceaccount/serviceaccount_test.go @@ -17,7 +17,7 @@ import ( "errors" "testing" - common "github.com/dell/csm-operator/pkg/operatorutils" + common "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/tests/README.md b/tests/README.md index 296ddda5..9af09ad2 100644 --- a/tests/README.md +++ b/tests/README.md @@ -110,7 +110,7 @@ If running the Shared NFS e2e tests, further setup must be done: The tests are run by the `run-e2e-test.sh` script in the `tests/e2e` directory. -- Ensure you meet all [prerequisites](https://github.com/dell/csm-operator/blob/main/tests/README.md#prerequisites). +- Ensure you meet all [prerequisites](https://eos2git.cec.lab.emc.com/CSM/csm-operator/blob/main/tests/README.md#prerequisites). - Change to the `tests/e2e` directory. - Create a file named `array-info.env` and populate it with your array information. Use `array-info.env.sample` as a template. - If you do not have `dellctl` (for app-mobility and authorization proxy server) accessible through your `PATH` variable, pass the path to the executable to the script, like so, `run-e2e-test.sh --dellctl=/path/to/dellctl`, and they will be added to `/usr/local/bin` @@ -231,10 +231,10 @@ Note: Please be mindful when updating upgrade scenarios for Authorization Proxy - Add backend Support: we will cover three case: 1. `Fully recycled old step`: If the desired steps has already been covered in another test scenario, just copy line for line. You don't need any code change - 2. `partially recycled old step`: In this case, a very similar test has already been cover. This means there's already an entrypoint in `steps`. You should review the `StepRunnerInit` function at [step_runner.go](https://github.com/dell/csm-operator/blob/main/tests/e2e/steps/steps_runner.go) and trace the implementation function that matches your step. For example the step `"Validate [world] module is installed"`. The line that matches this in `StepRunnerInit` is `runner.addStep(`^Validate \[([^"]\*)\] module is installed$`, step.validateModuleInstalled)`. The implementation to trace is `step.validateModuleInstalled`. We will review the implementation function in [steps_def.go](https://github.com/dell/csm-operator/blob/main/tests/e2e/steps/steps_def.go) to decide whether or not we need to do anything. Make the code changes if needed. + 2. `partially recycled old step`: In this case, a very similar test has already been cover. This means there's already an entrypoint in `steps`. You should review the `StepRunnerInit` function at [step_runner.go](https://eos2git.cec.lab.emc.com/CSM/csm-operator/blob/main/tests/e2e/steps/steps_runner.go) and trace the implementation function that matches your step. For example the step `"Validate [world] module is installed"`. The line that matches this in `StepRunnerInit` is `runner.addStep(`^Validate \[([^"]\*)\] module is installed$`, step.validateModuleInstalled)`. The implementation to trace is `step.validateModuleInstalled`. We will review the implementation function in [steps_def.go](https://eos2git.cec.lab.emc.com/CSM/csm-operator/blob/main/tests/e2e/steps/steps_def.go) to decide whether or not we need to do anything. Make the code changes if needed. 3. `new step`: New step can be simple such as `"Validate Today is Tuesday"` or a templated such as `["Validate it is [raining]"](https://example.com)`. The workflow to support these two cases is the same and only varies in the signature of the implementation function. The workflow include: - 1. Implement steps in [steps_def.go](https://github.com/dell/csm-operator/blob/main/tests/e2e/steps/steps_def.go). Define a function to implement your step. Note that the steps are stateless! If you want to define a function to test a happy path, your function should return nil if no error occurs and error otherwise. However, if you want to test an error path, your function should return nil if you get error and error otherwise. The constraints of all functions in step_def.go is as follows: + 1. Implement steps in [steps_def.go](https://eos2git.cec.lab.emc.com/CSM/csm-operator/blob/main/tests/e2e/steps/steps_def.go). Define a function to implement your step. Note that the steps are stateless! If you want to define a function to test a happy path, your function should return nil if no error occurs and error otherwise. However, if you want to test an error path, your function should return nil if you get error and error otherwise. The constraints of all functions in step_def.go is as follows: - must return `error` or `nil` - must take at least one argument. The first one MUST be type `Resource`(even though it may not be used). If your step has any group(a groups is anything in your step enclosed by `[]`), the remaining arguments should be the groups in the order they appear on the steps(from left to right). For example, the two new functions above will can be implemented as shown below: @@ -269,7 +269,7 @@ Note: Please be mindful when updating upgrade scenarios for Authorization Proxy } ``` - 2. Register your new steps in `StepRunnerInit` function at [step_runner.go](https://github.com/dell/csm-operator/blob/main/tests/e2e/steps/steps_runner.go). Please pay special attention to the regex and ensure they actually match your new steps. For instance, the new steps we implemented above can be mapped to their steps in the valus file as follows: + 2. Register your new steps in `StepRunnerInit` function at [step_runner.go](https://eos2git.cec.lab.emc.com/CSM/csm-operator/blob/main/tests/e2e/steps/steps_runner.go). Please pay special attention to the regex and ensure they actually match your new steps. For instance, the new steps we implemented above can be mapped to their steps in the valus file as follows: ```go func StepRunnerInit(runner *Runner, ctrlClient client.Client, clientSet *kubernetes.Clientset) { diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go index 693ed19d..0f38f47f 100644 --- a/tests/e2e/e2e_test.go +++ b/tests/e2e/e2e_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - csmv1 "github.com/dell/csm-operator/api/v1" - step "github.com/dell/csm-operator/tests/e2e/steps" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + step "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/e2e/steps" "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod index e7800077..9729457a 100644 --- a/tests/e2e/go.mod +++ b/tests/e2e/go.mod @@ -1,11 +1,11 @@ -module github.com/dell/csm-operator/tests/e2e +module eos2git.cec.lab.emc.com/CSM/csm-operator/tests/e2e go 1.24.0 toolchain go1.24.4 require ( - github.com/dell/csm-operator v0.0.0 + eos2git.cec.lab.emc.com/CSM/csm-operator v0.0.0 github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.36.3 golang.org/x/mod v0.25.0 @@ -148,7 +148,7 @@ require ( ) replace ( - github.com/dell/csm-operator => ../../ + eos2git.cec.lab.emc.com/CSM/csm-operator => ../../ k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.0 k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.0 k8s.io/code-generator => k8s.io/code-generator v0.33.0 diff --git a/tests/e2e/steps/step_common.go b/tests/e2e/steps/step_common.go index ae59bf9e..c70521a2 100644 --- a/tests/e2e/steps/step_common.go +++ b/tests/e2e/steps/step_common.go @@ -19,7 +19,7 @@ import ( "os/exec" "strings" - csmv1 "github.com/dell/csm-operator/api/v1" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/tests/e2e/steps/steps_def.go b/tests/e2e/steps/steps_def.go index ee54086b..476f5290 100644 --- a/tests/e2e/steps/steps_def.go +++ b/tests/e2e/steps/steps_def.go @@ -25,10 +25,10 @@ import ( "strings" "time" - csmv1 "github.com/dell/csm-operator/api/v1" - "github.com/dell/csm-operator/pkg/constants" - "github.com/dell/csm-operator/pkg/modules" - operatorutils "github.com/dell/csm-operator/pkg/operatorutils" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/constants" + "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/modules" + operatorutils "eos2git.cec.lab.emc.com/CSM/csm-operator/pkg/operatorutils" "golang.org/x/mod/semver" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" diff --git a/tests/e2e/verify-app-mobility.sh b/tests/e2e/verify-app-mobility.sh index 618d2773..f9cee2a9 100755 --- a/tests/e2e/verify-app-mobility.sh +++ b/tests/e2e/verify-app-mobility.sh @@ -21,7 +21,7 @@ RESTORE_NAME=r$BACKUP_NAME_EXT echo "*** make sure dellctl is installed" if [ ! -f ./dellctl ]; then echo "installing dellctl" - wget https://github.com/dell/csm/releases/download/v1.11.1/dellctl + wget https://eos2git.cec.lab.emc.com/CSM/csm/releases/download/v1.11.1/dellctl if [ $? -ne 0 ]; then echo "failed to install dellctl." exit 1 diff --git a/tests/shared/common.go b/tests/shared/common.go index 262f9518..d0a25f12 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -21,7 +21,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" - csmv1 "github.com/dell/csm-operator/api/v1" + csmv1 "eos2git.cec.lab.emc.com/CSM/csm-operator/api/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/tests/shared/crclient/client.go b/tests/shared/crclient/client.go index b9cab262..e6982e7c 100644 --- a/tests/shared/crclient/client.go +++ b/tests/shared/crclient/client.go @@ -19,7 +19,7 @@ import ( "reflect" "time" - "github.com/dell/csm-operator/tests/shared" + "eos2git.cec.lab.emc.com/CSM/csm-operator/tests/shared" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors"