Skip to content

Commit

Permalink
Merge pull request #2 from IBM/updateModule
Browse files Browse the repository at this point in the history
Rename module
  • Loading branch information
xuezhiy authored Jun 8, 2021
2 parents 3a16ac0 + f5405a1 commit f909477
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 19 deletions.
4 changes: 2 additions & 2 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins:
manifests.sdk.operatorframework.io/v2: {}
scorecard.sdk.operatorframework.io/v2: {}
projectName: ibm-storage-odf-operator
repo: github.ibm.com/PuDong/ibm-storage-odf-operator
repo: github.com/IBM/ibm-storage-odf-operator
resources:
- api:
crdVersion: v1
Expand All @@ -13,6 +13,6 @@ resources:
domain: ibm.com
group: odf
kind: FlashSystemCluster
path: github.ibm.com/PuDong/ibm-storage-odf-operator/api/v1alpha1
path: github.com/IBM/ibm-storage-odf-operator/api/v1alpha1
version: v1alpha1
version: "3"
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
- ibm
links:
- name: IBM Storage ODF Operator
url: https://github.ibm.com/PuDong/ibm-storage-odf-operator
url: https://github.com/IBM/ibm-storage-odf-operator
maintainers:
- email: [email protected]
name: IBM Support
Expand Down
4 changes: 2 additions & 2 deletions controllers/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package controllers
import (
"strings"

odfv1alpha1 "github.ibm.com/PuDong/ibm-storage-odf-operator/api/v1alpha1"
"github.ibm.com/PuDong/ibm-storage-odf-operator/controllers/util"
odfv1alpha1 "github.com/IBM/ibm-storage-odf-operator/api/v1alpha1"
"github.com/IBM/ibm-storage-odf-operator/controllers/util"
storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
4 changes: 2 additions & 2 deletions controllers/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"path/filepath"
"reflect"

odfv1alpha1 "github.com/IBM/ibm-storage-odf-operator/api/v1alpha1"
"github.com/IBM/ibm-storage-odf-operator/controllers/util"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
odfv1alpha1 "github.ibm.com/PuDong/ibm-storage-odf-operator/api/v1alpha1"
"github.ibm.com/PuDong/ibm-storage-odf-operator/controllers/util"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
Expand Down
6 changes: 3 additions & 3 deletions controllers/flashsystemcluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"fmt"
"reflect"

odfv1alpha1 "github.com/IBM/ibm-storage-odf-operator/api/v1alpha1"
"github.com/IBM/ibm-storage-odf-operator/controllers/storageclass"
"github.com/IBM/ibm-storage-odf-operator/controllers/util"
"github.com/go-logr/logr"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
odfv1alpha1 "github.ibm.com/PuDong/ibm-storage-odf-operator/api/v1alpha1"
"github.ibm.com/PuDong/ibm-storage-odf-operator/controllers/storageclass"
"github.ibm.com/PuDong/ibm-storage-odf-operator/controllers/util"
apierrors "k8s.io/apimachinery/pkg/api/errors"

appsv1 "k8s.io/api/apps/v1"
Expand Down
3 changes: 2 additions & 1 deletion controllers/storageclass/storageclass_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package storageclass

import (
"context"

"github.com/go-logr/logr"
corev1 "k8s.io/api/core/v1"
storagev1 "k8s.io/api/storage/v1"
Expand All @@ -16,7 +17,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

"github.ibm.com/PuDong/ibm-storage-odf-operator/controllers/util"
"github.com/IBM/ibm-storage-odf-operator/controllers/util"
)

func reconcileSC(obj runtime.Object) bool {
Expand Down
4 changes: 2 additions & 2 deletions controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

odfv1alpha1 "github.ibm.com/PuDong/ibm-storage-odf-operator/api/v1alpha1"
util "github.ibm.com/PuDong/ibm-storage-odf-operator/controllers/util"
odfv1alpha1 "github.com/IBM/ibm-storage-odf-operator/api/v1alpha1"
util "github.com/IBM/ibm-storage-odf-operator/controllers/util"
//+kubebuilder:scaffold:imports
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/util/condition.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package util
import (
"time"

odfv1alpha1 "github.ibm.com/PuDong/ibm-storage-odf-operator/api/v1alpha1"
odfv1alpha1 "github.com/IBM/ibm-storage-odf-operator/api/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion hack/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ DEFAULT_FLASHSYSTEM_DRIVER_RELEASE="v0.0.5"
DEFAULT_BLOCK_CSI_RELEASE="v1.5.0"
DEFAULT_BLOCK_CSI_CR_FILE="csi.ibm.com_v1_ibmblockcsi_cr.yaml"

VCS_URL="https://github.ibm.com/PuDong/ibm-storage-odf-operator"
VCS_URL="https://github.com/IBM/ibm-storage-odf-operator"
VCS_REF="0.1.0-$(git rev-parse --short HEAD)"
RELEASE_VERSION=$(cat version/version.go | grep "Version =" | awk -F '"' '{print $2}')
BUILD_DEV_VERSION=${RELEASE_VERSION}-`date +%y%m%d`
Expand Down
8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

odfv1alpha1 "github.com/IBM/ibm-storage-odf-operator/api/v1alpha1"
"github.com/IBM/ibm-storage-odf-operator/controllers"
"github.com/IBM/ibm-storage-odf-operator/controllers/storageclass"
"github.com/IBM/ibm-storage-odf-operator/controllers/util"
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
odfv1alpha1 "github.ibm.com/PuDong/ibm-storage-odf-operator/api/v1alpha1"
"github.ibm.com/PuDong/ibm-storage-odf-operator/controllers"
"github.ibm.com/PuDong/ibm-storage-odf-operator/controllers/storageclass"
"github.ibm.com/PuDong/ibm-storage-odf-operator/controllers/util"
//+kubebuilder:scaffold:imports
)

Expand Down

0 comments on commit f909477

Please sign in to comment.