Skip to content

Commit

Permalink
reset to no v2
Browse files Browse the repository at this point in the history 
Signed-off-by: raffaelespazzoli <raffaele.spazzoli@gmail.com>
  • Loading branch information
@raffaelespazzoli
raffaelespazzoli committed Dec 13, 2021
1 parent dc172eb commit 533c20a
Show file tree
Hide file tree
Showing 18 changed files with 59 additions and 59 deletions.
6 changes: 3 additions & 3 deletions api/v1alpha1/lockedpatch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"errors"
"text/template"

"github.com/redhat-cop/operator-utils/v2/pkg/util/discoveryclient"
"github.com/redhat-cop/operator-utils/v2/pkg/util/dynamicclient"
utiltemplates "github.com/redhat-cop/operator-utils/v2/pkg/util/templates"
"github.com/redhat-cop/operator-utils/pkg/util/discoveryclient"
"github.com/redhat-cop/operator-utils/pkg/util/dynamicclient"
utiltemplates "github.com/redhat-cop/operator-utils/pkg/util/templates"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/labels"
Expand Down
12 changes: 6 additions & 6 deletions controllers/enforcingcrd_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
"github.com/redhat-cop/operator-utils/v2/pkg/util"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedpatch"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedresource"
"github.com/redhat-cop/operator-utils/api/v1alpha1"
operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/api/v1alpha1"
"github.com/redhat-cop/operator-utils/pkg/util"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedpatch"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedresource"
)

// EnforcingCRDReconciler reconciles a EnforcingCRD object
Expand Down
10 changes: 5 additions & 5 deletions controllers/enforcingpatch_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedpatch"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedresource"
"github.com/redhat-cop/operator-utils/api/v1alpha1"
operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/api/v1alpha1"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedpatch"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedresource"
)

// EnforcingPatchReconciler reconciles a EnforcingPatch object
Expand Down
6 changes: 3 additions & 3 deletions controllers/mycrd_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"errors"

"github.com/go-logr/logr"
"github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
"github.com/redhat-cop/operator-utils/v2/pkg/util"
"github.com/redhat-cop/operator-utils/api/v1alpha1"
operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/api/v1alpha1"
"github.com/redhat-cop/operator-utils/pkg/util"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/envtest"
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"

operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/api/v1alpha1"
// +kubebuilder:scaffold:imports
)

Expand Down
12 changes: 6 additions & 6 deletions controllers/templatedenforcingcrd_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

"github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
"github.com/redhat-cop/operator-utils/v2/pkg/util"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedpatch"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedresource"
"github.com/redhat-cop/operator-utils/api/v1alpha1"
operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/api/v1alpha1"
"github.com/redhat-cop/operator-utils/pkg/util"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedpatch"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedresource"
)

// TemplatedEnforcingCRDReconciler reconciles a TemplatedEnforcingCRD object
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/redhat-cop/operator-utils/v2
module github.com/redhat-cop/operator-utils

go 1.16

Expand Down
8 changes: 4 additions & 4 deletions main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
"github.com/redhat-cop/operator-utils/v2/controllers"
"github.com/redhat-cop/operator-utils/v2/pkg/util"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller"
operatorutilsv1alpha1 "github.com/redhat-cop/operator-utils/api/v1alpha1"
"github.com/redhat-cop/operator-utils/controllers"
"github.com/redhat-cop/operator-utils/pkg/util"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller"
// +kubebuilder:scaffold:imports
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/util/crud/crudutils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"text/template"

"github.com/redhat-cop/operator-utils/v2/pkg/util/templates"
"github.com/redhat-cop/operator-utils/pkg/util/templates"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/types"
Expand Down
10 changes: 5 additions & 5 deletions pkg/util/lockedresourcecontroller/enforcing-reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"sync"

