From e285aa6dfd7d9a8a1e9308f2e4cad0f72614bba3 Mon Sep 17 00:00:00 2001 From: Scott Andrews Date: Fri, 5 Apr 2024 08:37:12 -0400 Subject: [PATCH] Migrate to reconciler.io (#716) reconciler.io is the new home of dies.dev and reconciler-runtime. This changeset migrates both packages to their new home. There is no functional difference between the new releases and the currently used releases. However, going forward only the new package names are actively maintained. Signed-off-by: Scott Andrews --- Makefile | 2 +- cmd/manager/main.go | 2 +- go.mod | 4 ++-- go.sum | 6 ++++-- hack/go.mod | 2 +- hack/go.sum | 4 ++-- hack/tools.go | 2 +- pkg/apis/conventions/v1alpha1/podintent_lifecycle.go | 2 +- pkg/apis/conventions/v1alpha1/podintent_test.go | 4 ++-- pkg/apis/conventions/v1alpha1/podintent_types.go | 2 +- pkg/apis/interfaces.go | 2 +- pkg/controllers/metrics_reconciler_test.go | 8 ++++---- pkg/controllers/podintent_reconciler.go | 6 +++--- pkg/controllers/podintent_reconciler_test.go | 10 +++++----- pkg/dies/cert-manager/v1/certificaterequest.go | 4 ++-- pkg/dies/cert-manager/v1/zz_generated.die.go | 2 +- pkg/dies/cert-manager/v1/zz_generated.die_test.go | 2 +- pkg/dies/conventions/v1alpha1/clusterpodconvention.go | 4 ++-- pkg/dies/conventions/v1alpha1/podintent.go | 4 ++-- pkg/dies/conventions/v1alpha1/zz_generated.die.go | 4 ++-- pkg/dies/conventions/v1alpha1/zz_generated.die_test.go | 2 +- webhook/hack/go.mod | 2 +- webhook/hack/go.sum | 4 ++-- webhook/hack/tools.go | 2 +- 24 files changed, 44 insertions(+), 42 deletions(-) diff --git a/Makefile b/Makefile index c530ffe6..5adf58ae 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ GOBIN=$(shell go env GOBIN) endif CONTROLLER_GEN ?= go run -modfile hack/go.mod sigs.k8s.io/controller-tools/cmd/controller-gen -DIEGEN ?= go run -modfile hack/go.mod dies.dev/diegen +DIEGEN ?= go run -modfile hack/go.mod reconciler.io/dies/diegen GOIMPORTS ?= go run -modfile hack/go.mod golang.org/x/tools/cmd/goimports KUSTOMIZE ?= go run -modfile hack/go.mod sigs.k8s.io/kustomize/kustomize/v5 YTT ?= go run -modfile hack/go.mod carvel.dev/ytt/cmd/ytt diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 0c849f92..e40fb2e3 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -23,13 +23,13 @@ import ( "time" "github.com/google/go-containerregistry/pkg/v1/cache" - "github.com/vmware-labs/reconciler-runtime/reconcilers" "go.uber.org/zap/zapcore" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" webhookutil "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/kubernetes" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + "reconciler.io/runtime/reconcilers" ctrl "sigs.k8s.io/controller-runtime" ctrlcache "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/go.mod b/go.mod index eea6642b..4db58830 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,10 @@ go 1.21 replace github.com/vmware-tanzu/cartographer-conventions/webhook => ./webhook require ( - dies.dev v0.10.1 github.com/go-logr/logr v1.4.1 github.com/google/go-cmp v0.6.0 github.com/google/go-containerregistry v0.19.1 github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20220105220605-d9bfbcb99e52 - github.com/vmware-labs/reconciler-runtime v0.19.0 github.com/vmware-tanzu/cartographer-conventions/webhook v0.5.1 go.uber.org/zap v1.27.0 k8s.io/api v0.29.3 @@ -18,6 +16,8 @@ require ( k8s.io/apiserver v0.29.3 k8s.io/client-go v0.29.3 k8s.io/utils v0.0.0-20240102154912-e7106e64919e + reconciler.io/dies v0.11.0 + 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 6d269a40..079a1a66 100644 --- a/go.sum +++ b/go.sum @@ -866,8 +866,6 @@ github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:tw github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -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/vmware/govmomi v0.20.3/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU= github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= @@ -1548,6 +1546,10 @@ k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= 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/dies v0.11.0 h1:gfhOPxB/+V1Pqwr94krtAcQTksnYl8G4YAwDtElSzz4= +reconciler.io/dies v0.11.0/go.mod h1:jL6xrLwWP/BZm17LIH5WPnYq+//ZD/7srVBnPVHqM4Q= +reconciler.io/runtime v0.20.0 h1:b2RQTYRrnEDTZQHH6h57SIR373vzKPRyfTKtRyO2cpw= +reconciler.io/runtime v0.20.0/go.mod h1:rDD6qZcijjw+7JIkfOOnLM9uMOH+Robq24fbihD5ZRc= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/hack/go.mod b/hack/go.mod index 65e7218a..5caba363 100644 --- a/hack/go.mod +++ b/hack/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( carvel.dev/ytt v0.48.0 - dies.dev/diegen v0.10.1 golang.org/x/tools v0.19.0 + reconciler.io/dies/diegen v0.11.0 sigs.k8s.io/controller-tools v0.14.0 sigs.k8s.io/kustomize/kustomize/v5 v5.3.0 ) diff --git a/hack/go.sum b/hack/go.sum index dd424db7..31d8e654 100644 --- a/hack/go.sum +++ b/hack/go.sum @@ -1,7 +1,5 @@ carvel.dev/ytt v0.48.0 h1:NNLW6mHBxYFhz8tRlaUW4xjtDmq8u8unmC0dcsCKPxU= carvel.dev/ytt v0.48.0/go.mod h1:ss9N6IKCUxg5yH5xomguFBQmuLnEwQr8slbAjTToCPQ= -dies.dev/diegen v0.10.1 h1:bUjO7L3ALdyT6nRuntcCAfy4Vx4ny4cC8kemT/GY240= -dies.dev/diegen v0.10.1/go.mod h1:08auIh8JtE32P7wVv7IC1EmAxSRoziWLwbOiMfk8cNI= github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -228,6 +226,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +reconciler.io/dies/diegen v0.11.0 h1:mB9Z7lVqrG5Ld+9sqgpRtGEnvL86BLWxfdvcioDAFWQ= +reconciler.io/dies/diegen v0.11.0/go.mod h1:K2Y514FWyBp3R7VQk7zq8zFA6fGK2QsOBRnaShMAj4Q= sigs.k8s.io/controller-tools v0.14.0 h1:rnNoCC5wSXlrNoBKKzL70LNJKIQKEzT6lloG6/LF73A= sigs.k8s.io/controller-tools v0.14.0/go.mod h1:TV7uOtNNnnR72SpzhStvPkoS/U5ir0nMudrkrC4M9Sc= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= diff --git a/hack/tools.go b/hack/tools.go index 39da3d74..7c7a2273 100644 --- a/hack/tools.go +++ b/hack/tools.go @@ -6,8 +6,8 @@ package tools import ( _ "carvel.dev/ytt/cmd/ytt" - _ "dies.dev/diegen" _ "golang.org/x/tools/cmd/goimports" + _ "reconciler.io/dies/diegen" _ "sigs.k8s.io/controller-tools/cmd/controller-gen" _ "sigs.k8s.io/kustomize/kustomize/v5" ) diff --git a/pkg/apis/conventions/v1alpha1/podintent_lifecycle.go b/pkg/apis/conventions/v1alpha1/podintent_lifecycle.go index 81fc0956..08efa951 100644 --- a/pkg/apis/conventions/v1alpha1/podintent_lifecycle.go +++ b/pkg/apis/conventions/v1alpha1/podintent_lifecycle.go @@ -17,7 +17,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/vmware-labs/reconciler-runtime/apis" + "reconciler.io/runtime/apis" ) const ( diff --git a/pkg/apis/conventions/v1alpha1/podintent_test.go b/pkg/apis/conventions/v1alpha1/podintent_test.go index 922f7464..50065f9a 100644 --- a/pkg/apis/conventions/v1alpha1/podintent_test.go +++ b/pkg/apis/conventions/v1alpha1/podintent_test.go @@ -20,11 +20,11 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/vmware-labs/reconciler-runtime/apis" - rtesting "github.com/vmware-labs/reconciler-runtime/testing" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation/field" + "reconciler.io/runtime/apis" + rtesting "reconciler.io/runtime/testing" ) func TestPodIntentDefault(t *testing.T) { diff --git a/pkg/apis/conventions/v1alpha1/podintent_types.go b/pkg/apis/conventions/v1alpha1/podintent_types.go index 84e3b08f..348a3c55 100644 --- a/pkg/apis/conventions/v1alpha1/podintent_types.go +++ b/pkg/apis/conventions/v1alpha1/podintent_types.go @@ -17,9 +17,9 @@ limitations under the License. package v1alpha1 import ( - "github.com/vmware-labs/reconciler-runtime/apis" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "reconciler.io/runtime/apis" ) type PodIntentSpec struct { diff --git a/pkg/apis/interfaces.go b/pkg/apis/interfaces.go index 222281fc..d1a58c9f 100644 --- a/pkg/apis/interfaces.go +++ b/pkg/apis/interfaces.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - "github.com/vmware-labs/reconciler-runtime/apis" + "reconciler.io/runtime/apis" ) // ConditionSetAccessor is the interface for a Resource that accesses the diff --git a/pkg/controllers/metrics_reconciler_test.go b/pkg/controllers/metrics_reconciler_test.go index cfa58638..dafcb947 100644 --- a/pkg/controllers/metrics_reconciler_test.go +++ b/pkg/controllers/metrics_reconciler_test.go @@ -20,14 +20,14 @@ import ( "testing" "time" - 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" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" clientgoscheme "k8s.io/client-go/kubernetes/scheme" + diecorev1 "reconciler.io/dies/apis/core/v1" + diemetav1 "reconciler.io/dies/apis/meta/v1" + "reconciler.io/runtime/reconcilers" + rtesting "reconciler.io/runtime/testing" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/pkg/controllers/podintent_reconciler.go b/pkg/controllers/podintent_reconciler.go index 2df90431..b1b8bb99 100644 --- a/pkg/controllers/podintent_reconciler.go +++ b/pkg/controllers/podintent_reconciler.go @@ -25,14 +25,14 @@ import ( "github.com/go-logr/logr" "github.com/google/go-containerregistry/pkg/authn/k8schain" - "github.com/vmware-labs/reconciler-runtime/apis" - "github.com/vmware-labs/reconciler-runtime/reconcilers" - "github.com/vmware-labs/reconciler-runtime/tracker" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" + "reconciler.io/runtime/apis" + "reconciler.io/runtime/reconcilers" + "reconciler.io/runtime/tracker" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/pkg/controllers/podintent_reconciler_test.go b/pkg/controllers/podintent_reconciler_test.go index 7d803c59..6e427b76 100644 --- a/pkg/controllers/podintent_reconciler_test.go +++ b/pkg/controllers/podintent_reconciler_test.go @@ -26,16 +26,11 @@ import ( "testing" "time" - dieadmissionregistrationv1 "dies.dev/apis/admissionregistration/v1" - diecorev1 "dies.dev/apis/core/v1" - diemetav1 "dies.dev/apis/meta/v1" "github.com/google/go-cmp/cmp" "github.com/google/go-containerregistry/pkg/authn/k8schain" "github.com/google/go-containerregistry/pkg/crane" "github.com/google/go-containerregistry/pkg/registry" "github.com/google/go-containerregistry/pkg/v1/cache" - "github.com/vmware-labs/reconciler-runtime/reconcilers" - rtesting "github.com/vmware-labs/reconciler-runtime/testing" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -45,6 +40,11 @@ import ( fakeclient "k8s.io/client-go/kubernetes/fake" clientgoscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/utils/pointer" + dieadmissionregistrationv1 "reconciler.io/dies/apis/admissionregistration/v1" + diecorev1 "reconciler.io/dies/apis/core/v1" + diemetav1 "reconciler.io/dies/apis/meta/v1" + "reconciler.io/runtime/reconcilers" + rtesting "reconciler.io/runtime/testing" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" diff --git a/pkg/dies/cert-manager/v1/certificaterequest.go b/pkg/dies/cert-manager/v1/certificaterequest.go index 0fb319b5..01ba4317 100644 --- a/pkg/dies/cert-manager/v1/certificaterequest.go +++ b/pkg/dies/cert-manager/v1/certificaterequest.go @@ -17,8 +17,8 @@ limitations under the License. package v1alpha1 import ( - diecorev1 "dies.dev/apis/core/v1" - diemetav1 "dies.dev/apis/meta/v1" + diecorev1 "reconciler.io/dies/apis/core/v1" + diemetav1 "reconciler.io/dies/apis/meta/v1" certmanagerv1 "github.com/vmware-tanzu/cartographer-conventions/pkg/apis/thirdparty/cert-manager/v1" ) diff --git a/pkg/dies/cert-manager/v1/zz_generated.die.go b/pkg/dies/cert-manager/v1/zz_generated.die.go index c52779ff..34db15a6 100644 --- a/pkg/dies/cert-manager/v1/zz_generated.die.go +++ b/pkg/dies/cert-manager/v1/zz_generated.die.go @@ -27,13 +27,13 @@ import ( osx "os" reflectx "reflect" - metav1 "dies.dev/apis/meta/v1" corev1 "k8s.io/api/core/v1" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" unstructured "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" jsonpath "k8s.io/client-go/util/jsonpath" + metav1 "reconciler.io/dies/apis/meta/v1" yaml "sigs.k8s.io/yaml" v1 "github.com/vmware-tanzu/cartographer-conventions/pkg/apis/thirdparty/cert-manager/v1" diff --git a/pkg/dies/cert-manager/v1/zz_generated.die_test.go b/pkg/dies/cert-manager/v1/zz_generated.die_test.go index bdb2def0..73ceaa61 100644 --- a/pkg/dies/cert-manager/v1/zz_generated.die_test.go +++ b/pkg/dies/cert-manager/v1/zz_generated.die_test.go @@ -24,7 +24,7 @@ package v1alpha1 import ( testingx "testing" - testing "dies.dev/testing" + testing "reconciler.io/dies/testing" ) func TestCertificateRequestDie_MissingMethods(t *testingx.T) { diff --git a/pkg/dies/conventions/v1alpha1/clusterpodconvention.go b/pkg/dies/conventions/v1alpha1/clusterpodconvention.go index 009bdcc1..9f12a5e7 100644 --- a/pkg/dies/conventions/v1alpha1/clusterpodconvention.go +++ b/pkg/dies/conventions/v1alpha1/clusterpodconvention.go @@ -17,9 +17,9 @@ limitations under the License. package v1alpha1 import ( - dieadmissionregistrationv1 "dies.dev/apis/admissionregistration/v1" - diemetav1 "dies.dev/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + dieadmissionregistrationv1 "reconciler.io/dies/apis/admissionregistration/v1" + diemetav1 "reconciler.io/dies/apis/meta/v1" conventionsv1alpha1 "github.com/vmware-tanzu/cartographer-conventions/pkg/apis/conventions/v1alpha1" ) diff --git a/pkg/dies/conventions/v1alpha1/podintent.go b/pkg/dies/conventions/v1alpha1/podintent.go index 53db64ea..18e1c45c 100644 --- a/pkg/dies/conventions/v1alpha1/podintent.go +++ b/pkg/dies/conventions/v1alpha1/podintent.go @@ -17,10 +17,10 @@ limitations under the License. package v1alpha1 import ( - diecorev1 "dies.dev/apis/core/v1" - diemetav1 "dies.dev/apis/meta/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + diecorev1 "reconciler.io/dies/apis/core/v1" + diemetav1 "reconciler.io/dies/apis/meta/v1" conventionsv1alpha1 "github.com/vmware-tanzu/cartographer-conventions/pkg/apis/conventions/v1alpha1" ) diff --git a/pkg/dies/conventions/v1alpha1/zz_generated.die.go b/pkg/dies/conventions/v1alpha1/zz_generated.die.go index f4d20b23..db82fdb3 100644 --- a/pkg/dies/conventions/v1alpha1/zz_generated.die.go +++ b/pkg/dies/conventions/v1alpha1/zz_generated.die.go @@ -27,8 +27,6 @@ import ( osx "os" reflectx "reflect" - v1 "dies.dev/apis/meta/v1" - apis "github.com/vmware-labs/reconciler-runtime/apis" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -36,6 +34,8 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" jsonpath "k8s.io/client-go/util/jsonpath" + v1 "reconciler.io/dies/apis/meta/v1" + apis "reconciler.io/runtime/apis" yaml "sigs.k8s.io/yaml" conventionsv1alpha1 "github.com/vmware-tanzu/cartographer-conventions/pkg/apis/conventions/v1alpha1" diff --git a/pkg/dies/conventions/v1alpha1/zz_generated.die_test.go b/pkg/dies/conventions/v1alpha1/zz_generated.die_test.go index 6ad6d6ba..ffa65bfe 100644 --- a/pkg/dies/conventions/v1alpha1/zz_generated.die_test.go +++ b/pkg/dies/conventions/v1alpha1/zz_generated.die_test.go @@ -24,7 +24,7 @@ package v1alpha1 import ( testingx "testing" - testing "dies.dev/testing" + testing "reconciler.io/dies/testing" ) func TestClusterPodConventionDie_MissingMethods(t *testingx.T) { diff --git a/webhook/hack/go.mod b/webhook/hack/go.mod index 9d3b1c7f..1b1cbac3 100644 --- a/webhook/hack/go.mod +++ b/webhook/hack/go.mod @@ -3,7 +3,7 @@ module github.com/vmware-tanzu/cartographer-conventions/tools go 1.21 require ( - dies.dev/diegen v0.9.0 + reconciler.io/dies/diegen v0.9.0 github.com/k14s/ytt v0.39.0 golang.org/x/tools v0.8.0 sigs.k8s.io/controller-tools v0.11.0 diff --git a/webhook/hack/go.sum b/webhook/hack/go.sum index aa1638fa..6def5d18 100644 --- a/webhook/hack/go.sum +++ b/webhook/hack/go.sum @@ -1,5 +1,5 @@ -dies.dev/diegen v0.9.0 h1:R93K2M9UYLk2kUiDBdNkzAuHGofmzmvfR7v2OyfWKuc= -dies.dev/diegen v0.9.0/go.mod h1:zs6MsYz+EEw4vSQjGhH9y3NFPupZZazb5CguUJpO0Zc= +reconciler.io/dies/diegen v0.9.0 h1:R93K2M9UYLk2kUiDBdNkzAuHGofmzmvfR7v2OyfWKuc= +reconciler.io/dies/diegen v0.9.0/go.mod h1:zs6MsYz+EEw4vSQjGhH9y3NFPupZZazb5CguUJpO0Zc= github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= diff --git a/webhook/hack/tools.go b/webhook/hack/tools.go index 2ccb7da5..2add39e5 100644 --- a/webhook/hack/tools.go +++ b/webhook/hack/tools.go @@ -5,9 +5,9 @@ package tools import ( - _ "dies.dev/diegen" _ "github.com/k14s/ytt/cmd/ytt" _ "golang.org/x/tools/cmd/goimports" + _ "reconciler.io/dies/diegen" _ "sigs.k8s.io/controller-tools/cmd/controller-gen" _ "sigs.k8s.io/kustomize/kustomize/v5" )