treewide: introduce osbase package and move things around
All except localregistry moved from metropolis/pkg to osbase,
localregistry moved to metropolis/test as its only used there anyway.
Change-Id: If1a4bf377364bef0ac23169e1b90379c71b06d72
Reviewed-on: https://review.monogon.dev/c/monogon/+/3079
Tested-by: Jenkins CI
Reviewed-by: Serge Bazanski <serge@monogon.tech>
diff --git a/metropolis/node/kubernetes/reconciler/BUILD.bazel b/metropolis/node/kubernetes/reconciler/BUILD.bazel
index f7bb47f..1616787 100644
--- a/metropolis/node/kubernetes/reconciler/BUILD.bazel
+++ b/metropolis/node/kubernetes/reconciler/BUILD.bazel
@@ -16,10 +16,10 @@
"//metropolis/node/core/consensus/client",
"//metropolis/node/core/curator",
"//metropolis/node/core/curator/proto/private",
- "//metropolis/pkg/event/etcd",
- "//metropolis/pkg/event/memory",
- "//metropolis/pkg/supervisor",
"//metropolis/version",
+ "//osbase/event/etcd",
+ "//osbase/event/memory",
+ "//osbase/supervisor",
"//version",
"//version/spec",
"@com_github_cenkalti_backoff_v4//:backoff",
@@ -50,9 +50,9 @@
"//metropolis/node/core/consensus/client",
"//metropolis/node/core/curator",
"//metropolis/node/core/curator/proto/private",
- "//metropolis/pkg/supervisor",
"//metropolis/proto/common",
"//metropolis/version",
+ "//osbase/supervisor",
"//version",
"//version/spec",
"@io_etcd_go_etcd_tests_v3//integration",
diff --git a/metropolis/node/kubernetes/reconciler/reconciler.go b/metropolis/node/kubernetes/reconciler/reconciler.go
index 3bfaa4d..523b31b 100644
--- a/metropolis/node/kubernetes/reconciler/reconciler.go
+++ b/metropolis/node/kubernetes/reconciler/reconciler.go
@@ -38,7 +38,7 @@
meta "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
- "source.monogon.dev/metropolis/pkg/supervisor"
+ "source.monogon.dev/osbase/supervisor"
)
// True is a sad workaround for all the pointer booleans in K8s specs
diff --git a/metropolis/node/kubernetes/reconciler/reconciler_status.go b/metropolis/node/kubernetes/reconciler/reconciler_status.go
index 4abf6f8..b139e0a 100644
--- a/metropolis/node/kubernetes/reconciler/reconciler_status.go
+++ b/metropolis/node/kubernetes/reconciler/reconciler_status.go
@@ -16,10 +16,10 @@
"source.monogon.dev/metropolis/node/core/consensus/client"
"source.monogon.dev/metropolis/node/core/curator"
ppb "source.monogon.dev/metropolis/node/core/curator/proto/private"
- "source.monogon.dev/metropolis/pkg/event/etcd"
- "source.monogon.dev/metropolis/pkg/event/memory"
- "source.monogon.dev/metropolis/pkg/supervisor"
mversion "source.monogon.dev/metropolis/version"
+ "source.monogon.dev/osbase/event/etcd"
+ "source.monogon.dev/osbase/event/memory"
+ "source.monogon.dev/osbase/supervisor"
"source.monogon.dev/version"
vpb "source.monogon.dev/version/spec"
)
diff --git a/metropolis/node/kubernetes/reconciler/reconciler_status_test.go b/metropolis/node/kubernetes/reconciler/reconciler_status_test.go
index bd627a2..9eedfbe 100644
--- a/metropolis/node/kubernetes/reconciler/reconciler_status_test.go
+++ b/metropolis/node/kubernetes/reconciler/reconciler_status_test.go
@@ -12,9 +12,9 @@
"source.monogon.dev/metropolis/node/core/consensus/client"
"source.monogon.dev/metropolis/node/core/curator"
ppb "source.monogon.dev/metropolis/node/core/curator/proto/private"
- "source.monogon.dev/metropolis/pkg/supervisor"
cpb "source.monogon.dev/metropolis/proto/common"
mversion "source.monogon.dev/metropolis/version"
+ "source.monogon.dev/osbase/supervisor"
"source.monogon.dev/version"
vpb "source.monogon.dev/version/spec"
)
diff --git a/metropolis/node/kubernetes/reconciler/reconciler_test.go b/metropolis/node/kubernetes/reconciler/reconciler_test.go
index b791dbe..f457859 100644
--- a/metropolis/node/kubernetes/reconciler/reconciler_test.go
+++ b/metropolis/node/kubernetes/reconciler/reconciler_test.go
@@ -33,7 +33,7 @@
installrbac "k8s.io/kubernetes/pkg/apis/rbac/install"
installstorage "k8s.io/kubernetes/pkg/apis/storage/install"
- "source.monogon.dev/metropolis/pkg/supervisor"
+ "source.monogon.dev/osbase/supervisor"
)
// TestExpectedUniqueNames ensures that all the Expected objects of any