diff --git a/api/v1alpha1/lockedpatch.go b/api/v1alpha1/lockedpatch.go index 9fa5bb0..dac1ef3 100644 --- a/api/v1alpha1/lockedpatch.go +++ b/api/v1alpha1/lockedpatch.go @@ -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" diff --git a/controllers/enforcingcrd_controller.go b/controllers/enforcingcrd_controller.go index 1465181..0fdc0fe 100644 --- a/controllers/enforcingcrd_controller.go +++ b/controllers/enforcingcrd_controller.go @@ -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 diff --git a/controllers/enforcingpatch_controller.go b/controllers/enforcingpatch_controller.go index 7de318a..bf6dba7 100644 --- a/controllers/enforcingpatch_controller.go +++ b/controllers/enforcingpatch_controller.go @@ -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 diff --git a/controllers/mycrd_controller.go b/controllers/mycrd_controller.go index fb487bc..e506a0d 100644 --- a/controllers/mycrd_controller.go +++ b/controllers/mycrd_controller.go @@ -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" diff --git a/controllers/suite_test.go b/controllers/suite_test.go index b48764f..fb4b766 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -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 ) diff --git a/controllers/templatedenforcingcrd_controller.go b/controllers/templatedenforcingcrd_controller.go index d0e9100..d62c56f 100644 --- a/controllers/templatedenforcingcrd_controller.go +++ b/controllers/templatedenforcingcrd_controller.go @@ -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 diff --git a/go.mod b/go.mod index 60f6920..6b6b8a2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/redhat-cop/operator-utils/v2 +module github.com/redhat-cop/operator-utils go 1.16 diff --git a/main.go b/main.go index 5f1d861..df52f00 100644 --- a/main.go +++ b/main.go @@ -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 ) diff --git a/pkg/util/crud/crudutils.go b/pkg/util/crud/crudutils.go index 33ffc87..994dd76 100644 --- a/pkg/util/crud/crudutils.go +++ b/pkg/util/crud/crudutils.go @@ -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" diff --git a/pkg/util/lockedresourcecontroller/enforcing-reconciler.go b/pkg/util/lockedresourcecontroller/enforcing-reconciler.go index 749f5dc..a2bff20 100644 --- a/pkg/util/lockedresourcecontroller/enforcing-reconciler.go +++ b/pkg/util/lockedresourcecontroller/enforcing-reconciler.go @@ -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" diff --git a/pkg/util/lockedresourcecontroller/locked-resource-manager.go b/pkg/util/lockedresourcecontroller/locked-resource-manager.go index df84d39..b850cd0 100644 --- a/pkg/util/lockedresourcecontroller/locked-resource-manager.go +++ b/pkg/util/lockedresourcecontroller/locked-resource-manager.go @@ -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" diff --git a/pkg/util/lockedresourcecontroller/lockedpatch/lockedpatch.go b/pkg/util/lockedresourcecontroller/lockedpatch/lockedpatch.go index 070a71e..c6776fa 100644 --- a/pkg/util/lockedresourcecontroller/lockedpatch/lockedpatch.go +++ b/pkg/util/lockedresourcecontroller/lockedpatch/lockedpatch.go @@ -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" diff --git a/pkg/util/lockedresourcecontroller/lockedresource/lockedresource.go b/pkg/util/lockedresourcecontroller/lockedresource/lockedresource.go index d77ab7c..a3f7265 100644 --- a/pkg/util/lockedresourcecontroller/lockedresource/lockedresource.go +++ b/pkg/util/lockedresourcecontroller/lockedresource/lockedresource.go @@ -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" diff --git a/pkg/util/lockedresourcecontroller/lockedresource/lockedresourceset/lockedresourceset.go b/pkg/util/lockedresourcecontroller/lockedresource/lockedresourceset/lockedresourceset.go index eeb3a24..01ea28f 100644 --- a/pkg/util/lockedresourcecontroller/lockedresource/lockedresourceset/lockedresourceset.go +++ b/pkg/util/lockedresourcecontroller/lockedresource/lockedresourceset/lockedresourceset.go @@ -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 ( diff --git a/pkg/util/lockedresourcecontroller/patch-reconciler.go b/pkg/util/lockedresourcecontroller/patch-reconciler.go index e3051d2..265ddc7 100644 --- a/pkg/util/lockedresourcecontroller/patch-reconciler.go +++ b/pkg/util/lockedresourcecontroller/patch-reconciler.go @@ -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" diff --git a/pkg/util/lockedresourcecontroller/resource-reconciler.go b/pkg/util/lockedresourcecontroller/resource-reconciler.go index 4fe1fab..d60b04c 100644 --- a/pkg/util/lockedresourcecontroller/resource-reconciler.go +++ b/pkg/util/lockedresourcecontroller/resource-reconciler.go @@ -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" diff --git a/pkg/util/reconciler.go b/pkg/util/reconciler.go index b36498c..2339ec9 100644 --- a/pkg/util/reconciler.go +++ b/pkg/util/reconciler.go @@ -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" diff --git a/pkg/util/templates/advanced-funcmap.go b/pkg/util/templates/advanced-funcmap.go index b1f3f1e..6249dd5 100644 --- a/pkg/util/templates/advanced-funcmap.go +++ b/pkg/util/templates/advanced-funcmap.go @@ -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"