Skip to content

Commit 663315e

Browse files
fixed the logger issue
1 parent 7b3f80d commit 663315e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package main
1818

1919
import (
2020
"os"
21+
2122
elbv2deploy "sigs.k8s.io/aws-load-balancer-controller/pkg/deploy/elbv2"
2223

2324
"github.com/go-logr/logr"
@@ -76,7 +77,7 @@ func main() {
7677
}
7778
ctrl.SetLogger(getLoggerWithLogLevel(controllerCFG.LogLevel))
7879

79-
cloud, err := aws.NewCloud(controllerCFG.AWSConfig, metrics.Registry)
80+
cloud, err := aws.NewCloud(controllerCFG.AWSConfig, metrics.Registry, ctrl.Log)
8081
if err != nil {
8182
setupLog.Error(err, "unable to initialize AWS cloud")
8283
os.Exit(1)

pkg/aws/cloud.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ type Cloud interface {
5151
}
5252

5353
// NewCloud constructs new Cloud implementation.
54-
func NewCloud(cfg CloudConfig, metricsRegisterer prometheus.Registerer) (Cloud, error) {
54+
func NewCloud(cfg CloudConfig, metricsRegisterer prometheus.Registerer, logger logr.Logger) (Cloud, error) {
5555
hasIPv4 := true
5656
addrs, err := net.InterfaceAddrs()
5757
if err == nil {
@@ -114,7 +114,7 @@ func NewCloud(cfg CloudConfig, metricsRegisterer prometheus.Registerer) (Cloud,
114114

115115
ec2Service := services.NewEC2(sess)
116116

117-
vpcID, err := getVpcID(cfg, ec2Service, metadata)
117+
vpcID, err := getVpcID(cfg, ec2Service, metadata, logger)
118118
if err != nil {
119119
return nil, errors.Wrap(err, "failed to get VPC ID")
120120
}
@@ -131,11 +131,10 @@ func NewCloud(cfg CloudConfig, metricsRegisterer prometheus.Registerer) (Cloud,
131131
}, nil
132132
}
133133

134-
func getVpcID(cfg CloudConfig, ec2Service services.EC2, metadata services.EC2Metadata) (string, error) {
134+
func getVpcID(cfg CloudConfig, ec2Service services.EC2, metadata services.EC2Metadata, logger logr.Logger) (string, error) {
135135

136-
logger := logr.Logger{}
137136
if cfg.VpcID != "" {
138-
logger.V(1).Info("vpcid is specified using flag --aws-vpc-id, controller will use the value %s", cfg.VpcID)
137+
logger.V(1).Info("vpcid is specified using flag --aws-vpc-id, controller will use the value", "vpc: ", cfg.VpcID)
139138
return cfg.VpcID, nil
140139
}
141140

0 commit comments

Comments
 (0)