diff --git a/apis/v1/servicebinding_lifecycle.go b/apis/v1/servicebinding_lifecycle.go index 66246842..3c9cff86 100644 --- a/apis/v1/servicebinding_lifecycle.go +++ b/apis/v1/servicebinding_lifecycle.go @@ -20,8 +20,8 @@ limitations under the License. package v1 import ( - "github.com/vmware-labs/reconciler-runtime/apis" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "reconciler.io/runtime/apis" ) // These are valid conditions of ServiceBinding. diff --git a/controllers/client.go b/controllers/client.go index e30ad6e5..d56a8e6e 100644 --- a/controllers/client.go +++ b/controllers/client.go @@ -19,7 +19,7 @@ package controllers import ( "context" - "github.com/vmware-labs/reconciler-runtime/reconcilers" + "reconciler.io/runtime/reconcilers" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/controllers/servicebinding_controller.go b/controllers/servicebinding_controller.go index 7b3f793f..677fc95a 100644 --- a/controllers/servicebinding_controller.go +++ b/controllers/servicebinding_controller.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - "github.com/vmware-labs/reconciler-runtime/apis" - "github.com/vmware-labs/reconciler-runtime/reconcilers" - "github.com/vmware-labs/reconciler-runtime/tracker" apierrs "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "reconciler.io/runtime/apis" + "reconciler.io/runtime/reconcilers" + "reconciler.io/runtime/tracker" ctlr "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/handler" diff --git a/controllers/servicebinding_controller_test.go b/controllers/servicebinding_controller_test.go index 74484dfa..40d488c2 100644 --- a/controllers/servicebinding_controller_test.go +++ b/controllers/servicebinding_controller_test.go @@ -24,9 +24,6 @@ import ( dieappsv1 "dies.dev/apis/apps/v1" diecorev1 "dies.dev/apis/core/v1" diemetav1 "dies.dev/apis/meta/v1" - "github.com/vmware-labs/reconciler-runtime/reconcilers" - rtesting "github.com/vmware-labs/reconciler-runtime/testing" - "github.com/vmware-labs/reconciler-runtime/tracker" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrs "k8s.io/apimachinery/pkg/api/errors" @@ -40,6 +37,9 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/uuid" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + "reconciler.io/runtime/reconcilers" + rtesting "reconciler.io/runtime/testing" + "reconciler.io/runtime/tracker" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/controllers/webhook_controller.go b/controllers/webhook_controller.go index 47e47e90..fbfa3e7b 100644 --- a/controllers/webhook_controller.go +++ b/controllers/webhook_controller.go @@ -22,7 +22,6 @@ import ( "reflect" "github.com/go-logr/logr" - "github.com/vmware-labs/reconciler-runtime/reconcilers" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -31,6 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/util/workqueue" + "reconciler.io/runtime/reconcilers" controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/webhook_controller_test.go b/controllers/webhook_controller_test.go index 15fdc534..78d041d6 100644 --- a/controllers/webhook_controller_test.go +++ b/controllers/webhook_controller_test.go @@ -28,8 +28,6 @@ import ( diemetav1 "dies.dev/apis/meta/v1" "github.com/go-logr/logr" "github.com/google/go-cmp/cmp" - "github.com/vmware-labs/reconciler-runtime/reconcilers" - rtesting "github.com/vmware-labs/reconciler-runtime/testing" "gomodules.xyz/jsonpatch/v2" admissionv1 "k8s.io/api/admission/v1" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" @@ -43,6 +41,8 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/util/workqueue" + "reconciler.io/runtime/reconcilers" + rtesting "reconciler.io/runtime/testing" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/controller" diff --git a/go.mod b/go.mod index 14d2701a..1a0279f9 100644 --- a/go.mod +++ b/go.mod @@ -7,12 +7,12 @@ require ( github.com/go-logr/logr v1.4.1 github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.9.0 - github.com/vmware-labs/reconciler-runtime v0.19.0 gomodules.xyz/jsonpatch/v2 v2.4.0 k8s.io/api v0.29.3 k8s.io/apimachinery v0.29.3 k8s.io/client-go v0.29.3 k8s.io/utils v0.0.0-20240102154912-e7106e64919e + reconciler.io/runtime v0.20.0 sigs.k8s.io/controller-runtime v0.17.2 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index 9be8ed1e..3734c468 100644 --- a/go.sum +++ b/go.sum @@ -104,8 +104,6 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/vmware-labs/reconciler-runtime v0.19.0 h1:CmHEdFGpf+Td4n3KkrKNyzUlh7rfBii10XOwNTTI9wI= -github.com/vmware-labs/reconciler-runtime v0.19.0/go.mod h1:e5VEouNf4KLGH25xh5tfHf/Su8kN0i7blG7bWbUpnwM= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= @@ -211,6 +209,8 @@ k8s.io/kube-openapi v0.0.0-20240126223410-2919ad4fcfec h1:iGTel2aR8vCZdxJDgmbeY0 k8s.io/kube-openapi v0.0.0-20240126223410-2919ad4fcfec/go.mod h1:Pa1PvrP7ACSkuX6I7KYomY6cmMA0Tx86waBhDUgoKPw= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +reconciler.io/runtime v0.20.0 h1:b2RQTYRrnEDTZQHH6h57SIR373vzKPRyfTKtRyO2cpw= +reconciler.io/runtime v0.20.0/go.mod h1:rDD6qZcijjw+7JIkfOOnLM9uMOH+Robq24fbihD5ZRc= sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0= sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/lifecycle/hooks_test.go b/lifecycle/hooks_test.go index be5a7789..da6f917c 100644 --- a/lifecycle/hooks_test.go +++ b/lifecycle/hooks_test.go @@ -25,9 +25,6 @@ import ( diecorev1 "dies.dev/apis/core/v1" diemetav1 "dies.dev/apis/meta/v1" "github.com/stretchr/testify/mock" - "github.com/vmware-labs/reconciler-runtime/reconcilers" - rtesting "github.com/vmware-labs/reconciler-runtime/testing" - "github.com/vmware-labs/reconciler-runtime/tracker" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -39,6 +36,9 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/utils/pointer" + "reconciler.io/runtime/reconcilers" + rtesting "reconciler.io/runtime/testing" + "reconciler.io/runtime/tracker" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" diff --git a/lifecycle/vmware/migration.go b/lifecycle/vmware/migration.go index 2ae2ba25..f1aa60e2 100644 --- a/lifecycle/vmware/migration.go +++ b/lifecycle/vmware/migration.go @@ -23,7 +23,6 @@ import ( "regexp" "github.com/go-logr/logr" - "github.com/vmware-labs/reconciler-runtime/reconcilers" corev1 "k8s.io/api/core/v1" apierrs "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -31,6 +30,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + "reconciler.io/runtime/reconcilers" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/servicebinding/runtime/apis/duck" diff --git a/lifecycle/vmware/migration_test.go b/lifecycle/vmware/migration_test.go index 598befd1..a611ec9d 100644 --- a/lifecycle/vmware/migration_test.go +++ b/lifecycle/vmware/migration_test.go @@ -24,8 +24,6 @@ import ( dieappsv1 "dies.dev/apis/apps/v1" diecorev1 "dies.dev/apis/core/v1" diemetav1 "dies.dev/apis/meta/v1" - "github.com/vmware-labs/reconciler-runtime/reconcilers" - rtesting "github.com/vmware-labs/reconciler-runtime/testing" "gomodules.xyz/jsonpatch/v2" admissionv1 "k8s.io/api/admission/v1" appsv1 "k8s.io/api/apps/v1" @@ -39,6 +37,8 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/uuid" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + "reconciler.io/runtime/reconcilers" + rtesting "reconciler.io/runtime/testing" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/main.go b/main.go index a8c727ad..cdbfe5b9 100644 --- a/main.go +++ b/main.go @@ -26,10 +26,10 @@ import ( // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" - "github.com/vmware-labs/reconciler-runtime/reconcilers" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + "reconciler.io/runtime/reconcilers" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/healthz" diff --git a/rbac/cani_test.go b/rbac/cani_test.go index 00c3a822..d1f3f726 100644 --- a/rbac/cani_test.go +++ b/rbac/cani_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" - "github.com/vmware-labs/reconciler-runtime/reconcilers" - rtesting "github.com/vmware-labs/reconciler-runtime/testing" appsv1 "k8s.io/api/apps/v1" authorizationv1 "k8s.io/api/authorization/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + "reconciler.io/runtime/reconcilers" + rtesting "reconciler.io/runtime/testing" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/resolver/cluster_test.go b/resolver/cluster_test.go index fd84c4f1..07df7c9a 100644 --- a/resolver/cluster_test.go +++ b/resolver/cluster_test.go @@ -22,7 +22,6 @@ import ( "testing" "github.com/google/go-cmp/cmp" - rtesting "github.com/vmware-labs/reconciler-runtime/testing" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" networkingv1 "k8s.io/api/networking/v1" @@ -34,6 +33,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/uuid" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + rtesting "reconciler.io/runtime/testing" "sigs.k8s.io/controller-runtime/pkg/client" fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"