From bedbe0047db586c535272ca2ffb3f8af22439e84 Mon Sep 17 00:00:00 2001 From: Ronen Schaffer Date: Tue, 14 Nov 2023 14:47:05 +0200 Subject: [PATCH 1/3] Parse command line flags --- main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/main.go b/main.go index 84827f43c..4b2ce4288 100644 --- a/main.go +++ b/main.go @@ -81,6 +81,7 @@ func main() { flag.StringVar(&configMapName, "config", "codeflare-operator-config", "The name of the ConfigMap to load the operator configuration from. "+ "If it does not exist, the operator will create and initialise it.") + flag.Parse() zapOptions := zap.Options{ Development: true, From edb9ffe61c145c4af0a04a1d0b218a90920c0d3c Mon Sep 17 00:00:00 2001 From: Ronen Schaffer Date: Tue, 14 Nov 2023 14:48:19 +0200 Subject: [PATCH 2/3] Update github.com/golang/glog v1.1.0 -> v1.1.2 This fixes vmodule panic ref: https://groups.google.com/g/golang-nuts/c/Atlr8uAjn6U/m/iId17Td5BQAJ --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 98011af73..e60aaafea 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.4.3 // indirect - github.com/golang/glog v1.1.0 // indirect + github.com/golang/glog v1.1.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/cel-go v0.12.6 // indirect diff --git a/go.sum b/go.sum index 423343034..54fcdff52 100644 --- a/go.sum +++ b/go.sum @@ -159,8 +159,8 @@ github.com/golang-jwt/jwt/v4 v4.4.3 h1:Hxl6lhQFj4AnOX6MLrsCb/+7tCj7DxP7VA+2rDIq5 github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= +github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= +github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= From 175e07d81c7900c5429b1fcc412deba726f70776 Mon Sep 17 00:00:00 2001 From: Ronen Schaffer Date: Wed, 15 Nov 2023 09:33:45 +0200 Subject: [PATCH 3/3] Parse Zap flags --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 4b2ce4288..bf7f74545 100644 --- a/main.go +++ b/main.go @@ -81,13 +81,13 @@ func main() { flag.StringVar(&configMapName, "config", "codeflare-operator-config", "The name of the ConfigMap to load the operator configuration from. "+ "If it does not exist, the operator will create and initialise it.") - flag.Parse() zapOptions := zap.Options{ Development: true, TimeEncoder: zapcore.TimeEncoderOfLayout(time.RFC3339), } zapOptions.BindFlags(flag.CommandLine) + flag.Parse() ctrl.SetLogger(zap.New(zap.UseFlagOptions(&zapOptions))) setupLog.Info("Build info",