Skip to content

Commit 800f1b2

Browse files
davidcollomdavidcollom
committed
go.mod fixes and logger fix for controller
1 parent 8416602 commit 800f1b2

File tree

4 files changed

+31
-6
lines changed

4 files changed

+31
-6
lines changed

‎cmd/app/app.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ func NewCommand(ctx context.Context) *cobra.Command {
4747
}
4848

4949
log := newLogger(logLevel).WithField("component", "controller")
50+
ctrl.SetLogger(logrusr.New(log.WithField("controller", "manager").Logger))
5051

5152
defaultTestAllInfoMsg := fmt.Sprintf(`only containers with the annotation "%s/${my-container}=true" will be parsed`, api.EnableAnnotationKey)
5253
if opts.DefaultTestAll {
@@ -61,7 +62,6 @@ func NewCommand(ctx context.Context) *cobra.Command {
6162
log.Infof("flag --test-all-containers=%t %s", opts.DefaultTestAll, defaultTestAllInfoMsg)
6263

6364
mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
64-
Logger: logrusr.New(log.WithField("controller", "manager").Logger),
6565
LeaderElection: false,
6666
Metrics: server.Options{
6767
BindAddress: opts.MetricsServingAddress,

‎cmd/app/helpers.go‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package app
2+
3+
import (
4+
"os"
5+
6+
"github.com/sirupsen/logrus"
7+
)
8+
9+
func newLogger(logLevel logrus.Level) *logrus.Entry {
10+
nlog := logrus.New()
11+
nlog.SetOutput(os.Stdout)
12+
nlog.SetLevel(logLevel)
13+
log := logrus.NewEntry(nlog)
14+
return log
15+
}

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ require (
2828
)
2929

3030
require (
31-
github.com/aws/aws-sdk-go-v2/config v1.29.11
32-
github.com/aws/aws-sdk-go-v2/credentials v1.17.64
31+
github.com/aws/aws-sdk-go-v2/config v1.29.12
32+
github.com/aws/aws-sdk-go-v2/credentials v1.17.65
3333
github.com/aws/aws-sdk-go-v2/service/ecr v1.43.0
3434
github.com/bombsimon/logrusr/v4 v4.1.0
3535
github.com/go-chi/transport v0.5.0
@@ -57,7 +57,7 @@ require (
5757
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
5858
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
5959
github.com/aws/aws-sdk-go-v2/service/sso v1.25.2 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.2 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.0 // indirect
6161
github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect
6262
github.com/aws/smithy-go v1.22.3 // indirect
6363
github.com/beorn7/perks v1.0.1 // indirect
@@ -71,7 +71,7 @@ require (
7171
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
7272
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
7373
github.com/fsnotify/fsnotify v1.8.0 // indirect
74-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
74+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
7575
github.com/go-errors/errors v1.5.1 // indirect
7676
github.com/go-logr/logr v1.4.2 // indirect
7777
github.com/go-openapi/jsonpointer v0.21.1 // indirect
@@ -112,7 +112,7 @@ require (
112112
github.com/x448/float16 v0.8.4 // indirect
113113
github.com/xlab/treeprint v1.2.0 // indirect
114114
golang.org/x/crypto v0.36.0 // indirect
115-
golang.org/x/net v0.37.0 // indirect
115+
golang.org/x/net v0.38.0 // indirect
116116
golang.org/x/sync v0.12.0 // indirect
117117
golang.org/x/sys v0.31.0 // indirect
118118
golang.org/x/term v0.30.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,12 @@ github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38y
2323
github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg=
2424
github.com/aws/aws-sdk-go-v2/config v1.29.11 h1:/hkJIxaQzFQy0ebFjG5NHmAcLCrvNSuXeHnxLfeCz1Y=
2525
github.com/aws/aws-sdk-go-v2/config v1.29.11/go.mod h1:OFPRZVQxC4mKqy2Go6Cse/m9NOStAo6YaMvAcTMUROg=
26+
github.com/aws/aws-sdk-go-v2/config v1.29.12 h1:Y/2a+jLPrPbHpFkpAAYkVEtJmxORlXoo5k2g1fa2sUo=
27+
github.com/aws/aws-sdk-go-v2/config v1.29.12/go.mod h1:xse1YTjmORlb/6fhkWi8qJh3cvZi4JoVNhc+NbJt4kI=
2628
github.com/aws/aws-sdk-go-v2/credentials v1.17.64 h1:NH4RAQJEXBDQDUudTqMNHdyyEVa5CvMn0tQicqv48jo=
2729
github.com/aws/aws-sdk-go-v2/credentials v1.17.64/go.mod h1:tUoJfj79lzEcalHDbyNkpnZZTRg/2ayYOK/iYnRfPbo=
30+
github.com/aws/aws-sdk-go-v2/credentials v1.17.65 h1:q+nV2yYegofO/SUXruT+pn4KxkxmaQ++1B/QedcKBFM=
31+
github.com/aws/aws-sdk-go-v2/credentials v1.17.65/go.mod h1:4zyjAuGOdikpNYiSGpsGz8hLGmUzlY8pc8r9QQ/RXYQ=
2832
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw=
2933
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M=
3034
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q=
@@ -43,6 +47,8 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.25.2 h1:pdgODsAhGo4dvzC3JAG5Ce0PX8kW
4347
github.com/aws/aws-sdk-go-v2/service/sso v1.25.2/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI=
4448
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.2 h1:wK8O+j2dOolmpNVY1EWIbLgxrGCHJKVPm08Hv/u80M8=
4549
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.2/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs=
50+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.0 h1:90uX0veLKcdHVfvxhkWUQSCi5VabtwMLFutYiRke4oo=
51+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.0/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs=
4652
github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 h1:PZV5W8yk4OtH1JAuhV2PXwwO9v5G5Aoj+eMCn4T+1Kc=
4753
github.com/aws/aws-sdk-go-v2/service/sts v1.33.17/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
4854
github.com/aws/smithy-go v1.22.3 h1:Z//5NuZCSW6R4PhQ93hShNbyBbn8BWCmCVCt+Q8Io5k=
@@ -82,6 +88,8 @@ github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/
8288
github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
8389
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
8490
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
91+
github.com/fxamacker/cbor/v2 v2.8.0 h1:fFtUGXUzXPHTIUdne5+zzMPTfffl3RD5qYnkY40vtxU=
92+
github.com/fxamacker/cbor/v2 v2.8.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
8593
github.com/go-chi/transport v0.5.0 h1:xpnYcIOpBRrduJD68gX9YxkJouRGIE1y+rK5yGYnMXE=
8694
github.com/go-chi/transport v0.5.0/go.mod h1:uoCleTaQiFtoatEiiqcXFZ5OxIp6s1DfGeVsCVbalT4=
8795
github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
@@ -272,6 +280,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
272280
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
273281
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
274282
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
283+
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
284+
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
275285
golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
276286
golang.org/x/oauth2 v0.28.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
277287
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

0 commit comments

Comments
 (0)