Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions bundle/manifests/dell-csm-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions controllers/csm_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 9 additions & 9 deletions controllers/csm_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion docs/BRANCHING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
26 changes: 13 additions & 13 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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.

Expand All @@ -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.

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/SUPPORT.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/dell/csm-operator
module eos2git.cec.lab.emc.com/CSM/csm-operator

go 1.24.0

Expand Down
2 changes: 1 addition & 1 deletion k8s/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
12 changes: 6 additions & 6 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/drivers/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/drivers/commonconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions pkg/drivers/commonconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading