Skip to content

Commit

Permalink
Update ODLM module to match major version v4 (#1039)
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Fan <fanyuchensx@gmail.com>
  • Loading branch information
Daniel-Fan authored May 3, 2024
1 parent 00b22c2 commit b3ed4f6
Show file tree
Hide file tree
Showing 30 changed files with 87 additions and 87 deletions.
10 changes: 5 additions & 5 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ resources:
domain: ibm.com
group: operator
kind: OperandRequest
path: github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1
path: github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1
version: v1alpha1
- controller: true
domain: ibm.com
group: operator
kind: OperandRegistry
path: github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1
path: github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1
version: v1alpha1
- controller: true
domain: ibm.com
group: operator
kind: OperandConfig
path: github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1
path: github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1
version: v1alpha1
- controller: true
domain: ibm.com
group: operator
kind: OperandBindInfo
path: github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1
path: github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
Expand All @@ -42,6 +42,6 @@ resources:
domain: ibm.com
group: operator
kind: OperatorConfig
path: github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1
path: github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1
version: v1alpha1
version: "3"
6 changes: 3 additions & 3 deletions controllers/namespacescope/namespacescope_controler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (

nssv1 "github.com/IBM/ibm-namespace-scope-operator/api/v1"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/testutil"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/testutil"
)

// +kubebuilder:docs-gen:collapse=Imports
Expand Down
8 changes: 4 additions & 4 deletions controllers/namespacescope/namespacescope_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ import (

nssv1 "github.com/IBM/ibm-namespace-scope-operator/api/v1"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/util"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/util"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions controllers/namespacescope/namespacescope_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import (

nssv1 "github.com/IBM/ibm-namespace-scope-operator/api/v1"

apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandregistry"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandregistry"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
// +kubebuilder:scaffold:imports
)

Expand Down
8 changes: 4 additions & 4 deletions controllers/operandbindinfo/operandbindinfo_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/util"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/util"
)

// Reconciler reconciles a OperandBindInfo object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/testutil"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/testutil"
)

// +kubebuilder:docs-gen:collapse=Imports
Expand Down
8 changes: 4 additions & 4 deletions controllers/operandbindinfo/operandbindinfo_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"

nssv1 "github.com/IBM/ibm-namespace-scope-operator/api/v1"
apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandregistry"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandregistry"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
// +kubebuilder:scaffold:imports
)

Expand Down
8 changes: 4 additions & 4 deletions controllers/operandconfig/operandconfig_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/util"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/util"
)

// Reconciler reconciles a OperandConfig object
Expand Down
4 changes: 2 additions & 2 deletions controllers/operandconfig/operandconfig_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
"k8s.io/apimachinery/pkg/types"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
testutil "github.com/IBM/operand-deployment-lifecycle-manager/controllers/testutil"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
testutil "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/testutil"
)

// +kubebuilder:docs-gen:collapse=Imports
Expand Down
8 changes: 4 additions & 4 deletions controllers/operandconfig/operandconfig_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import (

nssv1 "github.com/IBM/ibm-namespace-scope-operator/api/v1"

apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandregistry"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandregistry"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
// +kubebuilder:scaffold:imports
)

Expand Down
4 changes: 2 additions & 2 deletions controllers/operandregistry/operandregistry_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
)

// Reconciler reconciles a OperandRegistry object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
"k8s.io/apimachinery/pkg/types"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/testutil"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/testutil"
)

// +kubebuilder:docs-gen:collapse=Imports
Expand Down
8 changes: 4 additions & 4 deletions controllers/operandregistry/operandregistry_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"

nssv1 "github.com/IBM/ibm-namespace-scope-operator/api/v1"
apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandconfig"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandconfig"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
// +kubebuilder:scaffold:imports
)

Expand Down
6 changes: 3 additions & 3 deletions controllers/operandrequest/operandrequest_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/source"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
)

// Reconciler reconciles a OperandRequest object
Expand Down
4 changes: 2 additions & 2 deletions controllers/operandrequest/operandrequest_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/types"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/testutil"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/testutil"
)

// +kubebuilder:docs-gen:collapse=Imports
Expand Down
4 changes: 2 additions & 2 deletions controllers/operandrequest/operandrequest_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"

nssv1 "github.com/IBM/ibm-namespace-scope-operator/api/v1"
apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
// +kubebuilder:scaffold:imports
)

Expand Down
6 changes: 3 additions & 3 deletions controllers/operandrequest/reconcile_operand.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
constant "github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
util "github.com/IBM/operand-deployment-lifecycle-manager/controllers/util"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
constant "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
util "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/util"
)

func (r *Reconciler) reconcileOperand(ctx context.Context, requestInstance *operatorv1alpha1.OperandRequest) *util.MultiErr {
Expand Down
4 changes: 2 additions & 2 deletions controllers/operandrequest/reconcile_operand_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
)

type MockReader struct {
Expand Down
6 changes: 3 additions & 3 deletions controllers/operandrequest/reconcile_operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ import (
"k8s.io/klog"
"sigs.k8s.io/controller-runtime/pkg/client"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/util"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/util"
)

func (r *Reconciler) reconcileOperator(ctx context.Context, requestInstance *operatorv1alpha1.OperandRequest) error {
Expand Down
2 changes: 1 addition & 1 deletion controllers/operandrequest/reconcile_operator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
)

func TestGenerateClusterObjects(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions controllers/operator/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager"

apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
constant "github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/util"
apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
constant "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/util"
)

// ODLMOperator is the struct for ODLM controllers
Expand Down
4 changes: 2 additions & 2 deletions controllers/operatorchecker/operatorchecker_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
)

// Reconciler reconciles a OperatorChecker object
Expand Down
6 changes: 3 additions & 3 deletions controllers/operatorconfig/operatorconfig_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
)

// OperatorConfigReconciler reconciles a OperatorConfig object
Expand Down
2 changes: 1 addition & 1 deletion controllers/operatorconfig/operatorconfig_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
//+kubebuilder:scaffold:imports
)

Expand Down
4 changes: 2 additions & 2 deletions controllers/testutil/test_util.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (

nssv1 "github.com/IBM/ibm-namespace-scope-operator/api/v1"

apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
apiv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
// +kubebuilder:scaffold:imports
)

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/IBM/operand-deployment-lifecycle-manager
module github.com/IBM/operand-deployment-lifecycle-manager/v4

go 1.20

Expand Down
24 changes: 12 additions & 12 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ import (
cache "github.com/IBM/controller-filtered-cache/filteredcache"
nssv1 "github.com/IBM/ibm-namespace-scope-operator/api/v1"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/constant"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/k8sutil"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/namespacescope"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandbindinfo"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandconfig"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandregistry"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/controllers/operator"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operatorchecker"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/operatorconfig"
"github.com/IBM/operand-deployment-lifecycle-manager/controllers/util"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/constant"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/k8sutil"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/namespacescope"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandbindinfo"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandconfig"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandregistry"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operandrequest"
deploy "github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operator"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operatorchecker"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/operatorconfig"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/controllers/util"
// +kubebuilder:scaffold:imports
)

Expand Down
2 changes: 1 addition & 1 deletion test/e2e/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
"github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
)

func createTestNamespace(namespace string) {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/odlm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/api/v1alpha1"
operatorv1alpha1 "github.com/IBM/operand-deployment-lifecycle-manager/v4/api/v1alpha1"
)

// +kubebuilder:docs-gen:collapse=Imports
Expand Down
Loading

0 comments on commit b3ed4f6

Please sign in to comment.