From 30ce968767498cf572b7668a91efbd0d24e43c31 Mon Sep 17 00:00:00 2001 From: Andreas Fritzler Date: Mon, 1 Jul 2024 17:42:41 +0200 Subject: [PATCH] Switch to `ironcore-dev` `metal-operator` --- cmd/main.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- .../controller/serverbootconfiguration_http_controller.go | 2 +- internal/controller/suite_test.go | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 2a737dec..fe2badd0 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -10,8 +10,8 @@ import ( "fmt" "os" - metalv1alpha1 "github.com/afritzler/metal-operator/api/v1alpha1" "github.com/ironcore-dev/controller-utils/cmdutils/switches" + metalv1alpha1 "github.com/ironcore-dev/metal-operator/api/v1alpha1" machinev1alpha1 "github.com/ironcore-dev/metal/api/v1alpha1" // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) diff --git a/go.mod b/go.mod index 4436833b..57699669 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module github.com/ironcore-dev/boot-operator go 1.22.2 require ( - github.com/afritzler/metal-operator v0.0.0-20240424135741-4d378a6dc7b7 github.com/coreos/butane v0.21.0 github.com/go-logr/logr v1.4.2 github.com/ironcore-dev/controller-utils v0.9.3 github.com/ironcore-dev/metal v0.0.0-20240624131301-18385f342755 + github.com/ironcore-dev/metal-operator v0.0.0-20240701152532-491d3d6f6ef8 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 k8s.io/api v0.30.2 diff --git a/go.sum b/go.sum index 3ae4c4ca..5732a379 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -github.com/afritzler/metal-operator v0.0.0-20240424135741-4d378a6dc7b7 h1:sQS81jw4cTOo3har9FLoeRFfq/H+psLCOG2WJFj2cjg= -github.com/afritzler/metal-operator v0.0.0-20240424135741-4d378a6dc7b7/go.mod h1:7PTGK5V1n/Oxqvtae6faXGk7FbSueVCa5OMSOJxhaXs= github.com/aws/aws-sdk-go v1.50.25 h1:vhiHtLYybv1Nhx3Kv18BBC6L0aPJHaG9aeEsr92W99c= github.com/aws/aws-sdk-go v1.50.25/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -69,6 +67,8 @@ github.com/ironcore-dev/controller-utils v0.9.3 h1:sTrnxSzX5RrLf4B8KrAH2axSC+gxf github.com/ironcore-dev/controller-utils v0.9.3/go.mod h1:djKnxDs0Hwxhhc0VmVY8tZnrOrElvrRV2jov/LiCZ2Y= github.com/ironcore-dev/metal v0.0.0-20240624131301-18385f342755 h1:EmR3Ngg2wmOXJkxgsdYVuPXLRfwWmO2Fi+htjih6QGY= github.com/ironcore-dev/metal v0.0.0-20240624131301-18385f342755/go.mod h1:+/bmkghOE7acqXDT/LDH57RemaUzlVwnQjttsOjdoyg= +github.com/ironcore-dev/metal-operator v0.0.0-20240701152532-491d3d6f6ef8 h1:cPAp9TQ8UH/YSQycwodtpUeQauui+pSdwEnqzNl/Mdk= +github.com/ironcore-dev/metal-operator v0.0.0-20240701152532-491d3d6f6ef8/go.mod h1:6EYFrn0zifba1LwIV3VO6g4qQkFV8345VGU3A/qS7P0= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= diff --git a/internal/controller/serverbootconfiguration_http_controller.go b/internal/controller/serverbootconfiguration_http_controller.go index 6a7ad479..d1d4eee0 100644 --- a/internal/controller/serverbootconfiguration_http_controller.go +++ b/internal/controller/serverbootconfiguration_http_controller.go @@ -17,7 +17,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - metalv1alpha1 "github.com/afritzler/metal-operator/api/v1alpha1" + metalv1alpha1 "github.com/ironcore-dev/metal-operator/api/v1alpha1" ) type ServerBootConfigurationHTTPReconciler struct { diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index be2f1056..6681e0c7 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - metalv1alpha1 "github.com/afritzler/metal-operator/api/v1alpha1" "github.com/ironcore-dev/controller-utils/modutils" + metalv1alpha1 "github.com/ironcore-dev/metal-operator/api/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -63,7 +63,7 @@ var _ = BeforeSuite(func() { testEnv = &envtest.Environment{ CRDDirectoryPaths: []string{ filepath.Join("..", "..", "config", "crd", "bases"), - filepath.Join(modutils.Dir("github.com/afritzler/metal-operator", "config", "crd", "bases")), + filepath.Join(modutils.Dir("github.com/ironcore-dev/metal-operator", "config", "crd", "bases")), }, ErrorIfCRDPathMissing: true,