1
0
mirror of https://github.com/rancher/types.git synced 2025-08-24 15:08:37 +00:00

testing vendor norman

This commit is contained in:
Sebastiaan van Steenis 2020-06-24 17:45:57 +02:00
parent d21f6b7b59
commit c8d73ccbed
4 changed files with 6 additions and 6 deletions

2
go.mod
View File

@ -13,7 +13,7 @@ require (
github.com/knative/pkg v0.0.0-20190817231834-12ee58e32cc8
github.com/pkg/errors v0.9.1
github.com/rancher/lasso v0.0.0-20200515155337-a34e1e26ad91
github.com/rancher/norman v0.0.0-20200517050325-f53cae161640
github.com/rancher/norman v0.0.0-20200609220258-00d350370ee8
github.com/rancher/wrangler v0.6.2-0.20200515155908-1923f3f8ec3f
github.com/rancher/wrangler-api v0.6.1-0.20200515193802-dcf70881b087
github.com/sirupsen/logrus v1.4.2

4
go.sum
View File

@ -537,8 +537,8 @@ github.com/rancher/lasso v0.0.0-20200515155337-a34e1e26ad91 h1:p4VVl0tr6YAeUILFM
github.com/rancher/lasso v0.0.0-20200515155337-a34e1e26ad91/go.mod h1:G6Vv2aj6xB2YjTVagmu4NkhBvbE8nBcGykHRENH6arI=
github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 h1:Xsxh7fX3+2wAUJtPy8g2lZh0cYuyifqhBL0vxCIYojs=
github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod h1:wpITyDPTi/Na5h73XkbuEf2AP9fbgrIGqqxVzFhYD6U=
github.com/rancher/norman v0.0.0-20200517050325-f53cae161640 h1:wZT4IWBeMfKewJ+ZSCuOFjHh+voTJWYQo7jTd/ZtE90=
github.com/rancher/norman v0.0.0-20200517050325-f53cae161640/go.mod h1:92rz/7QN7DOeLQZlJY/8aFBOmF085igIVguR0wpxLas=
github.com/rancher/norman v0.0.0-20200609220258-00d350370ee8 h1:sdwsGWHCCbMX6uz2jRKfhUoaqc+VFHrfgEzgFbV1XUg=
github.com/rancher/norman v0.0.0-20200609220258-00d350370ee8/go.mod h1:92rz/7QN7DOeLQZlJY/8aFBOmF085igIVguR0wpxLas=
github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e h1:j6+HqCET/NLPBtew2m5apL7jWw/PStQ7iGwXjgAqdvo=
github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e/go.mod h1:XbYHTPaXuw8ZY9bylhYKQh/nJxDaTKk3YhAxPl4Qy/k=
github.com/rancher/wrangler v0.6.2-0.20200515155908-1923f3f8ec3f h1:QPOlhiY3YCPLsEtOmPam+ghtqip/f/zsfz4F4PF70D8=

View File

@ -296,7 +296,7 @@ func (s *Store) realWatch(apiContext *types.APIContext, schema *types.Schema, op
ResourceVersion: "0",
}, metav1.ParameterCodec)
body, err := req.Stream(apiContext.Request.Context())
body, err := req.Stream(s.close)
if err != nil {
return nil, err
}
@ -305,7 +305,7 @@ func (s *Store) realWatch(apiContext *types.APIContext, schema *types.Schema, op
decoder := streaming.NewDecoder(framer, &unstructuredDecoder{})
watcher := watch.NewStreamWatcher(restclientwatch.NewDecoder(decoder, &unstructuredDecoder{}), &errorReporter{})
watchingContext, cancelWatchingContext := context.WithCancel(apiContext.Request.Context())
watchingContext, cancelWatchingContext := context.WithCancel(s.close)
go func() {
<-watchingContext.Done()
logrus.Tracef("stopping watcher for %s", schema.ID)

2
vendor/modules.txt vendored
View File

@ -75,7 +75,7 @@ github.com/rancher/lasso/pkg/controller
github.com/rancher/lasso/pkg/log
github.com/rancher/lasso/pkg/mapper
github.com/rancher/lasso/pkg/scheme
# github.com/rancher/norman v0.0.0-20200517050325-f53cae161640
# github.com/rancher/norman v0.0.0-20200609220258-00d350370ee8
github.com/rancher/norman/clientbase
github.com/rancher/norman/condition
github.com/rancher/norman/controller