"github.com/go-logr/logr"
"github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
"github.com/redhat-cop/operator-utils/v2/pkg/util"
"github.com/redhat-cop/operator-utils/v2/pkg/util/apis"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedpatch"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedresource"
"github.com/redhat-cop/operator-utils/api/v1alpha1"
"github.com/redhat-cop/operator-utils/pkg/util"
"github.com/redhat-cop/operator-utils/pkg/util/apis"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedpatch"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedresource"
"github.com/scylladb/go-set/strset"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
16 changes: 8 additions & 8 deletions pkg/util/lockedresourcecontroller/locked-resource-manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import (

"github.com/go-logr/logr"
multierror "github.com/hashicorp/go-multierror"
"github.com/redhat-cop/operator-utils/v2/pkg/util"
"github.com/redhat-cop/operator-utils/v2/pkg/util/apis"
"github.com/redhat-cop/operator-utils/v2/pkg/util/discoveryclient"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedpatch"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedresource"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedresource/lockedresourceset"
"github.com/redhat-cop/operator-utils/v2/pkg/util/stoppablemanager"
"github.com/redhat-cop/operator-utils/v2/pkg/util/templates"
"github.com/redhat-cop/operator-utils/pkg/util"
"github.com/redhat-cop/operator-utils/pkg/util/apis"
"github.com/redhat-cop/operator-utils/pkg/util/discoveryclient"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedpatch"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedresource"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedresource/lockedresourceset"
"github.com/redhat-cop/operator-utils/pkg/util/stoppablemanager"
"github.com/redhat-cop/operator-utils/pkg/util/templates"
"github.com/scylladb/go-set/strset"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/discovery"
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/lockedresourcecontroller/lockedpatch/lockedpatch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"text/template"

"github.com/go-logr/logr"
utilsapi "github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
utilstemplate "github.com/redhat-cop/operator-utils/v2/pkg/util/templates"
utilsapi "github.com/redhat-cop/operator-utils/api/v1alpha1"
utilstemplate "github.com/redhat-cop/operator-utils/pkg/util/templates"
"github.com/scylladb/go-set/strset"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/rest"
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/lockedresourcecontroller/lockedresource/lockedresource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"text/template"

"github.com/go-logr/logr"
utilsapi "github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
utilstemplates "github.com/redhat-cop/operator-utils/v2/pkg/util/templates"
utilsapi "github.com/redhat-cop/operator-utils/api/v1alpha1"
utilstemplates "github.com/redhat-cop/operator-utils/pkg/util/templates"
"github.com/scylladb/go-set/strset"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/rest"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/lockedresourcecontroller/lockedresource/lockedresourceset/lockedresourceset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"math"
"strings"

"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedresource"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedresource"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions pkg/util/lockedresourcecontroller/patch-reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"sync"

"github.com/go-logr/logr"
utilsapi "github.com/redhat-cop/operator-utils/v2/api/v1alpha1"
"github.com/redhat-cop/operator-utils/v2/pkg/util"
"github.com/redhat-cop/operator-utils/v2/pkg/util/apis"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedpatch"
utilsapi "github.com/redhat-cop/operator-utils/api/v1alpha1"
"github.com/redhat-cop/operator-utils/pkg/util"
"github.com/redhat-cop/operator-utils/pkg/util/apis"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedpatch"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
8 changes: 4 additions & 4 deletions pkg/util/lockedresourcecontroller/resource-reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (

"github.com/go-logr/logr"

"github.com/redhat-cop/operator-utils/v2/pkg/util"
"github.com/redhat-cop/operator-utils/v2/pkg/util/apis"
"github.com/redhat-cop/operator-utils/v2/pkg/util/dynamicclient"
"github.com/redhat-cop/operator-utils/v2/pkg/util/lockedresourcecontroller/lockedresource"
"github.com/redhat-cop/operator-utils/pkg/util"
"github.com/redhat-cop/operator-utils/pkg/util/apis"
"github.com/redhat-cop/operator-utils/pkg/util/dynamicclient"
"github.com/redhat-cop/operator-utils/pkg/util/lockedresourcecontroller/lockedresource"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions pkg/util/reconciler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"text/template"
"time"

"github.com/redhat-cop/operator-utils/v2/pkg/util/apis"
"github.com/redhat-cop/operator-utils/v2/pkg/util/templates"
"github.com/redhat-cop/operator-utils/pkg/util/apis"
"github.com/redhat-cop/operator-utils/pkg/util/templates"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/templates/advanced-funcmap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/go-logr/logr"
"github.com/pkg/errors"

"github.com/redhat-cop/operator-utils/v2/pkg/util/dynamicclient"
"github.com/redhat-cop/operator-utils/pkg/util/dynamicclient"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down

0 comments on commit 533c20a

Please sign in to comment.