mirror of
https://github.com/edgelesssys/constellation.git
synced 2025-09-21 13:34:48 -04:00
deps: convert zap to slog (#2825)
This commit is contained in:
miampf
GitHub
parent
3765cb0762
commit
54cce77bab
182 changed files with 1474 additions and 1509 deletions
|
|
@ -44,7 +44,6 @@ go_library(
|
|||
"//internal/versions/components",
|
||||
"@com_github_spf13_afero//:afero",
|
||||
"@io_k8s_kubernetes//cmd/kubeadm/app/apis/kubeadm/v1beta3",
|
||||
"@org_uber_go_zap//:zap",
|
||||
],
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,13 @@ package main
|
|||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"os"
|
||||
"strconv"
|
||||
|
||||
"github.com/spf13/afero"
|
||||
"go.uber.org/zap"
|
||||
|
||||
"github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes"
|
||||
"github.com/edgelesssys/constellation/v2/bootstrapper/internal/kubernetes/k8sapi"
|
||||
|
|
@ -45,13 +46,12 @@ func main() {
|
|||
gRPCDebug := flag.Bool("debug", false, "Enable gRPC debug logging")
|
||||
verbosity := flag.Int("v", 0, logger.CmdLineVerbosityDescription)
|
||||
flag.Parse()
|
||||
log := logger.New(logger.JSONLog, logger.VerbosityFromInt(*verbosity)).Named("bootstrapper")
|
||||
defer log.Sync()
|
||||
log := logger.NewJSONLogger(logger.VerbosityFromInt(*verbosity)).WithGroup("bootstrapper")
|
||||
|
||||
if *gRPCDebug {
|
||||
log.Named("gRPC").ReplaceGRPCLogger()
|
||||
logger.ReplaceGRPCLogger(log.WithGroup("gRPC"))
|
||||
} else {
|
||||
log.Named("gRPC").WithIncreasedLevel(zap.WarnLevel).ReplaceGRPCLogger()
|
||||
logger.ReplaceGRPCLogger(slog.New(logger.NewLevelHandler(slog.LevelWarn, log.Handler())).WithGroup("gRPC"))
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
|
|
@ -66,18 +66,21 @@ func main() {
|
|||
|
||||
attestVariant, err := variant.FromString(os.Getenv(constants.AttestationVariant))
|
||||
if err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to parse attestation variant")
|
||||
log.With(slog.Any("error", err)).Error("Failed to parse attestation variant")
|
||||
os.Exit(1)
|
||||
}
|
||||
issuer, err := choose.Issuer(attestVariant, log)
|
||||
if err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to select issuer")
|
||||
log.With(slog.Any("error", err)).Error("Failed to select issuer")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
switch cloudprovider.FromString(os.Getenv(constellationCSP)) {
|
||||
case cloudprovider.AWS:
|
||||
metadata, err := awscloud.New(ctx)
|
||||
if err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to set up AWS metadata API")
|
||||
log.With(slog.Any("error", err)).Error("Failed to set up AWS metadata API")
|
||||
os.Exit(1)
|
||||
}
|
||||
metadataAPI = metadata
|
||||
|
||||
|
|
@ -91,7 +94,8 @@ func main() {
|
|||
case cloudprovider.GCP:
|
||||
metadata, err := gcpcloud.New(ctx)
|
||||
if err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to create GCP metadata client")
|
||||
log.With(slog.Any("error", err)).Error("Failed to create GCP metadata client")
|
||||
os.Exit(1)
|
||||
}
|
||||
defer metadata.Close()
|
||||
|
||||
|
|
@ -106,11 +110,13 @@ func main() {
|
|||
case cloudprovider.Azure:
|
||||
metadata, err := azurecloud.New(ctx)
|
||||
if err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to create Azure metadata client")
|
||||
log.With(slog.Any("error", err)).Error("Failed to create Azure metadata client")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
if err := metadata.PrepareControlPlaneNode(ctx, log); err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to prepare Azure control plane node")
|
||||
log.With(slog.Any("error", err)).Error("Failed to prepare Azure control plane node")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
metadataAPI = metadata
|
||||
|
|
@ -138,13 +144,14 @@ func main() {
|
|||
return tdx.Open()
|
||||
}
|
||||
default:
|
||||
log.Fatalf("Unsupported attestation variant: %s", attestVariant)
|
||||
log.Error(fmt.Sprintf("Unsupported attestation variant: %s", attestVariant))
|
||||
}
|
||||
fs = afero.NewOsFs()
|
||||
case cloudprovider.OpenStack:
|
||||
metadata, err := openstackcloud.New(ctx)
|
||||
if err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to create OpenStack metadata client")
|
||||
log.With(slog.Any("error", err)).Error("Failed to create OpenStack metadata client")
|
||||
os.Exit(1)
|
||||
}
|
||||
clusterInitJoiner = kubernetes.New(
|
||||
"openstack", k8sapi.NewKubernetesUtil(), &k8sapi.KubdeadmConfiguration{}, kubectl.NewUninitialized(),
|
||||
|
|
|
|||
|
|
@ -8,7 +8,10 @@ package main
|
|||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net"
|
||||
"os"
|
||||
|
||||
"github.com/edgelesssys/constellation/v2/bootstrapper/internal/clean"
|
||||
"github.com/edgelesssys/constellation/v2/bootstrapper/internal/diskencryption"
|
||||
|
|
@ -21,31 +24,31 @@ import (
|
|||
"github.com/edgelesssys/constellation/v2/internal/constants"
|
||||
"github.com/edgelesssys/constellation/v2/internal/file"
|
||||
"github.com/edgelesssys/constellation/v2/internal/grpc/dialer"
|
||||
"github.com/edgelesssys/constellation/v2/internal/logger"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
func run(issuer atls.Issuer, openDevice vtpm.TPMOpenFunc, fileHandler file.Handler,
|
||||
kube clusterInitJoiner, metadata metadataAPI,
|
||||
bindIP, bindPort string, log *logger.Logger,
|
||||
bindIP, bindPort string, log *slog.Logger,
|
||||
) {
|
||||
log.With(zap.String("version", constants.BinaryVersion().String())).Infof("Starting bootstrapper")
|
||||
log.With(slog.String("version", constants.BinaryVersion().String())).Info("Starting bootstrapper")
|
||||
|
||||
uuid, err := getDiskUUID()
|
||||
if err != nil {
|
||||
log.With(zap.Error(err)).Errorf("Failed to get disk UUID")
|
||||
log.With(slog.Any("error", err)).Error("Failed to get disk UUID")
|
||||
} else {
|
||||
log.Infof("Disk UUID: %s", uuid)
|
||||
log.Info(fmt.Sprintf("Disk UUID: %s", uuid))
|
||||
}
|
||||
|
||||
nodeBootstrapped, err := initialize.IsNodeBootstrapped(openDevice)
|
||||
if err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to check if node was previously bootstrapped")
|
||||
log.With(slog.Any("error", err)).Error("Failed to check if node was previously bootstrapped")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
if nodeBootstrapped {
|
||||
if err := kube.StartKubelet(); err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to restart kubelet")
|
||||
log.With(slog.Any("error", err)).Error("Failed to restart kubelet")
|
||||
os.Exit(1)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
|
@ -53,7 +56,8 @@ func run(issuer atls.Issuer, openDevice vtpm.TPMOpenFunc, fileHandler file.Handl
|
|||
nodeLock := nodelock.New(openDevice)
|
||||
initServer, err := initserver.New(context.Background(), nodeLock, kube, issuer, fileHandler, metadata, log)
|
||||
if err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to create init server")
|
||||
log.With(slog.Any("error", err)).Error("Failed to create init server")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
dialer := dialer.New(issuer, nil, &net.Dialer{})
|
||||
|
|
@ -66,10 +70,11 @@ func run(issuer atls.Issuer, openDevice vtpm.TPMOpenFunc, fileHandler file.Handl
|
|||
joinClient.Start(cleaner)
|
||||
|
||||
if err := initServer.Serve(bindIP, bindPort, cleaner); err != nil {
|
||||
log.With(zap.Error(err)).Fatalf("Failed to serve init server")
|
||||
log.With(slog.Any("error", err)).Error("Failed to serve init server")
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
log.Infof("bootstrapper done")
|
||||
log.Info("bootstrapper done")
|
||||
}
|
||||
|
||||
func getDiskUUID() (string, error) {
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ package main
|
|||
|
||||
import (
|
||||
"context"
|
||||
"log/slog"
|
||||
|
||||
"github.com/edgelesssys/constellation/v2/internal/cloud/metadata"
|
||||
"github.com/edgelesssys/constellation/v2/internal/logger"
|
||||
"github.com/edgelesssys/constellation/v2/internal/role"
|
||||
"github.com/edgelesssys/constellation/v2/internal/versions/components"
|
||||
kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3"
|
||||
|
|
@ -22,13 +22,13 @@ type clusterFake struct{}
|
|||
// InitCluster fakes bootstrapping a new cluster with the current node being the master, returning the arguments required to join the cluster.
|
||||
func (c *clusterFake) InitCluster(
|
||||
context.Context, string, string,
|
||||
bool, components.Components, []string, string, *logger.Logger,
|
||||
bool, components.Components, []string, string, *slog.Logger,
|
||||
) ([]byte, error) {
|
||||
return []byte{}, nil
|
||||
}
|
||||
|
||||
// JoinCluster will fake joining the current node to an existing cluster.
|
||||
func (c *clusterFake) JoinCluster(context.Context, *kubeadm.BootstrapTokenDiscovery, role.Role, components.Components, *logger.Logger) error {
|
||||
func (c *clusterFake) JoinCluster(context.Context, *kubeadm.BootstrapTokenDiscovery, role.Role, components.Components, *slog.Logger) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue