diff --git a/go.mod b/go.mod index 0561f0a6e33..1ea41d77dc8 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.15 require ( github.com/cloudflare/cfssl v1.5.0 // for `kubebuilder alpha config-gen` + github.com/go-logr/logr v0.3.0 // indirect github.com/gobuffalo/flect v0.2.2 // TODO: remove this in favor of embed once using 1.16 github.com/markbates/pkger v0.17.1 // for `kubebuilder alpha config-gen` @@ -15,6 +16,8 @@ require ( golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e // for `kubebuilder alpha config-gen` gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect + k8s.io/api v0.20.2 // indirect + k8s.io/apiextensions-apiserver v0.20.1 // indirect k8s.io/apimachinery v0.20.2 // for `kubebuilder alpha config-gen` k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect sigs.k8s.io/controller-tools v0.3.0 // for `kubebuilder alpha config-gen` diff --git a/go.sum b/go.sum index 05046d780a8..367d0d9b5c1 100644 --- a/go.sum +++ b/go.sum @@ -6,21 +6,41 @@ cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6A cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/360EntSecGroup-Skylar/excelize v1.4.1/go.mod h1:vnax29X2usfl7HHkBrX5EvSCJcmH3dT9luvxzu8iGAE= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= +github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= +github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= +github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0= +github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc= +github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= @@ -38,7 +58,9 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdko github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -50,13 +72,18 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20180118203423-deb3ae2ef261/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -105,6 +132,7 @@ github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLi github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= @@ -116,12 +144,17 @@ github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0 github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs= +github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= @@ -194,16 +227,21 @@ github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXP github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/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= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -230,6 +268,9 @@ github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -272,6 +313,7 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -287,6 +329,7 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -296,6 +339,7 @@ github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49 h1:o/c0aWEP/m6n6 github.com/kisielk/sqlstruct v0.0.0-20150923205031-648daed35d49/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE= github.com/kisom/goutils v1.1.0/go.mod h1:+UBTfd78habUYWFbNWTJNG+jNG/i/lGURakr4A/yNRw= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= @@ -329,6 +373,8 @@ github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOq github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -339,6 +385,7 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -388,6 +435,8 @@ github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prY github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -396,9 +445,14 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= +github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -414,6 +468,7 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -464,6 +519,7 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca h1:1CFlNzQhALwjS9mBAUkycX616GzgsuYUOCHA5+HSlXI= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod h1:3YZ9o3WnatTIZhuOtot4IcUfzoKVjUHqu6WALIyI0nE= @@ -475,13 +531,17 @@ github.com/zmap/zlint/v2 v2.2.1 h1:b2kI/ToXX16h2wjV2c6Da65eT6aTMtkLHKetXuM9EtI= github.com/zmap/zlint/v2 v2.2.1/go.mod h1:ixPWsdq8qLxYRpNUTbcKig3R7WgmspsHGLhCCs6rFAM= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= +go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA= go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.starlark.net v0.0.0-20190528202925-30ae18b8564f/go.mod h1:c1/X6cHgvdXj6pUlmWKMkuqRnW4K8x2vwt6JAaaircg= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= @@ -504,6 +564,7 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200124225646-8b5121be2f68/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee h1:4yd7jl+vXjalO5ztz6Vc1VADv+S/80LGJmyl1ROJ2AI= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -511,6 +572,11 @@ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -520,10 +586,16 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -547,9 +619,16 @@ golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -560,6 +639,9 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -588,18 +670,31 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091 h1:DMyOG0U+gKfu8JZzg2UQe9MeaC1X+xQWlAKcRnjxjCw= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -609,6 +704,9 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -627,13 +725,30 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e h1:4nW4NLDYnU28ojHaHO8OVxFHk/aQ33U01a9cjED+pzE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -646,10 +761,16 @@ google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -661,7 +782,17 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -670,6 +801,7 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -678,6 +810,7 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -700,6 +833,7 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= @@ -710,30 +844,44 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= +gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.18.2 h1:wG5g5ZmSVgm5B+eHMIbI9EGATS2L8Z72rda19RIEgY8= k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= +k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= +k8s.io/api v0.20.2 h1:y/HR22XDZY3pniu9hIFDLpUCPq2w5eQ6aV/VFQ7uJMw= +k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8= k8s.io/apiextensions-apiserver v0.18.2 h1:I4v3/jAuQC+89L3Z7dDgAiN4EOjN6sbm6iBqQwHTah8= k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= +k8s.io/apiextensions-apiserver v0.20.1 h1:ZrXQeslal+6zKM/HjDXLzThlz/vPSxrfK3OqL8txgVQ= +k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk= k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= +k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.2 h1:hFx6Sbt1oG0n6DZ+g4bFt5f6BoMkOjKWsQFu077M3Vg= k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw= +k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU= +k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= +k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= +k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= @@ -741,10 +889,14 @@ k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhD k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ= k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/controller-tools v0.3.0 h1:y3YD99XOyWaXkiF1kd41uRvfp/64teWcrEZFuHxPhJ4= sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= sigs.k8s.io/kustomize/kyaml v0.10.10 h1:caAxDDkaXZp+0kDsZVik4leFJV8LCy09PdVqpaoNeF4= diff --git a/pkg/cli/alpha/config-gen/cmd.go b/pkg/cli/alpha/config-gen/cmd.go index be3a3ae4977..96577d5aab2 100644 --- a/pkg/cli/alpha/config-gen/cmd.go +++ b/pkg/cli/alpha/config-gen/cmd.go @@ -172,6 +172,13 @@ The KubebuilderConfigGen resource has the following fields: # generate prometheus ServiceMonitor resource enableServiceMonitor: true + serviceAccount: + # configure the service account used for RBAC + name: foo + + # generate the service account resource + generate: true + # configure how webhooks are generated # optional -- defaults to not generating webhook configuration webhooks: diff --git a/pkg/cli/alpha/config-gen/examples/kustomize/README.md b/pkg/cli/alpha/config-gen/examples/kustomize/README.md index 79a425683e8..cde970d8e48 100644 --- a/pkg/cli/alpha/config-gen/examples/kustomize/README.md +++ b/pkg/cli/alpha/config-gen/examples/kustomize/README.md @@ -11,8 +11,10 @@ This enables using `config-gen` in traditional kustomize workflows (patch, bases to be customized using `commonLabels`, `commonAnnotations`, `namespace`, etc. When invoked from `kustomize`, `config-gen` will generate resources from the project code -if they do not already exist as `resources` inputs. If the resources that would have been -generated are provided as `resources` input, the inputs will be modified by the transformer. +if they do not already exist as `resources` inputs. + +If the resources that would have been generated are provided as `resources` input, +the inputs will be modified by the transformer instead of generated a second time. ## Install kustomize @@ -22,14 +24,14 @@ Install the latest version of `kustomize`. GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v4 ``` -## Configure `kubebuilder alpha config-gen` as a plugin +## Install `kubebuilder alpha config-gen` as a plugin ```sh # create the script under $HOME/.config/kustomize/plugin/kubebuilder.sigs.k8s.io/kubebuilderconfiggen kubebuilder alpha config-gen install-as-plugin ``` -## Use `kustomize` to invoke the plugin +## Build with `kustomize` Kustomize will invoke the `kubebuilder alpha config-gen` subcommand as a transformer plugin. diff --git a/pkg/cli/alpha/config-gen/templates/resources/auth-proxy-rbac.template.yaml b/pkg/cli/alpha/config-gen/templates/resources/auth-proxy-rbac.template.yaml index 52b185ff71f..b3e8d0c07ce 100644 --- a/pkg/cli/alpha/config-gen/templates/resources/auth-proxy-rbac.template.yaml +++ b/pkg/cli/alpha/config-gen/templates/resources/auth-proxy-rbac.template.yaml @@ -23,7 +23,7 @@ roleRef: name: {{ .Name }}-proxy-role subjects: - kind: ServiceAccount - name: default + name: {{ .Spec.ControllerManager.ServiceAccount.Name }} namespace: {{ .Namespace }} --- {{ end }} diff --git a/pkg/cli/alpha/config-gen/templates/resources/controller-manager.template.yaml b/pkg/cli/alpha/config-gen/templates/resources/controller-manager.template.yaml index 5f0dc4a137b..aae006799e1 100644 --- a/pkg/cli/alpha/config-gen/templates/resources/controller-manager.template.yaml +++ b/pkg/cli/alpha/config-gen/templates/resources/controller-manager.template.yaml @@ -29,6 +29,9 @@ spec: requests: cpu: 100m memory: 20Mi +{{- if ne .Spec.ControllerManager.ServiceAccount.Name "default" }} + serviceAccountName: {{ .Spec.ControllerManager.ServiceAccount.Name }} +{{- end }} terminationGracePeriodSeconds: 10 --- {{- if .Spec.Webhooks.Enable }} diff --git a/pkg/cli/alpha/config-gen/templates/resources/rbac.template.yaml b/pkg/cli/alpha/config-gen/templates/resources/rbac.template.yaml index 63e49b80a6d..92440f59fff 100644 --- a/pkg/cli/alpha/config-gen/templates/resources/rbac.template.yaml +++ b/pkg/cli/alpha/config-gen/templates/resources/rbac.template.yaml @@ -8,7 +8,7 @@ roleRef: name: {{ .Namespace }}-manager-role subjects: - kind: ServiceAccount - name: default + name: {{ .Spec.ControllerManager.ServiceAccount.Name }} namespace: {{ .Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 @@ -55,6 +55,6 @@ roleRef: name: {{ .Namespace }}-leader-election-role subjects: - kind: ServiceAccount - name: default + name: {{ .Spec.ControllerManager.ServiceAccount.Name }} namespace: {{ .Namespace }} --- diff --git a/pkg/cli/alpha/config-gen/templates/resources/service-account.template.yaml b/pkg/cli/alpha/config-gen/templates/resources/service-account.template.yaml new file mode 100644 index 00000000000..62af85354db --- /dev/null +++ b/pkg/cli/alpha/config-gen/templates/resources/service-account.template.yaml @@ -0,0 +1,7 @@ +{{ if not .Spec.ControllerManager.ServiceAccount.NoGenerate }} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Spec.ControllerManager.ServiceAccount.Name }} + namespace: {{ .Namespace }} +{{ end }} \ No newline at end of file diff --git a/pkg/cli/alpha/config-gen/testdata/componentconfig/expected.yaml b/pkg/cli/alpha/config-gen/testdata/componentconfig/expected.yaml index 0bcd3aa48bc..ca92e371da6 100644 --- a/pkg/cli/alpha/config-gen/testdata/componentconfig/expected.yaml +++ b/pkg/cli/alpha/config-gen/testdata/componentconfig/expected.yaml @@ -210,7 +210,7 @@ roleRef: name: simple-system-leader-election-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -223,7 +223,7 @@ roleRef: name: simple-proxy-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -236,7 +236,7 @@ roleRef: name: simple-system-manager-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: v1 @@ -299,6 +299,7 @@ spec: ports: - containerPort: 8443 name: https + serviceAccountName: simple terminationGracePeriodSeconds: 10 volumes: - name: manager-config @@ -323,3 +324,9 @@ data: leaderElection: leaderElect: true resourceName: 6858fb70.testproject.org +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: simple + namespace: simple-system diff --git a/pkg/cli/alpha/config-gen/testdata/default/expected.yaml b/pkg/cli/alpha/config-gen/testdata/default/expected.yaml index 9b9ff310353..476959d1982 100644 --- a/pkg/cli/alpha/config-gen/testdata/default/expected.yaml +++ b/pkg/cli/alpha/config-gen/testdata/default/expected.yaml @@ -210,7 +210,7 @@ roleRef: name: simple-system-leader-election-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -223,7 +223,7 @@ roleRef: name: simple-proxy-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -236,7 +236,7 @@ roleRef: name: simple-system-manager-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: v1 @@ -296,4 +296,11 @@ spec: ports: - containerPort: 8443 name: https + serviceAccountName: simple terminationGracePeriodSeconds: 10 +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: simple + namespace: simple-system diff --git a/pkg/cli/alpha/config-gen/testdata/disableauthproxy/expected.yaml b/pkg/cli/alpha/config-gen/testdata/disableauthproxy/expected.yaml index 8cf8984867b..0b99f2807e2 100644 --- a/pkg/cli/alpha/config-gen/testdata/disableauthproxy/expected.yaml +++ b/pkg/cli/alpha/config-gen/testdata/disableauthproxy/expected.yaml @@ -196,7 +196,7 @@ roleRef: name: simple-system-leader-election-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -209,7 +209,7 @@ roleRef: name: simple-system-manager-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: apps/v1 @@ -243,4 +243,11 @@ spec: requests: cpu: 100m memory: 20Mi + serviceAccountName: simple terminationGracePeriodSeconds: 10 +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: simple + namespace: simple-system diff --git a/pkg/cli/alpha/config-gen/testdata/enablecertmanager/expected.yaml b/pkg/cli/alpha/config-gen/testdata/enablecertmanager/expected.yaml index 558971dbaf2..dfbe286b27b 100644 --- a/pkg/cli/alpha/config-gen/testdata/enablecertmanager/expected.yaml +++ b/pkg/cli/alpha/config-gen/testdata/enablecertmanager/expected.yaml @@ -210,7 +210,7 @@ roleRef: name: simple-system-leader-election-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -223,7 +223,7 @@ roleRef: name: simple-proxy-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -236,7 +236,7 @@ roleRef: name: simple-system-manager-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: v1 @@ -318,6 +318,7 @@ spec: ports: - containerPort: 8443 name: https + serviceAccountName: simple terminationGracePeriodSeconds: 10 volumes: - name: cert @@ -325,6 +326,12 @@ spec: defaultMode: 420 secretName: webhook-server-cert --- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: simple + namespace: simple-system +--- # The following manifests contain a self-signed issuer CR and a certificate CR. # More document can be found at https://docs.cert-manager.io # WARNING: Targets CertManager 0.11 check https://docs.cert-manager.io/en/latest/tasks/upgrading/index.html for diff --git a/pkg/cli/alpha/config-gen/testdata/enableconversionwebhooks/expected.yaml b/pkg/cli/alpha/config-gen/testdata/enableconversionwebhooks/expected.yaml index 5dc9238932a..3d99c07133c 100644 --- a/pkg/cli/alpha/config-gen/testdata/enableconversionwebhooks/expected.yaml +++ b/pkg/cli/alpha/config-gen/testdata/enableconversionwebhooks/expected.yaml @@ -219,7 +219,7 @@ roleRef: name: simple-system-leader-election-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -232,7 +232,7 @@ roleRef: name: simple-proxy-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -245,7 +245,7 @@ roleRef: name: simple-system-manager-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: v1 @@ -327,9 +327,16 @@ spec: ports: - containerPort: 8443 name: https + serviceAccountName: simple terminationGracePeriodSeconds: 10 volumes: - name: cert secret: defaultMode: 420 secretName: webhook-server-cert +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: simple + namespace: simple-system diff --git a/pkg/cli/alpha/config-gen/testdata/enableprometheus/expected.yaml b/pkg/cli/alpha/config-gen/testdata/enableprometheus/expected.yaml index 7047ebb504b..508a17bd7b9 100644 --- a/pkg/cli/alpha/config-gen/testdata/enableprometheus/expected.yaml +++ b/pkg/cli/alpha/config-gen/testdata/enableprometheus/expected.yaml @@ -210,7 +210,7 @@ roleRef: name: simple-system-leader-election-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -223,7 +223,7 @@ roleRef: name: simple-proxy-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -236,7 +236,7 @@ roleRef: name: simple-system-manager-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: v1 @@ -296,6 +296,7 @@ spec: ports: - containerPort: 8443 name: https + serviceAccountName: simple terminationGracePeriodSeconds: 10 --- apiVersion: monitoring.coreos.com/v1 @@ -312,3 +313,9 @@ spec: selector: matchLabels: control-plane: controller-manager +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: simple + namespace: simple-system diff --git a/pkg/cli/alpha/config-gen/testdata/enablewebhooks/expected.yaml b/pkg/cli/alpha/config-gen/testdata/enablewebhooks/expected.yaml index ad97a25e588..87ac0bb6a28 100644 --- a/pkg/cli/alpha/config-gen/testdata/enablewebhooks/expected.yaml +++ b/pkg/cli/alpha/config-gen/testdata/enablewebhooks/expected.yaml @@ -210,7 +210,7 @@ roleRef: name: simple-system-leader-election-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -223,7 +223,7 @@ roleRef: name: simple-proxy-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: rbac.authorization.k8s.io/v1 @@ -236,7 +236,7 @@ roleRef: name: simple-system-manager-role subjects: - kind: ServiceAccount - name: default + name: simple namespace: simple-system --- apiVersion: v1 @@ -318,9 +318,16 @@ spec: ports: - containerPort: 8443 name: https + serviceAccountName: simple terminationGracePeriodSeconds: 10 volumes: - name: cert secret: defaultMode: 420 secretName: webhook-server-cert +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: simple + namespace: simple-system diff --git a/pkg/cli/alpha/config-gen/testdata/serviceaccount/config.yaml b/pkg/cli/alpha/config-gen/testdata/serviceaccount/config.yaml new file mode 100644 index 00000000000..44b037443cb --- /dev/null +++ b/pkg/cli/alpha/config-gen/testdata/serviceaccount/config.yaml @@ -0,0 +1,12 @@ +apiVersion: kubebuilder.sigs.k8s.io/v1alpha1 +kind: KubebuilderConfigGen +metadata: + name: simple +spec: + crds: + sourceDirectory: ../project/... + + controllerManager: + image: example/simple:latest + serviceAccount: + name: foo \ No newline at end of file diff --git a/pkg/cli/alpha/config-gen/testdata/serviceaccount/expected.yaml b/pkg/cli/alpha/config-gen/testdata/serviceaccount/expected.yaml new file mode 100644 index 00000000000..4f487aef691 --- /dev/null +++ b/pkg/cli/alpha/config-gen/testdata/serviceaccount/expected.yaml @@ -0,0 +1,306 @@ +apiVersion: v1 +kind: Namespace +metadata: + labels: + control-plane: controller-manager + name: simple-system +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: (unknown) + creationTimestamp: null + name: bars.example.my.domain +spec: + group: example.my.domain + names: + kind: Bar + listKind: BarList + plural: bars + singular: bar + scope: Namespaced + validation: + openAPIV3Schema: + description: Bar is the Schema for the bars API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema ' + type: string + kind: + description: 'Kind is a string value representing the ' + type: string + metadata: + type: object + spec: + description: BarSpec defines the desired state of Bar + properties: + foo: + description: Foo is an example field of Bar. + type: string + type: object + status: + description: 'BarStatus defines the observed state of ' + type: object + type: object + version: v1beta1 + versions: + - name: v1beta1 + served: true + storage: true +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: (unknown) + creationTimestamp: null + name: foos.example.my.domain +spec: + group: example.my.domain + names: + kind: Foo + listKind: FooList + plural: foos + singular: foo + scope: Namespaced + validation: + openAPIV3Schema: + description: Foo is the Schema for the foos API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema ' + type: string + kind: + description: 'Kind is a string value representing the ' + type: string + metadata: + type: object + spec: + description: FooSpec defines the desired state of Foo + properties: + foo: + description: Foo is an example field of Foo. + type: string + type: object + status: + description: 'FooStatus defines the observed state of ' + type: object + type: object + version: v1alpha1 + versions: + - name: v1alpha1 + served: true + storage: true +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: simple-system-leader-election-role + namespace: simple-system +rules: + - apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch + - create + - update + - patch + - delete + - apiGroups: + - "" + resources: + - configmaps/status + verbs: + - get + - update + - patch + - apiGroups: + - "" + resources: + - events + verbs: + - create +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: simple-proxy-role +rules: + - apiGroups: ["authentication.k8s.io"] + resources: + - tokenreviews + verbs: ["create"] + - apiGroups: ["authorization.k8s.io"] + resources: + - subjectaccessreviews + verbs: ["create"] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + creationTimestamp: null + name: simple-system-manager-role +rules: + - apiGroups: + - example.my.domain + resources: + - bars + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - example.my.domain + resources: + - bars/status + verbs: + - get + - patch + - update + - apiGroups: + - example.my.domain + resources: + - foos + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - example.my.domain + resources: + - foos/status + verbs: + - get + - patch + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: simple-system-leader-election-rolebinding + namespace: simple-system +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: simple-system-leader-election-role +subjects: + - kind: ServiceAccount + name: foo + namespace: simple-system +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: simple-proxy-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: simple-proxy-role +subjects: + - kind: ServiceAccount + name: foo + namespace: simple-system +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: simple-system-manager-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: simple-system-manager-role +subjects: + - kind: ServiceAccount + name: foo + namespace: simple-system +--- +apiVersion: v1 +kind: Service +metadata: + namespace: simple-system + name: metrics-service + labels: + control-plane: controller-manager +spec: + ports: + - name: https + port: 8443 + targetPort: https + selector: + control-plane: controller-manager +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: controller-manager + namespace: simple-system + labels: + control-plane: controller-manager +spec: + selector: + matchLabels: + control-plane: controller-manager + replicas: 1 + template: + metadata: + labels: + control-plane: controller-manager + spec: + containers: + - command: + - /manager + args: + - "--metrics-addr=127.0.0.1:8080" + - "--enable-leader-election" + image: example/simple:latest + name: manager + resources: + limits: + cpu: 100m + memory: 30Mi + requests: + cpu: 100m + memory: 20Mi + - name: kube-rbac-proxy + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + args: + - "--secure-listen-address=0.0.0.0:8443" + - "--upstream=http://127.0.0.1:8080/" + - "--logtostderr=true" + - "--v=10" + ports: + - containerPort: 8443 + name: https + serviceAccountName: foo + terminationGracePeriodSeconds: 10 +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: foo + namespace: simple-system diff --git a/pkg/cli/alpha/config-gen/testdata/serviceaccountgenerate/config.yaml b/pkg/cli/alpha/config-gen/testdata/serviceaccountgenerate/config.yaml new file mode 100644 index 00000000000..ffba93569de --- /dev/null +++ b/pkg/cli/alpha/config-gen/testdata/serviceaccountgenerate/config.yaml @@ -0,0 +1,13 @@ +apiVersion: kubebuilder.sigs.k8s.io/v1alpha1 +kind: KubebuilderConfigGen +metadata: + name: simple +spec: + crds: + sourceDirectory: ../project/... + + controllerManager: + image: example/simple:latest + serviceAccount: + name: foo + generate: true \ No newline at end of file diff --git a/pkg/cli/alpha/config-gen/testdata/serviceaccountgenerate/expected.yaml b/pkg/cli/alpha/config-gen/testdata/serviceaccountgenerate/expected.yaml new file mode 100644 index 00000000000..4f487aef691 --- /dev/null +++ b/pkg/cli/alpha/config-gen/testdata/serviceaccountgenerate/expected.yaml @@ -0,0 +1,306 @@ +apiVersion: v1 +kind: Namespace +metadata: + labels: + control-plane: controller-manager + name: simple-system +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: (unknown) + creationTimestamp: null + name: bars.example.my.domain +spec: + group: example.my.domain + names: + kind: Bar + listKind: BarList + plural: bars + singular: bar + scope: Namespaced + validation: + openAPIV3Schema: + description: Bar is the Schema for the bars API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema ' + type: string + kind: + description: 'Kind is a string value representing the ' + type: string + metadata: + type: object + spec: + description: BarSpec defines the desired state of Bar + properties: + foo: + description: Foo is an example field of Bar. + type: string + type: object + status: + description: 'BarStatus defines the observed state of ' + type: object + type: object + version: v1beta1 + versions: + - name: v1beta1 + served: true + storage: true +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: (unknown) + creationTimestamp: null + name: foos.example.my.domain +spec: + group: example.my.domain + names: + kind: Foo + listKind: FooList + plural: foos + singular: foo + scope: Namespaced + validation: + openAPIV3Schema: + description: Foo is the Schema for the foos API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema ' + type: string + kind: + description: 'Kind is a string value representing the ' + type: string + metadata: + type: object + spec: + description: FooSpec defines the desired state of Foo + properties: + foo: + description: Foo is an example field of Foo. + type: string + type: object + status: + description: 'FooStatus defines the observed state of ' + type: object + type: object + version: v1alpha1 + versions: + - name: v1alpha1 + served: true + storage: true +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: simple-system-leader-election-role + namespace: simple-system +rules: + - apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch + - create + - update + - patch + - delete + - apiGroups: + - "" + resources: + - configmaps/status + verbs: + - get + - update + - patch + - apiGroups: + - "" + resources: + - events + verbs: + - create +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: simple-proxy-role +rules: + - apiGroups: ["authentication.k8s.io"] + resources: + - tokenreviews + verbs: ["create"] + - apiGroups: ["authorization.k8s.io"] + resources: + - subjectaccessreviews + verbs: ["create"] +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + creationTimestamp: null + name: simple-system-manager-role +rules: + - apiGroups: + - example.my.domain + resources: + - bars + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - example.my.domain + resources: + - bars/status + verbs: + - get + - patch + - update + - apiGroups: + - example.my.domain + resources: + - foos + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - example.my.domain + resources: + - foos/status + verbs: + - get + - patch + - update +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: simple-system-leader-election-rolebinding + namespace: simple-system +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: simple-system-leader-election-role +subjects: + - kind: ServiceAccount + name: foo + namespace: simple-system +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: simple-proxy-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: simple-proxy-role +subjects: + - kind: ServiceAccount + name: foo + namespace: simple-system +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: simple-system-manager-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: simple-system-manager-role +subjects: + - kind: ServiceAccount + name: foo + namespace: simple-system +--- +apiVersion: v1 +kind: Service +metadata: + namespace: simple-system + name: metrics-service + labels: + control-plane: controller-manager +spec: + ports: + - name: https + port: 8443 + targetPort: https + selector: + control-plane: controller-manager +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: controller-manager + namespace: simple-system + labels: + control-plane: controller-manager +spec: + selector: + matchLabels: + control-plane: controller-manager + replicas: 1 + template: + metadata: + labels: + control-plane: controller-manager + spec: + containers: + - command: + - /manager + args: + - "--metrics-addr=127.0.0.1:8080" + - "--enable-leader-election" + image: example/simple:latest + name: manager + resources: + limits: + cpu: 100m + memory: 30Mi + requests: + cpu: 100m + memory: 20Mi + - name: kube-rbac-proxy + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + args: + - "--secure-listen-address=0.0.0.0:8443" + - "--upstream=http://127.0.0.1:8080/" + - "--logtostderr=true" + - "--v=10" + ports: + - containerPort: 8443 + name: https + serviceAccountName: foo + terminationGracePeriodSeconds: 10 +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: foo + namespace: simple-system diff --git a/pkg/cli/alpha/config-gen/types.go b/pkg/cli/alpha/config-gen/types.go index 7cdff6c5f0d..e1704c5afaa 100644 --- a/pkg/cli/alpha/config-gen/types.go +++ b/pkg/cli/alpha/config-gen/types.go @@ -97,9 +97,18 @@ type ControllerManager struct { // ComponentConfig configures how the controller-manager is configured. // +optional ComponentConfig ComponentConfig `json:"componentConfig,omitempty" yaml:"componentConfig,omitempty"` + + ServiceAccount ServiceAccount `json:"serviceAccount,omitempty" yaml:"serviceAccount,omitempty"` } -// Metrics configures how prometheus metrics are exposed from the controller. +// ServiceAccount configures what service account is used by the controller-manager. +type ServiceAccount struct { + Name string `json:"name,omitempty" yaml:"name,omitempty"` + + NoGenerate bool `json:"noGenerate,omitempty" yaml:"noGenerate,omitempty"` +} + +// Metrics configures how prometheus metrics are exposed from the controller-manager. type Metrics struct { // DisableAuthProxy if set to true will disable the auth proxy // +optional @@ -205,6 +214,10 @@ func (kp *KubebuilderConfigGen) Default() error { kp.Namespace = kp.Name + "-system" } + if kp.Spec.ControllerManager.ServiceAccount.Name == "" { + kp.Spec.ControllerManager.ServiceAccount.Name = kp.Name + } + if kp.Spec.CRDs.SourceDirectory == "" { kp.Spec.CRDs.SourceDirectory = "./..." } diff --git a/pkged.go b/pkged.go index 70a6fb240ee..1375b081d71 100644 --- a/pkged.go +++ b/pkged.go @@ -9,4 +9,4 @@ import ( "github.com/markbates/pkger/pkging/mem" ) -var _ = pkger.Apply(mem.UnmarshalEmbed([]byte(`1f8b08000000000000ffec5d6b73a2ccf2ff2a5bbcce46869b62d579114c445c358f26723bf5d45330104087cb11f0766abffbbf18103151a3bbd9a4eafca9ad8dccd033cc8deee9df7437ff25bce0258c89f67f89d873e2db792bbef5c2c63c356d33f590652f1a4b3abb7bef2d8836d198c6f6226e442b2f4916219c379cb0112f60e34459e28690fc285c247f19894bb4cf3de2861819be4db489c3e2f72124dac45f069c1b8efdad72ef1b0c83c4f082f85b34776cebdb8b87ecf81b0cfdc843b6f5cd0b92f05be2dadf9cf09be905c6c2b3e35be2867836168e9d9ce84934771a96b15879c13f866f71cca96edd1ac40d3109c313f51037c4d048a04bb4ff4ddc127fdf104f89816ca29d2c52bb484c6c230e03a24d0461f2cd0be2c44059abcd34f9662c0d0f1926b2bf79c137fcc06fd080ae4ddc1062d8cd7a99d56b85f0163f09f73ebbfc7b37d6f8bee3256e6adec2d06ff8c6626e1a891d67fdc3837afa66f6d70b9c866ffb5985f776846b33d3172f7b98b949ec98b821b2615ed871dc7841466257339cad17e1349e1c7bd1405e9c1419f61a5f2d36511296170d23af314f402f7271138bb455bd69c5c63e61c3c3a445b12ce0df6434bc20b11781811ab6b5321656fc9a0c212f4a3cb8cf717da3922a8b2f8cc04a130f1db915a76682ecfd0ddf62f789ac5c2505994aa2da81d835c0418a62b983340ba84afad523135419a7354bf287a97d5b7d0386af481bd1dc5b1337841dc0d0f202a772d930e20054d3a611db1c739093bd5c9b6a8e6b576b6bccb2855e4947b69f25178b709135e4c54f0e57a4139ae9cb8b81c2866b2fecb3abf5fc527eb7787554a2f892f7e2a277c7f64ddbbaf82dbb842e4e2c3c69ae11bbc54f032e209d2d88b20fd9bb6920a79a05a3b49a7cf193385c24d5acc04e928501ed6a5e18e3c9a966452142d5f4eb220bfb05d930415e72901d7b8183ec17e439eec153e34d0c0d841af6da8676b03c762b0df09a2cf3133b4e5078d0bb34888d17dbb58d5c526006e5850d2f2c5ed39cdccf244ffed3303d677f99c4bbebe215f53ddf2e7e1a7e8a122f32f060e18cffa461625bd1c20b928c371337446027f9df869b2451e512ffd98d6a99b96b76919731c36811624698a5d3457607cf7218e381c9787bdef6eca791c9b7225d8c36be72ec75545e34e24d9018d9b82dd220c9bb535cedd7ba91843ee6776fee1443f5263fde64cd2a964e9c2c6088e72c4e165ee0e05b9b00163ffbea8b99246e88a22569e0c1d0aa5c35d2e4057087e9164e66134bdc104b3bb0c245c309911138b7e1c269ac1b3b41e11ad03528f232aa28441b4093ec3bd4f8277b8f2ea5dbf1c773c4e96269ef84ce193a776ebd9ca7782b6fce10bfd3e36cc959419cfdf7ed38369c53d51d2c6a27c52fcdbb74d1225c6fde21a41a6e64c0f9192acf0a8c33b717617a72a2e24d5c30bf6377b377af11db305dd80dd3b3bc457a72343169b23082f8255cf8e788766b38abf012ba20abefef1be2d98e93725f17a408e559e5562ecf1a8656d6c8f67f894b76d243c30b76dbcd5fddb78be130b4ae2fd970c25b3fb47005b2bd883dbccb05b780257efefc7943bce41d3da76db4f13e1c22af61a0c8351a300c5e3ce7bb63078dc4f62394cbc76c836dc70d682f92efbe1118d976a09d6b33d9af65278687f093825caf38a0bc21626f6b136d9ebb21fc8c29b529c034991603188073fec14cab4d502405be93f477403d93ad36d36ad3e42d4583162059067c275b6d3263415efc8f958d733ee419bfcc34267b49b401d76c36290ae029b4b374abd9bc2146c80be6449bbe21a42024da14dba469a6c5df1053cf22da2c096e0831bba2c81b626265159137c45f86f50f74c27f48a2fd6ff206fffbfb86b8cb5a1a4736cc9ef994fd000eb02cd76c02f28618c5590e0d7892a4418bf979430c2fa02f7bf8f386e85c492f788bc4bdac0cc7365986fe79433c959321a010ce63dc5d01cdf34962c8ec4e17194e7e43b403fc3b88236361e3cb7171998dcbdf78a1b9f97aa8d5d65a6dadd5d65a6dadd5d65a6dadd5d65a6dadd5d65a6dadd5d65a6dbd466d2d385ad68bb973a13af0cb3aeccf1bc23212633782995a1324fb67ef9f801bf607b4e88611046162245e18dcee286f37868fceabd7274bed546dd06ced746d26536b8f2bd9806bd34c9ba66e29866e019e21d9374af68b81e277b46c9a06ad56a96583032d9b273f50cbe659ae49ef345a8e62298a6bb6e8d35a76464f951af0ae8ba7b5ec93f45768d92d12d074b3d4b2f13cecd4ecd657aad9d926fcb5aabd5fdff9cd5c91ae6ac07b1d76afb0e6ef4aa1af16ebe35061adaaa139f52b5695eb8c7b4e5633b78f676ea7594bc9f5089b8e1d43d11c5d7d700668b4d295612a53b26788fcd2a087e998923796887c4319b996283f9bb4bcd1a8692af7d04a7fbaf3b4ecfe03704dbf1be8aae4493dc0777c802cb13bd7d489fbe8848e247653d3e7494d9d4426c56e715ee7cec1653b20d114d6d5297933f0d17240a1d4f0e599d50133ed09f8d0e79347efcec9da3998b3aea9c85b287667fa93c0bf3cf14d7b73973efbdd244f83adaef6294361838132423018ffc8cae90a3bc7ed72fef52fe2d3787c18248b10217b71215efa96be64e51cf94bb029d5a201c5d3bf0d9bb2870c1dfc49d814b000f017c3a6450f2f864df7f49733748a6c019e67f60c9d236bdcb4c64d6bdcb4c64d6bdcb4c64d6bdcb4c64d6bdcb4c64d6bdcb4c64dffc7a185b71aead7a0a76fdad120c177234ddceff8d5b806463d5770a77eb30c7b09924ab759a6cdf2b73cc3b6289ea65a1f8ea4521fa878b79a34c7ec945cbe45514c0b70a7f5ee1647f27c49beebe169bdfb24fd157a3745d22c49967a379e861a48ad81d4afe27667b9cc5b44d5f47952eab0cf50946783f9686906938d49ad635ded8f4ac4730e90d5eb471a3d4c2722da6a4a3fd6a75d6089ee18fa3c63ab80ef041895e53ade9d63897202c5b56b89539c963ac236ab7f87a84a1d6166522ca92928d5d5fe769f7f974822eb9aca9493c40468fe34817edfd53660859f332ee91c494489a658e8d113028d965243692d0d5af674a50f0c653dd755294f3f818de677670355d898b4cb3e06da6a309ba6c3bb6a5ddd8d4e0f8bb6e6ff074f77dee0096c756504a03f4d4c116d2d514e074a77aef7fa08d2437ed8615683d95d3abc0f99d1fd782b39953a3ba423796462a9c2d6eaf591a690bcd19b90f03e5c0eb60f9bd1a628fb1c32c37b6735d8483ff665ef12a923250365bdd4e9c912d293b9aef6377fa9938da54cbd23eda4fe7a7e581d3cbf272c6130a98e2d6e9346f1a9257623d397375391df58f7a1f3783f2687ab2add9d63fadd447f0e1ddce6def0c7fe7942aa29201bf71211afb64753fb01dc8647fa52aea1445326733823d7c3194cf3317ce01eefef9861e7d818c8295e6f4f20d6b3b157a54457d648a3279149315e27489a9228a77a47e05fc6e15722e70d92fabeb24d370ce7f155d2fd64b19d6c6758ee42d9ceb60177dbe438a6c5737f40b6d37f4eb6d38064d9b3b21d006e475ef6f09c6c3f417f856c67298a244129dbf134d4b2bd96ed5f27db4fb28ab792fdd839e944615dcd5f230973cb682f957b1364aa42aca913b4931890169056e1e455c951e5f0ef4904984999de6be97ab003189b749f7cf4eed84c8a56e9a44e5937ad2bfdd0a4f8c5401d2118e8083a87120bf6fa4b4be46726b5e2a4eee47e5a95f03d7d69f6e4449f82a5a5b0e41b0925e6f953b14b1af7a133a02709ecf08bc7de30b176e3b7c9cf6db39d05a4e48de5a354df8099aef64978427ae2b3e3bb57edf465577fe053b337e7a41e96e8655b2c9f8f2d05a013e38b9f7530b6943c83be4c3ebe1a0b5d947d4d9563eb012c7571ca49f7e3cdf0753b8ab2cf455b8ff433c9db1f35ed8d804c7fecbca8e48faf94b03cff1d867e140676905c2362cf94dbcb5870898c65da806db3d42d001c07489ee13f5cc6327f4ec63224d7e4c11919dba4d9d2b0a8ece119197b8afe0a19dba2289e6d55642ca8656c2d63bf50c69ee115a785ec38138ebdfed214d708ce4b43a32c3f81229fea0a4b6634ba8f82c17ca7d2dc6186ba17b402a92b60658a5d527f2e04406faf56e7aa2a56d15d4361110caa42952c858ea974d34c353e1090a755dc4c10fb860279adda07c497c25ca5464bd3d7237dc3b29a02e24335f33dc1ba53e7cb3149b4621c5e09fac4a4e5d4ea0aae253a9cd4e1f10601fa7c6c8a591b76e5fb2fbbf28300b9a6b2aa3e2f1b2fa0a1a20ef100ce7829c705f1bb3ea7b6d24dcc52300a9449ad81a9c8272089f37dd8e53d2bddd56b81fc666ebc72dcbfd0f86b61bd63edb5b07ed72996062d96fb7de3ae439f589efd93c65d14db6c9e51445f09b0bc83e4c5c65d7bfacb85240d48aed96ad53eb1b56d576ddb55db76d5b65db56d576ddb55db76d5b65db56d576ddb55db76fdff416b16d61719732dac8c609977f81ae4f964a9d26eab495f7cb6cb825b40b13c4f51a0f9e1b833f7e770671670806c9d3ddb65418923ef7a78f66cf738fd352a758b64786e6fb7954d438d3bd7b8f3a771b2d30ce537cf7231eca923188c2293624a0b2cabd7772d510eece7d029eb29ce2dcbb33f72141b8a9c5a0f05e4bb0d7fd8749c4822f225515e979662c8429aef2e4d2ad90ee623048349a4fb68a6a91334a57800fd111aa0090bc5a923f91364791286baf75069b76329ecdc14a79cd44b9a59bd96d8252db5f0e57d1809180e0d92e6e04940666f8470ba845b878e25ba11dc0811dcdc79aac878524fdeeacad8d1d4a1a33d092b53ecce74c55d9ae204416fe598f424d4d53e6da823248988947a56648a2b47f3a70ef4e5ffe8ca88c4e58379563792c4eecad89d357b826fd292a3f97264fad0d1fcb56bfa715c6d8f16c8599da84ff791245a4b436103a937594abd11b23a426475f2f375e809005228d537026988d337fec552c75d424f5899f40499c124d294756c3f09aed4135c4b1c85f95cb04bab53d683cf85074a094f4795e302771cc8a92eaed1a327dceb5b723fa6c5796ee53c7863f968561e3d54cedf212db81a55ced56325efa08e33e7f591464dab742b4d9d848fdedd121f3bf85f70cebcb0e3305dc03cf2e46909be27db896c9afa354f67966e72cdb707c6d762e19918ab0aeee69f03c35b7c8ba6af081099f7f072307c4f7f85e4666886a99c18e3d9a8d1f01a0dafd1f01a0dafd1f01a0dafd1f01a0dafd1f01a0dafd1f01a0dff5fc490f60ae9a762e1e5631b7bf7c2ef0bd3805705843c5b74a760731c7521264eb749f6966d8226c7d0f4c7db62b7fe1c26ce5134db3a8789b37c8bdd91973d3c83899fa2bf42b366c91660f69a359e861a13af31f14fe267ef30963fe8bcec775786bc87cca55edfd39461aaa9326988fcc65023d712d1d2f4d8c5636f889d8dadd9c30f8342a97e1f3a636a0d203d4110f597a638fd612a32a92913d7121f30fcbeb3fedd8787c4b069027bfda5dd9b27d0e7637d1c6d2c658d5d7f064f820b45d4833e0f606fc849ddd8cbdb22a7968861f6ac9da9b175b7031f2d2544fe903ac24657474b4bedcf7435b7f41e3c09a44925c80cfac8f211b2e8614647e96adf83dbd05136fd19f465d712a79e3a0e130c794fad8d49cbabe2be6ba993d0a4fb91ed774943e1d3811f3370c346e6a66f65cf80bebccdc36deeaca64907d2b287c3638add59960fe9cb9e3f78227f68aa10c9bebc81145a9ab3d0c91dc0d933ede0a9e1385a180a3b7ff4847bb3276f2d51de4cb3319df623d39f44a60f7f6d4e947d799c96fb489f614bfdfdfcdc5fd0c655e848621299fe98931e46b1a58e485ded3f99d41a5db13eb696d2c7c714c51ad9f5f9390f273a42636534c356f477d9f37656eb13a4fb5d60f6c63f2e85f3074f64f2e98ed57b36508d0e7bd559fbe972a5153b495e186f9a6dd3fc6d8b0414dd04fcc7c79bfec8af3af16c93298fc3199a6b7274ab7936de74932ec39e945d3c176ffa04fd155b8b2668e5a15b9ef6f3506f2deaadc5676d2dcef0863f1c66da1b3a323e4ed697a6b85e5af9916da2296ca4fbf2d6ea0df7aed59ee04abd1132452d81140a4c5f9e4b22da425a46d013eea79ee09afed8d19ef2235f43d1238dea92fa53768ff9216d8491898f9f274b8d96135d6149491cb9a62778fa93e067b241ef08aed51142ab37c964fc724065b4c3f458986bdc76b2fbf43c478f936de8c86277a353320937c27df6fce7d29be96e35983dac257114eaca6821892e69f584eda3d75aea223f831bf6f51135de43e90ab3c4de6eea881cd0131752c97640cb2b9deebbba988d139fc95f6477d8d012419c8d21f4eeb27e7ad9bec1288ebf0db19bea94bc7db38f137178ed64ef75f566bfd087f408e8aa74f9fe8092633d18453ac522bd03a25df94b656bc5db6fab2b6b7f5accf3a327345f4eec818e8620a7b575c72ff7140726186f439b177b814a9bb2b5b93b9a377d9894aeea62257cf941ff2b21cd0fcc4d262924f3fbbbfddf6b57f26c6f32088e8e470a697d56ec558f990ca4c743aab35bcbcfd66cb1eff6d8d8a4462ef6e4dbbd2f68b757bbabecbd8a7b8577de6e8ecfcce95657461b5d9d3c9e0c43e0e521002a26294599b1635128363b426ad2e3dccca4d747ba8f185d19c7526f14997e6e8ad2a787b92eb3f3302ccc500c3adbcbf289a146a8e391c960fc5526128d5f72bb7fcfe79eba34ae0dc3b729eab6450192a100fdd1716d58f223bffef10ae76935791a9cf3b9679b5ce9435ff6f01cce7382fef2cd18036892e3f631eba83aae4dbd19fbd4cdd825fef5b9d1e1bbe8ce6869aac2d2f42b468b1bb66bfa5dcf14a74efea18fd7e8ce81e4cccb90c0857751a2ab135717bba4868de0de06b6192805fdea524999d1ad5dcd97e3d237bef44b5fe13079a63f7de5ab2eed772c4e5491e217fab3df878ee44947b4f84ff02daf4ef2ebd00a57dacd9f2f5d7e7684a69a171e16706d006e798e26499a62dffaa4ffae10f9c82f8ebc12227c93e6b0c67dda80be592200650fcf1ad01fa7bf4288302c4d57bed39ccf432d456a29f27952e41d16b117276f142a5558c14345f0415785d8a411569a4f2a5027d9f4a789834accb6113245796689fc66176ec454baa446b9434de923b3f7266ccc85cfc8eaee2328ae238dea6e1fbdbbf589a8aeafc46511ea44ec7abab23e8c3c7aedf3af8b3f373329ac1ccf5f473b1d946163aa91450517fad69bc8a88327808a6d43628ab2ab8b99b897635d196130bf1aeac55080abef95fc77b62879a4da43ff852321610ec2eaf4112cfc285e85d4c9d64f642ae875a89d7c8c680164f335bc1792c3f03a5939804c85dfd8cfa133dc0a2363fc262eddda523020c5bd2d3b5a5959b9e7bb95f9aa1c5e070a58c260ce49f7d2ea5999efe3d989f2c654505a7c53ad07fdee4c9705047db4d4bb238443e6f4869c74ffb0da2bb8e4a53e2f2e1491a2abfd6d363f8f9e507d9fcb43918377d9bbbb18a879df9741880fdf33a10c593450b37bec41d96a84e46a4cc4c193b02ae21f92a3fb22d26e6f92ad51647585250cc69cd4dbf9dbc449eea791c758c4c08532224d5a3ad78683504a1510aedc22e6fe20936c4ccbf1ff7387ab95ed77773f9e47013875b4d29451d687fd37f48abcddfbb47f8f6412fa68062ba013beff8a1f9561ae3a38d4569ac769ac84bef2f640db9939dbad8d1c482dfca8e09188ca56019aeea22def232a63001069f4640967bf220b72b0f0d3c347ed25b0652f6d1446be1d24bbb8a4df631b2eecab50a28b6b296123faa28fc6d26d966cb3e096a4388e6518e6e361a33ff7a9031e507c13bbb49e848d5a7b17d85d07cfa146c7c9afd8ef375986e2f83d6844d75f8cadb7fb9fb8ddbf984d1c41913ec075f5b50a51b5ff9916a1744f9fbbbc15dfbb4fbf5eba1da9a052a4d91ba60625b33bb138a527aed59377fd19e8ea7cb785c1b41ade5e1ca5bd1fe76ac9578b924c16c49101ed6b24c7a942253604980b050568b3cc2dc33314cd50e0e305c59f8b9bcf531cc7600fcad376a4a0242f7b78d68ef438fd15a282679b74256e3e9e865a54d4a2e2b344c529be701a10aa72f3aa92f196a3ff0e7873fc24becae53f91e3468bd0b713d74eaffa58c9c952a5733c7f693c1bba4df3b7140368966bb6980fe7b97f2e8e3acf907c8b3bf3fdef164782d260aeece1d9ef901da7bf9ce7b2a04903c0eebde2f93a9e4dcd733f91e79e640cbf72a85b41950ac46fba8b4e32054bd347a4491fdf969b0a9f1aea6409f1d739d89949f79189cddbf8e4c064aa449ee49149b19125f29be3dbf74b10fd774e073c90e8ea646328a3ed4029db7f29827812bdab989221d39fac4c0aa515f436c923c6e060eae5f34b64b757208b85a9de093431d1d4c9cc787825f4ae45d1bed674e95a1fb5338e69806c5d2add9836e06f01437134c9311f7fd8fc9111d05f4937966c82b39e691cc996d2aaece159e9769cfe0ae94637c916dddc6b14781e6af1568bb7cf126f67fdd1bece67a96a135bb10f5633262c7b59fd86c2069d00a79f7445c3f564ed9dd0fda5a5de5de2eb960998e36d1dbfabd15485e006fb3b0523a0f911d268fc71caa4b4cddd0b6441a346f86b22d53e979fb4bad846f943fcc9721fad0beca90ffa7ce4f8389f93e9e576e2811ce77e7c6465be84d2c65af2a4533e7f85359895686a2ed82d5fde6841793fd0d5f18ffccb26eb08d2c575cfc2e1e57675147e79c53d79a58b5d12cf778774a0d82535ca29ea98205394b37baffd077f141ff1f44ef909eebe98622add15dcf0db220460d547b0788685f2cfa8918ea50a736ce35e1c9de20dcaddf5cfd6551d99c1e4d8f8947dc7c7a3bfe91bfa9beff4b18f9ebef14dbc784d7d940f63f7702d9f3a9e1d646d5626d9bb5f98aa64e3f4357ce0bd0d67be0db0ebe06f75f0b73af85b1dfcad0efe56077fab83bfd5c1dfeae06f75f0b73af85b1dfced5a44eae7ff010000ffff010000ffff5a3234d444bb0000`))) +var _ = pkger.Apply(mem.UnmarshalEmbed([]byte(`1f8b08000000000000ffec7d6973a2ccf6f85799e27566645752755f04131147cda3896cb79e7a0a1a0268b35c16b75bf3ddffd50d22c668742693a9fffd515313e9e674d31b673f87ff127ef812a5c4ed7f89d477d36f8b4efacd8f5a8bdc72acdc87b693b4960cba7bef27c42dd19aa54e92b6e2959f654904162d376aa509689d684bdc1072104749f6979979c4edb947dc10633370885be2b0f97d04885be22f132c4cd7f952bbf705446166fa61fa255eb88efde5c5874efa054441ec43c7fee28759f425f39c2f6ef4c5f24333f19df41b71433c9b89eb642766122fdc966d262b3ffcc70c6c9e3d35ad6f2671434ca3e8443fc40d313233e011b7ff26be117fdf104f99091de2364b72a72c4c1d338d42e29608a3ec8b1fa69909d1a8ad3cfb622e4d1f9a1674bef8e117fcc02fc0049e43dc1052d443b344fdda11f8869f84678f2effdead35beeffa99975bdf4014b40233595866e6a4687e78514fdf447ffdd06d054e803abc7762dc9b95bff8e861d6267352e28640cb9c3869da7a8166e6d42bdcad1fe332de1c2769413fcdca0a678daf924d9c45d545cb2c7a2c0ac08f3d3cc4b26cd76fdaa9b92f38e0b068d31c470947152d3fcc9c243461cbb1576662a7afc120f4e3cc07fb1a2f306ba5aa796286769ef9f08d5b696e65d0d9df086c6e5f40ed6a25c0d60af509a49e491d94688e3f2873145d2bbf7a64066bebb4e648e1b0b41f6b6082e815682b5ef86be286704210d97ee8d62e5b661a52f5b265a60ecf1ed4a0976b53aff19c7a6fad393ae8b572ec04a89824518206f212648727d28dacfce5c58451cb7312e7ec693d7f94df6d5e5f9538bde4bdb8e8dd7102cbb12f7ecb2e814b331b6f9a67a65ef9d3020960d081a8e680de4d13baf52a10e7f5e24b90a55192d5ab4227cb121338f5ba28c59b53af8a2308ebe5d74d12e7053a20837e76509dfaa10b9d17e8bbdec153d34d0a4c085bceda014eb87ceb561ee23359d5674e9ac1e8607679989a2f8ee79805a5c008ca8f5a7e54bea6057880284ff1d3b27c777f99a5bbebf2150dfcc0297f5a410e333f36f162e18affe451e6d871e28719c2cdc40d113a59f1b7e565595cbbc47f76ab5a55ee865dd621641827114684a89c27e80edee528c50b83707b3176f4d342f4ad2c97ab8daf5c671d5717ad741366265ab7240fb3623ae5d5feac9b5914607c7774a75caaa3fa748386551e9d344b4084f72ccd123f74f1ad4d08ca9f7df7e54e12374439923cf44164d7ae5a79f642f187e50e2ea28d256e88a513da51d272236886eeb728715bebd68e507826f04c9abc0c2a8ee0866248ee1d68fc83dea34be176f8f11c709e2c9d1dd13903e72dec97f310c7f4e60cf03b334647ce0e53f43f70d2d4744f757770a8dd1cbf34efc2c549b4debc0348b7bcd8048b3350be1d9a676e27517e72a3d24d5a22bfb7eea277af953a204f9c96e5db7e929f5c4d0c9a256698be4449700e687786518797c085a8bfbf6f886727cd2abe2ecc212caa2a56aea81a45361ae4ed7f894b38e991e9873b76f367f976291a45f6f52d5b6ef42d886cdc81e224a98fb95cea1bc5113f7efcb8215e8a899e93366e311f0ea0df3261ec992d10852fbefbd575c256e604312ce82362b09db4059c24fb1a98a189d881db429a41bfb693993ec44f0a0bb9e200f28648fdad43dc0afc0d1120a4744b536c9bedb0144be19a7f30d2ba256892a6be92cc578a7ea6f85b96ba65b96f1cc973ed4e9b63be929d5b12a1203ffdc746eb5c2c39c29748627296c42dc5b7db6d9a26f1163aa8dc69b76f8831f4c30571cbdc10721811b734d7614881ebdc1033df266e3992ba212474851a4e6dd4117943fc65daff0037fa87246eff4ddee07f7fdf107768a469ec00f4cc27f443f114c7093c457237c43845351cc508144d92ed1f37c4e812f8dd0c7fdc10dd2be1453fc9bc0bdb300cc9747edc104fd5668830028b144f57848b62935812dde941d32d6e484e887f87696c260ebe9c9497685dfec607cd2bce4323b636626b23b636626b23b636626b23b636626b23b636626b23b63662eb35626b89d1d02c16ee85e2c04fcbb03f6e08dbccccdd0a22b126ccf6cfde3f010fec3748d12d330ca3ccccfc28fcb683fcb63103785ebc3ed96a276a53edce4ed6669158fbbe90cdb36d9aa18e84ec1713a6ef48d90c43753a95944d1d4ad9c2c749d93c49f114bf9368599662d9b6d0662f97b28b295e2e6557f0d748d96d9ae7db95948df761276677fea4988d98f0d7a2f6fe7c17370b41ba2e01ef65d8bdc05abc2ba5bc5a9e8f4381b52e8616d0af50552133ee315983dc3e1eb99d462d15d6231c26754d55770dedc11dc2f1ca5047b9422bbe29094b9319e5135ad9d8120c4c75ecd992f26c31ca46a767b9d2872be3e9ced7d1fd07cab3825e6868b22ff729a11b50d0967a0b5d9b7a8f6ee4ca522fb70281d4b5696cd1dc16d775ef5cdcb64b65baca7906ad6c86015c0e69989b8132b7bbd45c7fa2021008d9a37fe7a2710e179c67a9ca1648bdb9f1240a2f4f42dbd9dce5cf412f2bcad4d6d006b4a972e1501d43104ebea37686ca2df0b8dc7ffd8bf8341c1f85591241e82417ea4b8fe12b54ce933fa5366d5314c9d19d5f569b7207081d0de677a94d3b02cf51147f31422f67783142dfc35f81d0dbbc40f1f41ea1f364a3376df4a68ddeb4d19b367ad3466fdae84d1bbd69a3376df4a68ddeb4d19bfe8fab168e25d43fa33d3d1a478ba4be9a79e67dc5afc6356ad4730d77e237c772576a523b6d86a2858fd6a4f2d46fd4a47224d5a199cb35a9c5142fd7a456f05708de1d8aeef0542578e37d6834a98d26f54fa1bbb368e658a56a05022977b9672029f3e162bcb4c2e9c6a2d7a9a10dc695ca734141bb3f887566944f25b8d5d5416acc7a942d79131008aca3514237c46a59beebdfb9b6a464405a7bb634c365b92b6e51ff3b95aadc15e716cd91ba0a73431b6cf7f577992c719ea5ce7859ca283d9865201878fa865ae1e74c2a38579660a6ab367cf4c55067e4dc543b4b93517c431d50a6ba5e189a5c949fa88d1ef4e6434ddc588cc73d86fa6a389fe5a3bb7a5fbd8dc18ccab116ff874f77fef089da1aea9802c12cb324b8b525251faabd85d11f40c08c8451975d0de777f9e83e62c7f793adecd6faec92aeec9399ad895bbb3f80ba4a0a667f4a82fb6839dc3e6cc69bb2ed73c48eeeddd570237fdfb7bdcbe4ae9c0dd5f5d260a64bc04c178636d8fca54d37b63af3df1827fdd7f3c3eae0f97d7109c2697d6df198745ac86da9175b81b29949c2c6be8fdcc7fb09395ad5e1ee5c2be865c673e4e231f747dff7cf13735da5d0ba572af1fa78746d10826df4c65caa3394e9ea7401e6e47a340779b1860ffce3fd1d3beabeb5064a8ecfdb13951a68ed353933d435d499696cd1acdf0db3b62c29b9d115859749f42755e72d92feba722c2f8a16e955e4fd64b31d716739fe3ae2de264992edb43f9cb8d3bf93b8b3a4205cee8c5c4ef172ad7a057f0571173846680b1571c7fbd010f786b8ff39e27e12571c93f6b72ca55395f3f4600d658c2ee33d59ee4fa1a589a9ae4de18e640046847a0d95d749471dc5bf4712002233fdd7e4f580059858cc807cf4ef384446eb7072b7ea9b31d44164d14232d4c610840604ee21c902fdc1d29684b945af78b937bd9fd5497cdf585a7d253366d4d25639f288444945fd4cea91e67de40e996906ba42f2d81f65f66efd3685e516b1168056367600736343cd0d6d408213e4135b8fef5e8d33503ce341c8adfe8297fb98a45763b10321b5550a9e585ffcac83b5a595390814f2f1d55a189212e89a92da0fd4d29066bc7c3fd98c5e8fa36cfb5c8ef58d7966c5f8e3b6b311a1154cdc178dfcfe2749ac207c05511047a11366d7d0d833edf64496ba92c8521c45d3f4871359e67712d90ed7be22e2a79ce215a6eb1dfce544b64d914c87a26b44966a886c4364ff20913d832c4e53d909a28efdc1d292d6102c2a5f23549f0149c80d9523118c11c070b8d809357718a3ee29ad481a2ab5b2a41e693c9714a0bf17ac0b61150be99ea972108475aa4a5654c7527b39128e0f28e469211751e2c05481a0d7e700858a9a6bf4786905466c6c384e57a9f450d07c8fb2ee04fa6a4d32bd5c8757943eb31825b77ba2674b2e2f7705cc218040482d098d61d77ef0b26b3f0ca167a9abfaf3d07a513a2cfb900e141a2fd5ba406137e7dc517b9955514691b6e83565a9ca09a5c4f939ecea9ed5deea35453eda1bbf5af73fe8ff95d8ef387c25f6afc6c5b6198ae7986345f3afc5c5f2ecef74f06a737c47b89c4a1633bc9c4a56f05750499aef7468ba898b6dfcbb1affaec6bfabf1ef6afcbb1affaec6bfabf1ef6afcbb1affaec6bfebff8eba26b1ff9043576223806531e16b74cf275b55be5b6de64acd33c3f342e7e335cfdc6fd43cf30cc35ea3792ea678854cbd83bf42a6662892636bbe5b681f1acd73a379fe3454761aa3fca239172b3e0d08c2716cd16ce58565f7079e2d29a1f31cb9553fa5e9b232ff91e3d45495dc7e2895bedbe8bbc3a4992cc140969475e52d066da807ded2a2b3ed703186209cc64600e7ba3685335aa04030864338e5803473e5600a6d5fc6caeebdb2b4d7b5556e6149335eee676dd4af2df5485b2b037a1fc622568886597bf82442ab3f86b85c295c47ae2d7931d88831d8dcf99ac4fa725fd91aeac4d5b591ab3f892b4beacd0dd55b5ad214027fe55acc3432b401636a63284b9094fb766c492b570f662e0894ff18ea98c4edc305ea1bca526f65eecccdbe18588cecea81125b0170f560ed59419ad6c7a3870aea130e980194257b69aa5c28f7a74bb93f8676578ced6e616207be48011ae6c646244d697614642c77bd25f0c595c54ca1154e635d5da7ce93e8c97dd1b3a57154ec05b7b4bb553fd8343c542b05755c3318789350c90d690d1f7df1ded892fb352d4dba3593f0c60ee0bc323ed44cf080113d9daef6eab15677d0c719937dacd3b33adc4ad7a6d1a37fb7c48687e00f989a13278df20414e9274f93f03dd88e66331c7da9369c79a6b85b96b9a53bdf78bedda6589afc756d38f58a74f31f48badb02490a15e9a6589262db5ce724e9c6f09d1d7c35c593a4fb34fc15a49bed301d81ab4837de8e461fdee8c31b7d78a30f6ff4e18d3ebcd18737faf0461fdee8c31b7d78a30fff5f5422ed25d24fd586578f6ded630cbf269609ae4a0b79b6e94ec26e93ecbb5af143d19ae4a80ef7b111cd02c3d0eddf255a5354471004813ced6976242a1753bc5cb4aee04f8bd6afdbf00223f0e43ee809ef43a3156fb4e29f84d0dec12cbf318439e8ad4c65af3497fb035f5747b9ae29a429091b538b3d5b824bcbe792c7fe08871cdbf387ef260d73e33e7227f49a02cc140238585ad2ecbba52aa4ae4e3d5b7ac00af89d07f03e4b24569c66a03f583afd450602213526f1c656d738fe67f8247a40827d100814e88f78b997fac55894dc96b0a21d8d3337b7de7618c0a50cc9ef7257dc18da78696b83b9a115dedec32791b4e80c5ae100da018436334270b4a10d7cb08d5c7533988340f16c69e66b9328c34aef99bdb1186555def76c6d1a59cc2076821e69aa423e0c52166cb8d8da0c6cf40c1028db22ebe6ce739a7401a3f8384ba6d49ba37ac05cf6fce113f95dd7c45809940da0e1d29a476e1106ce9d1987408f267162aadce2d117efadbeb2b5256533436b3a1bc456308dad00fcdc9ea8fbf6b8ac0ca031c7defafbfdb9bf608cabc895a52cb682092f3f8c535b1b93863678b2e835bce27c6c6d75800d15e519d9cdf9b9c82a3a8613753cc79ef477e879a5e77a696039fb8ec09d925e11757a8cbdf96be3f87ea92160f844669f1e96bd471ff5e4b25799e94fb7ab3ce049f24a437d9b651886fb7043fd077e14eac850df6628161bc52f34d41753bcdc505fc15fa1ede73b6d9e27f7ceef24d9b0240d4bf2792cc919dcf09bb354fb2357c18668636949eba55d187b335de5622350b6767fb48fcbf6454fee8fa125e919a0616805ca4296e016300a04be783ff345cf0a26aefe54188b4d15e1fa1e693ca17bec7779238e2d6cb89e2e7546c90c95236569ec59bee81b4f6280688ad1153dbb2b46767f8a7883e59046b0a3fcad2cd978ec64efe979011fa7dbc855a4dec6a015126cc47bf4fce72a12ea6e359c3fac65691c19ea3891258fb4fbe2f6d1ef2c0d4998830df7dab88d792f43659738524e1b934366ea013adb0e1965653003cf90d03a09886e43a7cb45b644a5680d817f87e6e9237ec32c0de7a6d4cb0d5ad91ef17f12cece9ded23b68ef88c0160c694a1c997f315b4921ae13836680e1a5d2adeb5bf94b6d62205b786ba0e66e53e3ffa62fbe504eff4660673465f77838a173970de38ce8c7ec043e031a1b3b933ea5b01c8aa3877a996fdfc60feb58ce8078e2ad31c90c5fd1ddff83a0e1df134c3f0cdf5c80163cc4b1ef72d6783fced8cecdcd60ed0992df9759f4b2d7aece128c0ddfb02773cde5d8d672bef95917dbb3d3eb3a75b431d6f0c6dfa783287815fe40fa839b3946d26ae4dc3d4ea8ab9c54c0a0795fe001a01640d7592cafd716c058513cb80191532d02e3ab174603119c4030b99a9c5b0eb93d970f2a79c2b5a3f15b3ff5ec03e7d6d569c0ec50a14fbe1ccd8effc7648bb4d732479313356cc90bc9819dbc35fc18c75588a66f6df0ea19ba4380d33f6a9ccd825b1f985bbe2bb5aa1f1d2d2c4a515d4dc1d375ccf0a7abe25cddce23b21afb5420794b36843521eb88b33439b7a86d42375ec3e779c1567a896f0ab4b2925825b7b7aa0a4555c7d15d3bec249f6ac60f62ace5dde732c6e5ca3e217c6c2df47aeeccb6f48f19f10975edfe4d76919ae74b93fdfbafa6a09db793febcba1958121295af8782bc3478af4afac0c02c509451ab30bad0cc5142fb73254f0975b19da34c576d8fd779e8b8d68c84843463e8f8cbc8323f6f4e448a2d2c4153894041f0c4d4c2d0662a9f9a40475124f7f1a3da8657c1b434b52e6b6246c76b94a2cb547eab437d2d501b4fa4739672e7c06ea7b0081b48e75bab77df4efd62792c2bea297659e14a9e71beafa3071e9b5cfbf2e7bdddca2b174bc789d2c7558e59ca92726153d10d8478955874f142cf986cc9214cf9010bd5752431d632b403d4f8ca9529e415fa8955f14896e0f431fdec8277390936700411982f12a1f0f3a3fb1a5c2d7797a8a3562440aedd7e85ecc0e73f3a07614b45461e33c47ee682b8ecdc95156bbb5ad628d147fdc76bcb251bbe7bb95f5aa1d3e072ab504e18297efe5d5b3baa8859b70f057ac1672308546d0a3acfec43f58bffe719be7bac6e69d9c4eb35d98c4ac37d76981b2c2c9fefb6e58ca26f7f97caa674e2108a8d82aad425366e0e9b43231b4416cd1d36703f38653fcbe8cee0a4dce111f7b1072739843ea358eaa5b26abf14e0e7854b7d25469e395ae8e11afbaff565d59b79b8375224ba0a98e0bebd5abf7b6ca25d5c5f9acf283b6ab3a1eaa272a268b6c91f791bbcf042992ba36080d6d5a66893c9109f20d7cf6d6180e725cf9542d63e54e4352ec1d5ad3da395cdaddbb7c8670ca86bbafe7a5da6b31b9b1a14d37a63ade0e17d318d0081728a2ad4da319b6e04174363c2041d5d0065b74061e7db14e432a0bdedbf4e312da50e5a9aa922d57213d1f4a3b0ef7eccd64d11866c2cbf72e39bedfd54d11ee8476afbc576a7ab105992e70a5c5c83bfa50e5ff1a6a62aaab1cce80595ffb9a46f84f5b1d6d67e9c0280e9c30db6568fd9a3a2071ae52795ddc4ba50363aefc806e8765dbed8f5782b57fe7671f3a5c87e42effec4339c5cb956015fce54ab00e4b5202bf7792c2fbd0482f8df4f259d2cbc598e20dadd80704f1bec36de0bcc2a7ed48bb67a62575c29a31fc25dc4bed60352d1b69f547b9492bdc8e7b993153cfee2bbbf90c0d6db1f35fc1b07ac145bc057b3f2928e98efbfadcac8cfbdd45e4208d4de05c433c4e35aa745dd4fb0eb587b4821348aec37c38adf89d5f11e8080245d297d38a628a97d38a0afe0a5ac1310227ecbd57f03e34b4a2a1159f452b4e2186d30aae3a3aaf0b83c728fd57048ab75d0bea68fe13516e9c448193794e7ed5b75b4eb6aaf2040857e6f6e9b41996a6f80f47babf33abbcc0b09d6b18f4628a9723dd0afe0aa4cb77a80eb5b72fe07d68906e83743f0be99ec40c3f63a6ae052f94197ff62a486a690590b498b719734b1572539b2e01fe580937b79801b4b0c39e901d3881f52a95e8d8a2b9d89684cdafaba14e607e9fca2a55995a8d1f31e8e9a1e9e13a1550cd390e5ac17465d130afa9a3b3227b0e4e2d5f3d7faf9ebd482595e9da746e3ebca27a3fad6afc23ce58d786eb9d89d1a328be7da5f99c63d9b6d0f970f3f9473a61bd369f7324cb9c495d7764da2ea678b9f9bc82bfc27ccef21c29b46b3205da8886be35f4edb3e8dbd9d0bc3f17be5577f3adb93c6b080b2b3eeadf54b9b01be2f293a1eab81f34de293358dadadd25617f88c2bc3dd6c9bb324d9d0a6e70e85738a6f420863a830d2a59e56edc3b36521ecdf9970c951753f48f08c92bc2dc2e702d3f58ab370ce9c55ece2e77990f95b40885246bfb2c56c62bd9974f854d968e7176a66b05476007ca460fabfba1a14dbe171f8859c78029affb36ced1b7eba30c6d2cef292b43ea91f89c6063678fd469b7ec630a2d4941f75e87607e2fbf86ea9f0ab5dc7d78c6527b2bb011b6651ec57a9865f90c1b169fa3235d5b1317d8ddbf18e70a733677d73fdbd00c6885d3b7d6a79a3b36cefd6278ed2fe282b7be1e7b14de79f199faa830d0dee1593e65801fa231ab5384334a23375aa7ffbff0c72772b8a9932c7de07c350188f2eb820ece37adccaee4fba10798ede5c85b96fb26501cd569f3ecc7666c161886213f94ed65d976a54111689ea728ee1cd7cbb295c2a59ae139aef704fc155c6f9b64589ad95b5dc926f4a0617a3f91e93d8f1d7e3235c5db0e6ccb29ade4863640f4f37207af3d9e3e4f1f3f05ef1f6838de359f166fa0d3245e6d12af3689579bc4ab4de2d526f16a9378b549bcda245e6d12af3689579bc4abd70a833ffe1f000000ffff010000ffff89f5564cc6c20000`)))