Skip to content

Commit

Permalink
[cherry-pick] Use kglog helper (#967)
Browse files Browse the repository at this point in the history 
Signed-off-by: Tamal Saha <tamal@appscode.com>
  • Loading branch information
@1gtm
1gtm committed May 6, 2021
1 parent ff4a14a commit 6e078f0
Show file tree
Hide file tree
Showing 34 changed files with 2,058 additions and 124 deletions.
6 changes: 3 additions & 3 deletions cmd/stash-mongodb/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ import (
_ "stash.appscode.dev/apimachinery/client/clientset/versioned/fake"
"stash.appscode.dev/mongodb/pkg"

"gomodules.xyz/kglog"
_ "k8s.io/client-go/kubernetes/fake"
_ "k8s.io/client-go/plugin/pkg/client/auth"
"k8s.io/klog/v2"
"kmodules.xyz/client-go/logs"
)

func main() {
logs.InitLogs()
defer logs.FlushLogs()
kglog.InitLogs()
defer kglog.FlushLogs()

if len(os.Getenv("GOMAXPROCS")) == 0 {
runtime.GOMAXPROCS(runtime.NumCPU())
Expand Down
9 changes: 5 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@ require (
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.1.3
go.bytebuilders.dev/license-verifier/kubernetes v0.9.1
gomodules.xyz/kglog v0.0.1
gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209
gomodules.xyz/x v0.0.3
gomodules.xyz/x v0.0.4
k8s.io/api v0.21.0
k8s.io/apimachinery v0.21.0
k8s.io/client-go v0.21.0
k8s.io/klog/v2 v2.8.0
kmodules.xyz/client-go v0.0.0-20210504024435-1eb80721e9b8
kmodules.xyz/client-go v0.0.0-20210505231546-fa4fb8e1d04e
kmodules.xyz/custom-resources v0.0.0-20210504034124-54c54fcdb690
kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5
kubedb.dev/apimachinery v0.18.1-0.20210504170625-e725873d4e41
stash.appscode.dev/apimachinery v0.13.1-0.20210504142328-ae1654642a82
kubedb.dev/apimachinery v0.18.1-0.20210506003355-e982e5902ad2
stash.appscode.dev/apimachinery v0.13.1-0.20210505235659-974fc12c7593
)

replace go.mongodb.org/mongo-driver => github.com/appscode/mongo-go-driver v1.4.0-beta2.0.20210223075318-951c8933c59c
Expand Down
28 changes: 19 additions & 9 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,9 @@ github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/glog v0.0.0-20210429001901-424d2337a529 h1:2voWjNECnrZRbfwXxHB1/j8wa6xdKn85B5NzgVL/pTU=
github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
Expand Down Expand Up @@ -977,26 +978,34 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f h1:hTyhR4r+tj1Uq7/PpFxLTzbeA0LhMVp7bEYfhkzFjdY=
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f/go.mod h1:K3m7N+nBOlf91/tpv8REUGwsAgaKFwElQCuiLhm12AQ=
gomodules.xyz/homedir v0.0.0-20201104190528-bcd4d5d94b84 h1:RH11GBm37fGstaCcoFB5KtcUijofDS0yxcdkCS6vx/A=
gomodules.xyz/homedir v0.0.0-20201104190528-bcd4d5d94b84/go.mod h1:rNt5O0KsgdJjAD/UXuxhO2N3b5TegqEk1T8HG9eraH4=
gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k=
gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
gomodules.xyz/kglog v0.0.1 h1:uB5HcipJvTDR5OLi3XiLzyvGzZbmAh37LO4TZGeur6c=
gomodules.xyz/kglog v0.0.1/go.mod h1:+zsiQO9SrbeUeqI5fYEIl/96o5dNoWUM0J69BUMEmDc=
gomodules.xyz/password-generator v0.2.6/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
gomodules.xyz/pointer v0.0.0-20201105040656-991dd254b680/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo=
gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209 h1:7tRaHoF3a725gtWs/NKkRNK5sBMXUyopVIsJ4WvhcTI=
gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo=
gomodules.xyz/runtime v0.2.0 h1:fzoGf/lnQ2F/rakbCjNfrZZFiNQ8XVLrR5YrtuhrtkU=
gomodules.xyz/runtime v0.2.0/go.mod h1:/R/Dw906YIUHKJ5cfKUaJgJrojFjpRU+n0s3Wjn1tqs=
gomodules.xyz/sets v0.0.0-20200930152147-4f4543544799/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc=
gomodules.xyz/sets v0.0.0-20210218105342-2efe2fb519a2 h1:JhyydLTz2aE09lMNheZHt6FHa9kJK1jWJuXe0vDM430=
gomodules.xyz/sets v0.0.0-20210218105342-2efe2fb519a2/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc=
gomodules.xyz/stow v0.2.4/go.mod h1:aAgUEHyZ+4nKznyVupMMkP0JX9MXW1ZRrbRGaclp3E0=
gomodules.xyz/version v0.1.0 h1:inGItCg/egI0jPMeIE0SQkiDIJaodOMoCrxYqasQLR0=
gomodules.xyz/version v0.1.0/go.mod h1:Y8xuV02mL/45psyPKG3NCVOwvAOy6T5Kx0l3rCjKSjU=
gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545 h1:iiD24jN1H8PzliVe1igIzYsx8+VmbXG12y9UUSupUJU=
gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545/go.mod h1:g/epKzZQuCqgvhzhaoG4cSBNGHqnOrhFR4Q7szDJ1JM=
gomodules.xyz/x v0.0.0-20201105065653-91c568df6331/go.mod h1:Q5P/WKpi2XymJJ4mBhUlBVsCzoL167c78CxyIind/pA=
gomodules.xyz/x v0.0.2/go.mod h1:E7ulagfan4tGmqGE07MD0J8o3HvCcPR862vYRvR0qd4=
gomodules.xyz/x v0.0.3 h1:eAYWD/byCpuZGsxuENqS/iutPzRk/N8B+wOHJ9Bx7ig=
gomodules.xyz/x v0.0.3/go.mod h1:E7ulagfan4tGmqGE07MD0J8o3HvCcPR862vYRvR0qd4=
gomodules.xyz/x v0.0.4 h1:noPqyyEctTqGLIa0afUF0EmPVM/ILhwW3pR1AI6pA9Q=
gomodules.xyz/x v0.0.4/go.mod h1:dtWjlbllv91RG3dwY5MyRo2j1tSd6fH+cD89u1Tffj0=
gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU=
Expand Down Expand Up @@ -1117,8 +1126,9 @@ k8s.io/system-validators v1.4.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6g
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
kmodules.xyz/client-go v0.0.0-20210504004915-de8d9776f2a1/go.mod h1:ifLKR8x30D3olyDLLOX4EWofPQSWwE71unymOgZzKHw=
kmodules.xyz/client-go v0.0.0-20210504024435-1eb80721e9b8 h1:DDH/sxVxkcK0dHYYe8ouIJ7wQ//rh/MOLIabByoXKuA=
kmodules.xyz/client-go v0.0.0-20210504024435-1eb80721e9b8/go.mod h1:Q5iJv9pP1jHSfCz0YKRci4NE9THiKVccU2KEay7udik=
kmodules.xyz/client-go v0.0.0-20210505231546-fa4fb8e1d04e h1:o5njIPJkNN1h1Dz21DuVdw2X34zRuC5oPyUVArXLUMg=
kmodules.xyz/client-go v0.0.0-20210505231546-fa4fb8e1d04e/go.mod h1:R+xaDwIcqjPygQcVd3+0K2WBEwMB+wSZJAK18WdSr0A=
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
kmodules.xyz/crd-schema-fuzz v0.0.0-20210503192455-da44af375c4c/go.mod h1:QDC1mgkeHEV9DAJCtkAk7arY4aWqI5EKoXiB2FnreoA=
kmodules.xyz/custom-resources v0.0.0-20210504034124-54c54fcdb690 h1:joP9DMuws3o8Zuli1rGOyywAV997ohdvcioi9p2YsK8=
Expand All @@ -1129,11 +1139,12 @@ kmodules.xyz/objectstore-api v0.0.0-20210504041638-b9e00ab1eab3/go.mod h1:6+bKEO
kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5 h1:jzZVWph3S3Jds85Wws1qohmhGpA/YF5r4hgEP0lsXVQ=
kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5/go.mod h1:rD8bFFYjb4E4uftnobpuR/yvIN/UZsC943NovlKo/es=
kmodules.xyz/openshift v0.0.0-20210504040454-a3ddfc579bb7/go.mod h1:T6jBAUCoXuGZg0gtI6RBlLxTbcQx2CEHnGt4O01TFFk=
kmodules.xyz/prober v0.0.0-20210504042421-eca494e828bc h1:uZM1CYbLdlzVTHil1hO43YI67Vgs/Zr+IQ/NV7YLWi4=
kmodules.xyz/prober v0.0.0-20210504042421-eca494e828bc/go.mod h1:Asmxrv1or+IbQf8U/B/5I/YFcnpMhyM6DxaByMWwDTQ=
kmodules.xyz/prober v0.0.0-20210504215326-2e406706b970 h1:O3dG9jPo3fpBbP7rDWY1YLOEZY1KAFuIO2lTURQ43Lo=
kmodules.xyz/prober v0.0.0-20210504215326-2e406706b970/go.mod h1:Asmxrv1or+IbQf8U/B/5I/YFcnpMhyM6DxaByMWwDTQ=
kmodules.xyz/webhook-runtime v0.0.0-20210504042742-3a9911e3dcdc/go.mod h1:6XuoN0H+Od+12aEywFaQnPJ3DYfJZE+Sx0MB4dzWI5Q=
kubedb.dev/apimachinery v0.18.1-0.20210504170625-e725873d4e41 h1:OWeaEIDypwUA62+6piR+8y9jI4quyDVVUgaduGXJcAM=
kubedb.dev/apimachinery v0.18.1-0.20210504170625-e725873d4e41/go.mod h1:NDcMccvkrY6SoXUG7kdcjsxMotTgLW2rVOrnijbeGv4=
kubedb.dev/apimachinery v0.18.1-0.20210506003355-e982e5902ad2 h1:67cbik5tN/ny9WrW5MFjr4KGObZzdF2VhoSdK/9Lfd8=
kubedb.dev/apimachinery v0.18.1-0.20210506003355-e982e5902ad2/go.mod h1:MV2Q4muyxAhU3VPYcmN/Oyj2Ca3VMIH+59PYNFTUxZo=
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
Expand All @@ -1160,6 +1171,5 @@ sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
software.sslmate.com/src/go-pkcs12 v0.0.0-20180114231543-2291e8f0f237/go.mod h1:/xvNRWUqm0+/ZMiF4EX00vrSCMsE4/NHb+Pt3freEeQ=
software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001/go.mod h1:/xvNRWUqm0+/ZMiF4EX00vrSCMsE4/NHb+Pt3freEeQ=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
stash.appscode.dev/apimachinery v0.13.1-0.20210504044941-15d8c532c990/go.mod h1:uTTudQWwnJjcoFJl7i7pHB8am1DG7OJJiaRCoS5KMyo=
stash.appscode.dev/apimachinery v0.13.1-0.20210504142328-ae1654642a82 h1:y3vLFGAp/U3e55t/FmLWc6Fa+/gBVeoNWu0DVNYu114=
stash.appscode.dev/apimachinery v0.13.1-0.20210504142328-ae1654642a82/go.mod h1:uTTudQWwnJjcoFJl7i7pHB8am1DG7OJJiaRCoS5KMyo=
stash.appscode.dev/apimachinery v0.13.1-0.20210505235659-974fc12c7593 h1:dGIZ3lsoHcfAT0jJ6ORvjrS+xq28slARFqDizMFYlbk=
stash.appscode.dev/apimachinery v0.13.1-0.20210505235659-974fc12c7593/go.mod h1:4wpgMYZrHB9AObVcp14QFuyc5Wk7lE/d64C+HaBJFK8=
4 changes: 2 additions & 2 deletions pkg/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"stash.appscode.dev/apimachinery/client/clientset/versioned/scheme"

"github.com/spf13/cobra"
"gomodules.xyz/kglog"
"gomodules.xyz/x/flags"
v "gomodules.xyz/x/version"
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
"kmodules.xyz/client-go/logs"
"kmodules.xyz/client-go/tools/cli"
)

Expand All @@ -47,7 +47,7 @@ func NewRootCmd() *cobra.Command {
},
}
rootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
logs.ParseFlags()
kglog.ParseFlags()
rootCmd.PersistentFlags().StringVar(&licenseApiService, "license-apiservice", "", "Name of ApiService used to expose License endpoint")
rootCmd.PersistentFlags().BoolVar(&cli.EnableAnalytics, "enable-analytics", cli.EnableAnalytics, "Send analytical events to Google Analytics")

Expand Down
44 changes: 0 additions & 44 deletions vendor/github.com/golang/glog/README
View file

This file was deleted.

36 changes: 36 additions & 0 deletions vendor/github.com/golang/glog/README.md
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/gomodules.xyz/clock/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[![PkgGoDev](https://pkg.go.dev/badge/gomodules.xyz/clock)](https://pkg.go.dev/gomodules.xyz/clock)

# clock

This library has been forked from https://github.com/kubernetes/apimachinery/tree/v0.18.3/pkg/util/clock so that it can easily used in non-k8s related projects.
Loading

0 comments on commit 6e078f0

Please sign in to comment.