Skip to content

Commit 5d71f39

Browse files
1gtm1gtm
authored
[cherry-pick] Use kglog helper (#412)
Signed-off-by: Tamal Saha <tamal@appscode.com>
1 parent 37726d7 commit 5d71f39

File tree

34 files changed

+2056
-119
lines changed

34 files changed

+2056
-119
lines changed

‎cmd/stash-mysql/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ import (
2323
_ "stash.appscode.dev/apimachinery/client/clientset/versioned/fake"
2424
"stash.appscode.dev/mysql/pkg"
2525

26+
"gomodules.xyz/kglog"
2627
_ "k8s.io/client-go/kubernetes/fake"
2728
_ "k8s.io/client-go/plugin/pkg/client/auth"
2829
"k8s.io/klog/v2"
29-
"kmodules.xyz/client-go/logs"
3030
)
3131

3232
func main() {
33-
logs.InitLogs()
34-
defer logs.FlushLogs()
33+
kglog.InitLogs()
34+
defer kglog.FlushLogs()
3535

3636
if len(os.Getenv("GOMAXPROCS")) == 0 {
3737
runtime.GOMAXPROCS(runtime.NumCPU())

‎go.mod

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@ require (
66
github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe
77
github.com/spf13/cobra v1.1.3
88
go.bytebuilders.dev/license-verifier/kubernetes v0.9.1
9-
gomodules.xyz/x v0.0.3
9+
gomodules.xyz/kglog v0.0.1
10+
gomodules.xyz/x v0.0.4
1011
k8s.io/api v0.21.0
1112
k8s.io/apimachinery v0.21.0
1213
k8s.io/client-go v0.21.0
1314
k8s.io/klog/v2 v2.8.0
14-
kmodules.xyz/client-go v0.0.0-20210504024435-1eb80721e9b8
15+
kmodules.xyz/client-go v0.0.0-20210505231546-fa4fb8e1d04e
1516
kmodules.xyz/custom-resources v0.0.0-20210504034124-54c54fcdb690
1617
kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5
17-
stash.appscode.dev/apimachinery v0.13.1-0.20210504142328-ae1654642a82
18+
kmodules.xyz/prober v0.0.0-20210504215326-2e406706b970 // indirect
19+
stash.appscode.dev/apimachinery v0.13.1-0.20210505235659-974fc12c7593
1820
)
1921

2022
replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d

‎go.sum

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,9 @@ github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x
231231
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
232232
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
233233
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
234-
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
235234
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
235+
github.com/golang/glog v0.0.0-20210429001901-424d2337a529 h1:2voWjNECnrZRbfwXxHB1/j8wa6xdKn85B5NzgVL/pTU=
236+
github.com/golang/glog v0.0.0-20210429001901-424d2337a529/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
236237
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
237238
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
238239
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -847,26 +848,34 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
847848
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
848849
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
849850
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
851+
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f h1:hTyhR4r+tj1Uq7/PpFxLTzbeA0LhMVp7bEYfhkzFjdY=
852+
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f/go.mod h1:K3m7N+nBOlf91/tpv8REUGwsAgaKFwElQCuiLhm12AQ=
850853
gomodules.xyz/homedir v0.0.0-20201104190528-bcd4d5d94b84 h1:RH11GBm37fGstaCcoFB5KtcUijofDS0yxcdkCS6vx/A=
851854
gomodules.xyz/homedir v0.0.0-20201104190528-bcd4d5d94b84/go.mod h1:rNt5O0KsgdJjAD/UXuxhO2N3b5TegqEk1T8HG9eraH4=
852855
gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
853856
gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k=
854857
gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
858+
gomodules.xyz/kglog v0.0.1 h1:uB5HcipJvTDR5OLi3XiLzyvGzZbmAh37LO4TZGeur6c=
859+
gomodules.xyz/kglog v0.0.1/go.mod h1:+zsiQO9SrbeUeqI5fYEIl/96o5dNoWUM0J69BUMEmDc=
855860
gomodules.xyz/password-generator v0.2.6/go.mod h1:TvwYYTx9+P1pPwKQKfZgB/wr2Id9MqAQ3B5auY7reNg=
856861
gomodules.xyz/pointer v0.0.0-20201105040656-991dd254b680/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo=
857862
gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209 h1:7tRaHoF3a725gtWs/NKkRNK5sBMXUyopVIsJ4WvhcTI=
858863
gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo=
864+
gomodules.xyz/runtime v0.2.0 h1:fzoGf/lnQ2F/rakbCjNfrZZFiNQ8XVLrR5YrtuhrtkU=
859865
gomodules.xyz/runtime v0.2.0/go.mod h1:/R/Dw906YIUHKJ5cfKUaJgJrojFjpRU+n0s3Wjn1tqs=
860866
gomodules.xyz/sets v0.0.0-20200930152147-4f4543544799/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc=
861867
gomodules.xyz/sets v0.0.0-20210218105342-2efe2fb519a2 h1:JhyydLTz2aE09lMNheZHt6FHa9kJK1jWJuXe0vDM430=
862868
gomodules.xyz/sets v0.0.0-20210218105342-2efe2fb519a2/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc=
863869
gomodules.xyz/stow v0.2.4/go.mod h1:aAgUEHyZ+4nKznyVupMMkP0JX9MXW1ZRrbRGaclp3E0=
864870
gomodules.xyz/version v0.1.0 h1:inGItCg/egI0jPMeIE0SQkiDIJaodOMoCrxYqasQLR0=
865871
gomodules.xyz/version v0.1.0/go.mod h1:Y8xuV02mL/45psyPKG3NCVOwvAOy6T5Kx0l3rCjKSjU=
872+
gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545 h1:iiD24jN1H8PzliVe1igIzYsx8+VmbXG12y9UUSupUJU=
873+
gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545/go.mod h1:g/epKzZQuCqgvhzhaoG4cSBNGHqnOrhFR4Q7szDJ1JM=
866874
gomodules.xyz/x v0.0.0-20201105065653-91c568df6331/go.mod h1:Q5P/WKpi2XymJJ4mBhUlBVsCzoL167c78CxyIind/pA=
867875
gomodules.xyz/x v0.0.2/go.mod h1:E7ulagfan4tGmqGE07MD0J8o3HvCcPR862vYRvR0qd4=
868-
gomodules.xyz/x v0.0.3 h1:eAYWD/byCpuZGsxuENqS/iutPzRk/N8B+wOHJ9Bx7ig=
869876
gomodules.xyz/x v0.0.3/go.mod h1:E7ulagfan4tGmqGE07MD0J8o3HvCcPR862vYRvR0qd4=
877+
gomodules.xyz/x v0.0.4 h1:noPqyyEctTqGLIa0afUF0EmPVM/ILhwW3pR1AI6pA9Q=
878+
gomodules.xyz/x v0.0.4/go.mod h1:dtWjlbllv91RG3dwY5MyRo2j1tSd6fH+cD89u1Tffj0=
870879
gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
871880
gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
872881
gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU=
@@ -972,8 +981,9 @@ k8s.io/system-validators v1.4.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6g
972981
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
973982
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
974983
kmodules.xyz/client-go v0.0.0-20210504004915-de8d9776f2a1/go.mod h1:ifLKR8x30D3olyDLLOX4EWofPQSWwE71unymOgZzKHw=
975-
kmodules.xyz/client-go v0.0.0-20210504024435-1eb80721e9b8 h1:DDH/sxVxkcK0dHYYe8ouIJ7wQ//rh/MOLIabByoXKuA=
976984
kmodules.xyz/client-go v0.0.0-20210504024435-1eb80721e9b8/go.mod h1:Q5iJv9pP1jHSfCz0YKRci4NE9THiKVccU2KEay7udik=
985+
kmodules.xyz/client-go v0.0.0-20210505231546-fa4fb8e1d04e h1:o5njIPJkNN1h1Dz21DuVdw2X34zRuC5oPyUVArXLUMg=
986+
kmodules.xyz/client-go v0.0.0-20210505231546-fa4fb8e1d04e/go.mod h1:R+xaDwIcqjPygQcVd3+0K2WBEwMB+wSZJAK18WdSr0A=
977987
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
978988
kmodules.xyz/crd-schema-fuzz v0.0.0-20210503192455-da44af375c4c/go.mod h1:QDC1mgkeHEV9DAJCtkAk7arY4aWqI5EKoXiB2FnreoA=
979989
kmodules.xyz/custom-resources v0.0.0-20210504034124-54c54fcdb690 h1:joP9DMuws3o8Zuli1rGOyywAV997ohdvcioi9p2YsK8=
@@ -982,8 +992,9 @@ kmodules.xyz/objectstore-api v0.0.0-20210504041638-b9e00ab1eab3 h1:8/Y4a6re3ZjAC
982992
kmodules.xyz/objectstore-api v0.0.0-20210504041638-b9e00ab1eab3/go.mod h1:6+bKEOFkOJFnII9zZq6hUsjNQ6o42WcvttoNcQ69SP4=
983993
kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5 h1:jzZVWph3S3Jds85Wws1qohmhGpA/YF5r4hgEP0lsXVQ=
984994
kmodules.xyz/offshoot-api v0.0.0-20210504040651-7951e351f0f5/go.mod h1:rD8bFFYjb4E4uftnobpuR/yvIN/UZsC943NovlKo/es=
985-
kmodules.xyz/prober v0.0.0-20210504042421-eca494e828bc h1:uZM1CYbLdlzVTHil1hO43YI67Vgs/Zr+IQ/NV7YLWi4=
986995
kmodules.xyz/prober v0.0.0-20210504042421-eca494e828bc/go.mod h1:Asmxrv1or+IbQf8U/B/5I/YFcnpMhyM6DxaByMWwDTQ=
996+
kmodules.xyz/prober v0.0.0-20210504215326-2e406706b970 h1:O3dG9jPo3fpBbP7rDWY1YLOEZY1KAFuIO2lTURQ43Lo=
997+
kmodules.xyz/prober v0.0.0-20210504215326-2e406706b970/go.mod h1:Asmxrv1or+IbQf8U/B/5I/YFcnpMhyM6DxaByMWwDTQ=
987998
modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
988999
modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
9891000
modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
@@ -1005,5 +1016,5 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
10051016
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
10061017
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
10071018
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
1008-
stash.appscode.dev/apimachinery v0.13.1-0.20210504142328-ae1654642a82 h1:y3vLFGAp/U3e55t/FmLWc6Fa+/gBVeoNWu0DVNYu114=
1009-
stash.appscode.dev/apimachinery v0.13.1-0.20210504142328-ae1654642a82/go.mod h1:uTTudQWwnJjcoFJl7i7pHB8am1DG7OJJiaRCoS5KMyo=
1019+
stash.appscode.dev/apimachinery v0.13.1-0.20210505235659-974fc12c7593 h1:dGIZ3lsoHcfAT0jJ6ORvjrS+xq28slARFqDizMFYlbk=
1020+
stash.appscode.dev/apimachinery v0.13.1-0.20210505235659-974fc12c7593/go.mod h1:4wpgMYZrHB9AObVcp14QFuyc5Wk7lE/d64C+HaBJFK8=

‎pkg/root.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"stash.appscode.dev/apimachinery/client/clientset/versioned/scheme"
2323

2424
"github.com/spf13/cobra"
25+
"gomodules.xyz/kglog"
2526
"gomodules.xyz/x/flags"
2627
v "gomodules.xyz/x/version"
2728
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
28-
"kmodules.xyz/client-go/logs"
2929
"kmodules.xyz/client-go/tools/cli"
3030
)
3131

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

‎vendor/github.com/golang/glog/README

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎vendor/github.com/golang/glog/README.md

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gomodules.xyz/clock/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[![PkgGoDev](https://pkg.go.dev/badge/gomodules.xyz/clock)](https://pkg.go.dev/gomodules.xyz/clock)
2+
3+
# clock
4+
5+
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.

0 commit comments

Comments
 (0)