Skip to content

Commit a48b3e4

Browse files
maelvlswallrj
andcommitted
venconn: forgot to switch "log" to "logs.Log" after #558 got merged
Co-authored-by: Richard Wall <[email protected]>
1 parent 9b0e619 commit a48b3e4

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

pkg/agent/run.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"fmt"
88
"io"
99
"io/ioutil"
10-
"log"
1110
"net/http"
1211
_ "net/http/pprof"
1312
"net/url"
@@ -302,7 +301,7 @@ func getConfiguration() (Config, client.Client) {
302301
if venConnMode && InstallNS == "" {
303302
InstallNS, err = getInClusterNamespace()
304303
if err != nil {
305-
log.Fatalf("could not guess which namespace the agent is running in: %s", err)
304+
logs.Log.Fatalf("could not guess which namespace the agent is running in: %s", err)
306305
}
307306
}
308307
if venConnMode && VenConnNS == "" {
@@ -323,15 +322,15 @@ func getConfiguration() (Config, client.Client) {
323322
// the --venafi-connection mode of authentication doesn't need any
324323
// secrets (or any other information for that matter) to be loaded from
325324
// disk (using --credentials-path). Everything is passed as flags.
326-
log.Println("Venafi Connection mode was specified, using Venafi Connection authentication.")
325+
logs.Log.Println("Venafi Connection mode was specified, using Venafi Connection authentication.")
327326

328327
// The venafi-cloud.upload_path was initially meant to let users
329328
// configure HTTP proxies, but it has never been used since HTTP proxies
330329
// don't rewrite paths. Thus, we've disabled the ability to change this
331330
// value with the new --venafi-connection flag, and this field is simply
332331
// ignored.
333332
if config.VenafiCloud != nil && config.VenafiCloud.UploadPath != "" {
334-
log.Printf(`ignoring venafi-cloud.upload_path. In Venafi Connection mode, this field is not needed.`)
333+
logs.Log.Printf(`ignoring venafi-cloud.upload_path. In Venafi Connection mode, this field is not needed.`)
335334
}
336335

337336
// Regarding venafi-cloud.uploader_id, we found that it doesn't do
@@ -340,12 +339,12 @@ func getConfiguration() (Config, client.Client) {
340339
// set in the config file, and set it to an arbitrary value in the
341340
// client since it doesn't matter.
342341
if config.VenafiCloud.UploaderID != "" {
343-
log.Printf(`ignoring venafi-cloud.uploader_id. In Venafi Connection mode, this field is not needed.`)
342+
logs.Log.Printf(`ignoring venafi-cloud.uploader_id. In Venafi Connection mode, this field is not needed.`)
344343
}
345344

346345
cfg, err := loadRESTConfig("")
347346
if err != nil {
348-
log.Fatalf("failed to load kubeconfig: %v", err)
347+
logs.Log.Fatalf("failed to load kubeconfig: %v", err)
349348
}
350349

351350
preflightClient, err = client.NewVenConnClient(cfg, agentMetadata, InstallNS, VenConnName, VenConnNS, nil)

0 commit comments

Comments
 (0)