core: replace zap with logtree
Test Plan: Effective refactor. Only tests that could be affected are e2e tests that should continue to run, because we still are logging into the qemu console, even if differently.
X-Origin-Diff: phab/D642
GitOrigin-RevId: 0f12b1bc985af08a3cc269569273184321763e4b
diff --git a/core/internal/kubernetes/pki/BUILD.bazel b/core/internal/kubernetes/pki/BUILD.bazel
index e188bfa..ab45382 100644
--- a/core/internal/kubernetes/pki/BUILD.bazel
+++ b/core/internal/kubernetes/pki/BUILD.bazel
@@ -11,9 +11,9 @@
visibility = ["//core:__subpackages__"],
deps = [
"//core/internal/common:go_default_library",
+ "//core/pkg/logtree:go_default_library",
"@io_etcd_go_etcd//clientv3:go_default_library",
"@io_k8s_client_go//tools/clientcmd:go_default_library",
"@io_k8s_client_go//tools/clientcmd/api:go_default_library",
- "@org_uber_go_zap//:go_default_library",
],
)
diff --git a/core/internal/kubernetes/pki/kubernetes.go b/core/internal/kubernetes/pki/kubernetes.go
index 0de8f6d..9931f03 100644
--- a/core/internal/kubernetes/pki/kubernetes.go
+++ b/core/internal/kubernetes/pki/kubernetes.go
@@ -25,7 +25,7 @@
"fmt"
"net"
- "go.uber.org/zap"
+ "git.monogon.dev/source/nexantic.git/core/pkg/logtree"
"go.etcd.io/etcd/clientv3"
"k8s.io/client-go/tools/clientcmd"
@@ -77,12 +77,12 @@
// KubernetesPKI manages all PKI resources required to run Kubernetes on Smalltown. It contains all static certificates,
// which can be retrieved, or be used to generate Kubeconfigs from.
type KubernetesPKI struct {
- logger *zap.Logger
+ logger logtree.LeveledLogger
KV clientv3.KV
Certificates map[KubeCertificateName]*Certificate
}
-func NewKubernetes(l *zap.Logger, kv clientv3.KV) *KubernetesPKI {
+func NewKubernetes(l logtree.LeveledLogger, kv clientv3.KV) *KubernetesPKI {
pki := KubernetesPKI{
logger: l,
KV: kv,
@@ -121,7 +121,7 @@
// EnsureAll ensures that all static certificates (and the serviceaccount key) are present on etcd.
func (k *KubernetesPKI) EnsureAll(ctx context.Context) error {
for n, v := range k.Certificates {
- k.logger.Info("ensureing certificate existence", zap.String("name", string(n)))
+ k.logger.Infof("Ensuring %s exists", string(n))
_, _, err := v.Ensure(ctx, k.KV)
if err != nil {
return fmt.Errorf("could not ensure certificate %q exists: %w", n, err)