osbase/logtree.LeveledLogger -> go/logging.Leveled
This factors out the common leveled logger interface out of the logtree.
We want to use the same interface outside of logtree/supervisor usage
within the resolver code, which will be exposed to clients.
Change-Id: I299e76d91e8cefddf8f36f1e58432418c4694df2
Reviewed-on: https://review.monogon.dev/c/monogon/+/3411
Reviewed-by: Tim Windelschmidt <tim@monogon.tech>
Tested-by: Jenkins CI
diff --git a/metropolis/node/kubernetes/BUILD.bazel b/metropolis/node/kubernetes/BUILD.bazel
index f1af467..d4a36dc 100644
--- a/metropolis/node/kubernetes/BUILD.bazel
+++ b/metropolis/node/kubernetes/BUILD.bazel
@@ -16,6 +16,7 @@
importpath = "source.monogon.dev/metropolis/node/kubernetes",
visibility = ["//metropolis/node:__subpackages__"],
deps = [
+ "//go/logging",
"//go/net/tinylb",
"//metropolis/node",
"//metropolis/node/core/clusternet",
@@ -37,7 +38,6 @@
"//osbase/event/memory",
"//osbase/fileargs",
"//osbase/fsquota",
- "//osbase/logtree",
"//osbase/loop",
"//osbase/net/dns/kubernetes",
"//osbase/supervisor",
diff --git a/metropolis/node/kubernetes/clusternet/BUILD.bazel b/metropolis/node/kubernetes/clusternet/BUILD.bazel
index 6b4d744..79bedbe 100644
--- a/metropolis/node/kubernetes/clusternet/BUILD.bazel
+++ b/metropolis/node/kubernetes/clusternet/BUILD.bazel
@@ -6,9 +6,9 @@
importpath = "source.monogon.dev/metropolis/node/kubernetes/clusternet",
visibility = ["//metropolis/node/kubernetes:__subpackages__"],
deps = [
+ "//go/logging",
"//metropolis/node/core/clusternet",
"//osbase/event",
- "//osbase/logtree",
"//osbase/supervisor",
"@io_k8s_api//core/v1:core",
"@io_k8s_apimachinery//pkg/fields",
diff --git a/metropolis/node/kubernetes/clusternet/clusternet.go b/metropolis/node/kubernetes/clusternet/clusternet.go
index 28e268d..30c15a1 100644
--- a/metropolis/node/kubernetes/clusternet/clusternet.go
+++ b/metropolis/node/kubernetes/clusternet/clusternet.go
@@ -41,9 +41,9 @@
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
+ "source.monogon.dev/go/logging"
oclusternet "source.monogon.dev/metropolis/node/core/clusternet"
"source.monogon.dev/osbase/event"
- "source.monogon.dev/osbase/logtree"
"source.monogon.dev/osbase/supervisor"
)
@@ -52,7 +52,7 @@
Kubernetes kubernetes.Interface
Prefixes event.Value[*oclusternet.Prefixes]
- logger logtree.LeveledLogger
+ logger logging.Leveled
}
// ensureNode is called any time the node that this Service is running on gets
diff --git a/metropolis/node/kubernetes/csi.go b/metropolis/node/kubernetes/csi.go
index dfbd48c..3236bba 100644
--- a/metropolis/node/kubernetes/csi.go
+++ b/metropolis/node/kubernetes/csi.go
@@ -33,9 +33,9 @@
"google.golang.org/protobuf/types/known/wrapperspb"
pluginregistration "k8s.io/kubelet/pkg/apis/pluginregistration/v1"
+ "source.monogon.dev/go/logging"
"source.monogon.dev/metropolis/node/core/localstorage"
"source.monogon.dev/osbase/fsquota"
- "source.monogon.dev/osbase/logtree"
"source.monogon.dev/osbase/loop"
"source.monogon.dev/osbase/supervisor"
)
@@ -51,7 +51,7 @@
KubeletDirectory *localstorage.DataKubernetesKubeletDirectory
VolumesDirectory *localstorage.DataVolumesDirectory
- logger logtree.LeveledLogger
+ logger logging.Leveled
}
func (s *csiPluginServer) Run(ctx context.Context) error {
diff --git a/metropolis/node/kubernetes/plugins/kvmdevice/BUILD.bazel b/metropolis/node/kubernetes/plugins/kvmdevice/BUILD.bazel
index d6afb23..afb236a 100644
--- a/metropolis/node/kubernetes/plugins/kvmdevice/BUILD.bazel
+++ b/metropolis/node/kubernetes/plugins/kvmdevice/BUILD.bazel
@@ -6,8 +6,8 @@
importpath = "source.monogon.dev/metropolis/node/kubernetes/plugins/kvmdevice",
visibility = ["//visibility:public"],
deps = [
+ "//go/logging",
"//metropolis/node/core/localstorage",
- "//osbase/logtree",
"//osbase/supervisor",
"@io_k8s_api//core/v1:core",
"@io_k8s_kubelet//pkg/apis/deviceplugin/v1beta1",
diff --git a/metropolis/node/kubernetes/plugins/kvmdevice/kvmdevice.go b/metropolis/node/kubernetes/plugins/kvmdevice/kvmdevice.go
index f285c47..4d3f4a1 100644
--- a/metropolis/node/kubernetes/plugins/kvmdevice/kvmdevice.go
+++ b/metropolis/node/kubernetes/plugins/kvmdevice/kvmdevice.go
@@ -39,8 +39,8 @@
deviceplugin "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
pluginregistration "k8s.io/kubelet/pkg/apis/pluginregistration/v1"
+ "source.monogon.dev/go/logging"
"source.monogon.dev/metropolis/node/core/localstorage"
- "source.monogon.dev/osbase/logtree"
"source.monogon.dev/osbase/supervisor"
)
@@ -51,7 +51,7 @@
*deviceplugin.UnimplementedDevicePluginServer
KubeletDirectory *localstorage.DataKubernetesKubeletDirectory
- logger logtree.LeveledLogger
+ logger logging.Leveled
}
func (k *Plugin) GetInfo(context.Context, *pluginregistration.InfoRequest) (*pluginregistration.PluginInfo, error) {
diff --git a/metropolis/node/kubernetes/provisioner.go b/metropolis/node/kubernetes/provisioner.go
index 46fd908..aacb949 100644
--- a/metropolis/node/kubernetes/provisioner.go
+++ b/metropolis/node/kubernetes/provisioner.go
@@ -39,9 +39,9 @@
ref "k8s.io/client-go/tools/reference"
"k8s.io/client-go/util/workqueue"
+ "source.monogon.dev/go/logging"
"source.monogon.dev/metropolis/node/core/localstorage"
"source.monogon.dev/osbase/fsquota"
- "source.monogon.dev/osbase/logtree"
"source.monogon.dev/osbase/supervisor"
)
@@ -72,7 +72,7 @@
pvcInformer coreinformers.PersistentVolumeClaimInformer
pvInformer coreinformers.PersistentVolumeInformer
storageClassInformer storageinformers.StorageClassInformer
- logger logtree.LeveledLogger
+ logger logging.Leveled
}
// runCSIProvisioner runs the main provisioning machinery. It consists of a