diff --git a/cmd/cluster-provisioner/main.go b/cmd/cluster-provisioner/main.go index c37c6d044..868cc722d 100644 --- a/cmd/cluster-provisioner/main.go +++ b/cmd/cluster-provisioner/main.go @@ -12,7 +12,7 @@ import ( pv "github.com/confidential-containers/cloud-api-adaptor/test/provisioner" ) -// export DEBUG="true" +// export LOG_LEVEL="trace|debug" // export CLOUD_PROVIDER="ibmcloud" // export TEST_E2E_PROVISION_FILE="/root/provision_ibmcloud.properties" // export TEST_E2E_PODVM_IMAGE="/root/e2e-test-image-amd64-20230308.qcow2 diff --git a/test/provisioner/provision_ibmcloud.go b/test/provisioner/provision_ibmcloud.go index 9e9af6a43..3c808e96a 100644 --- a/test/provisioner/provision_ibmcloud.go +++ b/test/provisioner/provision_ibmcloud.go @@ -299,7 +299,7 @@ func NewIBMCloudProvisioner(properties map[string]string) (CloudProvisioner, err // IBMCloudProvisioner func (p *IBMCloudProvisioner) CreateCluster(ctx context.Context, cfg *envconf.Config) error { - log.Info("CreateCluster()") + log.Trace("CreateCluster()") clusterInfo := containerv2.ClusterCreateRequest{ DisablePublicServiceEndpoint: true, @@ -333,7 +333,7 @@ func (p *IBMCloudProvisioner) CreateCluster(ctx context.Context, cfg *envconf.Co for i := 0; i <= waitMinutes; i++ { ready, err := isClusterReady(IBMCloudProps.ClusterName) if err != nil { - log.Infof("Err %s happened when retrieve cluster, try again...\n", err) + log.Warnf("Err %s happened when retrieve cluster, try again...\n", err) continue } if ready { @@ -353,12 +353,12 @@ func (p *IBMCloudProvisioner) CreateCluster(ctx context.Context, cfg *envconf.Co } func (p *IBMCloudProvisioner) CreateVPC(ctx context.Context, cfg *envconf.Config) error { - log.Info("CreateVPC()") + log.Trace("CreateVPC()") return createVpcImpl() } func (p *IBMCloudProvisioner) DeleteCluster(ctx context.Context, cfg *envconf.Config) error { - log.Info("DeleteCluster()") + log.Trace("DeleteCluster()") target := containerv2.ClusterTargetHeader{} log.Infof("Deleting Cluster %s.\n", IBMCloudProps.ClusterName) @@ -373,7 +373,7 @@ func (p *IBMCloudProvisioner) DeleteCluster(ctx context.Context, cfg *envconf.Co for i := 0; i <= waitMinutes; i++ { found, err := foundCluster(IBMCloudProps.ClusterName) if err != nil { - log.Infof("Err %s happened when retrieve cluster, try again...\n", err) + log.Warnf("Err %s happened when retrieve cluster, try again...\n", err) continue } if !found { @@ -392,12 +392,12 @@ func (p *IBMCloudProvisioner) DeleteCluster(ctx context.Context, cfg *envconf.Co } func (p *IBMCloudProvisioner) DeleteVPC(ctx context.Context, cfg *envconf.Config) error { - log.Info("DeleteVPC()") + log.Trace("DeleteVPC()") return deleteVpcImpl() } func (p *IBMCloudProvisioner) UploadPodvm(imagePath string, ctx context.Context, cfg *envconf.Config) error { - log.Info("UploadPodvm()") + log.Trace("UploadPodvm()") filePath, err := filepath.Abs(imagePath) if err != nil { diff --git a/test/provisioner/provision_ibmcloud_initializer.go b/test/provisioner/provision_ibmcloud_initializer.go index 775cc66a6..c029e71d8 100644 --- a/test/provisioner/provision_ibmcloud_initializer.go +++ b/test/provisioner/provision_ibmcloud_initializer.go @@ -51,6 +51,32 @@ type IBMCloudProperties struct { var IBMCloudProps = &IBMCloudProperties{} +func init() { + initLogger() +} + +func initLogger() { + level := os.Getenv("LOG_LEVEL") + switch level { + case "trace": + log.SetLevel(log.TraceLevel) + case "debug": + log.SetLevel(log.DebugLevel) + case "info": + log.SetLevel(log.InfoLevel) + case "warn": + log.SetLevel(log.WarnLevel) + case "error": + log.SetLevel(log.ErrorLevel) + case "fatal": + log.SetLevel(log.FatalLevel) + case "panic": + log.SetLevel(log.PanicLevel) + default: + log.SetLevel(log.InfoLevel) + } +} + func initProperties(properties map[string]string) error { IBMCloudProps = &IBMCloudProperties{ ApiKey: properties["APIKEY"], @@ -112,7 +138,7 @@ func initProperties(properties map[string]string) error { IBMCloudProps.IsSelfManaged = true } - log.Infof("%+v", IBMCloudProps) + log.Debugf("%+v", IBMCloudProps) if len(IBMCloudProps.ApiKey) <= 0 { return errors.New("APIKEY was not set.") @@ -165,7 +191,7 @@ func initProperties(properties map[string]string) error { } func initVpcV1() error { - log.Info("initVpcV1()") + log.Trace("initVpcV1()") if IBMCloudProps.VPC != nil { return nil @@ -187,7 +213,7 @@ func initVpcV1() error { } func initClustersAPI() error { - log.Info("initClustersAPI()") + log.Trace("initClustersAPI()") cfg := &bx.Config{ BluemixAPIKey: IBMCloudProps.ApiKey,