diff --git a/go.mod b/go.mod index 7e03261b..58bf47b0 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/coreos/prometheus-operator v0.33.0 github.com/knative/pkg v0.0.0-20190817231834-12ee58e32cc8 github.com/pkg/errors v0.8.1 - github.com/rancher/norman v0.0.0-20200206042542-ef3920abad1c + github.com/rancher/norman v0.0.0-20200210173039-40f8d46bcfce github.com/sirupsen/logrus v1.4.2 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c // indirect k8s.io/api v0.17.2 diff --git a/go.sum b/go.sum index dd6f2c39..4d5b3de2 100644 --- a/go.sum +++ b/go.sum @@ -468,6 +468,8 @@ github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 h1:Xsxh7fX3+2wAUJtPy8g github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009/go.mod h1:wpITyDPTi/Na5h73XkbuEf2AP9fbgrIGqqxVzFhYD6U= github.com/rancher/norman v0.0.0-20200206042542-ef3920abad1c h1:+tnpw/MTI6nLCY61dEOyXUhW25Brr2R8awoewEf5R68= github.com/rancher/norman v0.0.0-20200206042542-ef3920abad1c/go.mod h1:b+483H276jRBXYosdWrNKFpxH+JYMs3UIdlV60dhdg0= +github.com/rancher/norman v0.0.0-20200210173039-40f8d46bcfce h1:7mcUz6jN1LLKPpbxQctDXeYDE+t13LP2zoRo/FW4VZc= +github.com/rancher/norman v0.0.0-20200210173039-40f8d46bcfce/go.mod h1:b+483H276jRBXYosdWrNKFpxH+JYMs3UIdlV60dhdg0= 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.4.1 h1:kQLE6syPbX4ciwU4OF+EHIPT9zj6r6pyN83u9Gsv5eg= diff --git a/vendor/github.com/rancher/norman/controller/generic_controller.go b/vendor/github.com/rancher/norman/controller/generic_controller.go index 51269b19..e2a86152 100644 --- a/vendor/github.com/rancher/norman/controller/generic_controller.go +++ b/vendor/github.com/rancher/norman/controller/generic_controller.go @@ -176,7 +176,7 @@ func (g *genericController) addHandler(ctx context.Context, name string, handler if g.synced { for _, key := range g.informer.GetStore().ListKeys() { - g.queue.AddRateLimited(key) + g.queue.Add(key) } } diff --git a/vendor/github.com/rancher/norman/generator/type_template.go b/vendor/github.com/rancher/norman/generator/type_template.go index 2a640dcf..7bf11ddc 100644 --- a/vendor/github.com/rancher/norman/generator/type_template.go +++ b/vendor/github.com/rancher/norman/generator/type_template.go @@ -38,6 +38,7 @@ type {{.schema.CodeName}}Client struct { type {{.schema.CodeName}}Operations interface { List(opts *types.ListOpts) (*{{.schema.CodeName}}Collection, error) + ListAll(opts *types.ListOpts) (*{{.schema.CodeName}}Collection, error) Create(opts *{{.schema.CodeName}}) (*{{.schema.CodeName}}, error) Update(existing *{{.schema.CodeName}}, updates interface{}) (*{{.schema.CodeName}}, error) Replace(existing *{{.schema.CodeName}}) (*{{.schema.CodeName}}, error) @@ -98,6 +99,23 @@ func (c *{{.schema.CodeName}}Client) List(opts *types.ListOpts) (*{{.schema.Code return resp, err } +func (c *{{.schema.CodeName}}Client) ListAll(opts *types.ListOpts) (*{{.schema.CodeName}}Collection, error) { + resp := &{{.schema.CodeName}}Collection{} + resp, err := c.List(opts) + if err != nil { + return resp, err + } + data := resp.Data + for resp, err = resp.Next(); resp != nil && err == nil; resp, err = resp.Next() { + data = append(data, resp.Data...) + } + if err != nil { + return resp, err + } + resp.Data = data + return resp, err +} + func (cc *{{.schema.CodeName}}Collection) Next() (*{{.schema.CodeName}}Collection, error) { if cc != nil && cc.Pagination != nil && cc.Pagination.Next != "" { resp := &{{.schema.CodeName}}Collection{} diff --git a/vendor/modules.txt b/vendor/modules.txt index 6539bfcf..e970fc94 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -53,15 +53,15 @@ github.com/hashicorp/golang-lru/simplelru # github.com/json-iterator/go v1.1.9 github.com/json-iterator/go # github.com/knative/pkg v0.0.0-20190817231834-12ee58e32cc8 => github.com/rancher/pkg v0.0.0-20190514055449-b30ab9de040e +github.com/knative/pkg/apis/istio/v1alpha3 github.com/knative/pkg/apis/istio github.com/knative/pkg/apis/istio/common/v1alpha1 -github.com/knative/pkg/apis/istio/v1alpha3 # github.com/konsorten/go-windows-terminal-sequences v1.0.1 github.com/konsorten/go-windows-terminal-sequences # github.com/mailru/easyjson v0.7.0 -github.com/mailru/easyjson/buffer github.com/mailru/easyjson/jlexer github.com/mailru/easyjson/jwriter +github.com/mailru/easyjson/buffer # github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 github.com/matryer/moq/pkg/moq # github.com/matttproud/golang_protobuf_extensions v1.0.1 @@ -79,37 +79,37 @@ github.com/prometheus/client_golang/prometheus/internal github.com/prometheus/client_model/go # github.com/prometheus/common v0.9.1 github.com/prometheus/common/expfmt -github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg github.com/prometheus/common/model +github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg # github.com/prometheus/procfs v0.0.8 github.com/prometheus/procfs github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util -# github.com/rancher/norman v0.0.0-20200206042542-ef3920abad1c -github.com/rancher/norman/clientbase -github.com/rancher/norman/condition +# github.com/rancher/norman v0.0.0-20200210173039-40f8d46bcfce github.com/rancher/norman/controller -github.com/rancher/norman/generator -github.com/rancher/norman/httperror github.com/rancher/norman/lifecycle -github.com/rancher/norman/metrics github.com/rancher/norman/objectclient github.com/rancher/norman/objectclient/dynamic -github.com/rancher/norman/pkg/broadcast github.com/rancher/norman/resource github.com/rancher/norman/restwatch -github.com/rancher/norman/store/proxy github.com/rancher/norman/types -github.com/rancher/norman/types/convert -github.com/rancher/norman/types/convert/merge -github.com/rancher/norman/types/definition -github.com/rancher/norman/types/factory github.com/rancher/norman/types/mapper -github.com/rancher/norman/types/slice +github.com/rancher/norman/condition +github.com/rancher/norman/types/convert +github.com/rancher/norman/clientbase +github.com/rancher/norman/store/proxy +github.com/rancher/norman/types/factory +github.com/rancher/norman/generator +github.com/rancher/norman/types/definition github.com/rancher/norman/types/values +github.com/rancher/norman/metrics +github.com/rancher/norman/types/slice +github.com/rancher/norman/httperror +github.com/rancher/norman/pkg/broadcast +github.com/rancher/norman/types/convert/merge # github.com/rancher/wrangler v0.4.1 -github.com/rancher/wrangler/pkg/name github.com/rancher/wrangler/pkg/ratelimit +github.com/rancher/wrangler/pkg/name # github.com/sirupsen/logrus v1.4.2 github.com/sirupsen/logrus # github.com/spf13/pflag v1.0.5 @@ -117,12 +117,12 @@ github.com/spf13/pflag # golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 golang.org/x/crypto/ssh/terminal # golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 -golang.org/x/net/context -golang.org/x/net/context/ctxhttp -golang.org/x/net/http/httpguts golang.org/x/net/http2 +golang.org/x/net/http/httpguts golang.org/x/net/http2/hpack golang.org/x/net/idna +golang.org/x/net/context/ctxhttp +golang.org/x/net/context # golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/oauth2 golang.org/x/oauth2/internal @@ -133,139 +133,151 @@ golang.org/x/sys/unix golang.org/x/sys/windows # golang.org/x/text v0.3.2 golang.org/x/text/secure/bidirule -golang.org/x/text/transform golang.org/x/text/unicode/bidi golang.org/x/text/unicode/norm golang.org/x/text/width +golang.org/x/text/transform # golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 golang.org/x/time/rate # golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c -golang.org/x/tools/go/ast/astutil -golang.org/x/tools/go/gcexportdata -golang.org/x/tools/go/internal/gcimporter -golang.org/x/tools/go/internal/packagesdriver golang.org/x/tools/go/packages golang.org/x/tools/imports -golang.org/x/tools/internal/fastwalk +golang.org/x/tools/go/gcexportdata +golang.org/x/tools/go/internal/packagesdriver golang.org/x/tools/internal/gopathwalk -golang.org/x/tools/internal/imports -golang.org/x/tools/internal/module golang.org/x/tools/internal/semver golang.org/x/tools/internal/span +golang.org/x/tools/internal/imports +golang.org/x/tools/go/internal/gcimporter +golang.org/x/tools/internal/fastwalk +golang.org/x/tools/go/ast/astutil +golang.org/x/tools/internal/module # google.golang.org/appengine v1.6.1 +google.golang.org/appengine/urlfetch google.golang.org/appengine/internal +google.golang.org/appengine/internal/urlfetch google.golang.org/appengine/internal/base google.golang.org/appengine/internal/datastore google.golang.org/appengine/internal/log google.golang.org/appengine/internal/remote_api -google.golang.org/appengine/internal/urlfetch -google.golang.org/appengine/urlfetch # gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 # gopkg.in/yaml.v2 v2.2.5 gopkg.in/yaml.v2 # k8s.io/api v0.17.2 -k8s.io/api/admissionregistration/v1 -k8s.io/api/admissionregistration/v1beta1 k8s.io/api/apps/v1 -k8s.io/api/apps/v1beta1 -k8s.io/api/apps/v1beta2 -k8s.io/api/auditregistration/v1alpha1 -k8s.io/api/authentication/v1 -k8s.io/api/authentication/v1beta1 -k8s.io/api/authorization/v1 -k8s.io/api/authorization/v1beta1 -k8s.io/api/autoscaling/v1 -k8s.io/api/autoscaling/v2beta1 k8s.io/api/autoscaling/v2beta2 k8s.io/api/batch/v1 k8s.io/api/batch/v1beta1 +k8s.io/api/core/v1 +k8s.io/api/extensions/v1beta1 +k8s.io/api/networking/v1 +k8s.io/api/policy/v1beta1 +k8s.io/api/rbac/v1 +k8s.io/api/storage/v1 +k8s.io/api/apps/v1beta1 +k8s.io/api/authentication/v1 +k8s.io/api/admissionregistration/v1 +k8s.io/api/admissionregistration/v1beta1 +k8s.io/api/autoscaling/v1 +k8s.io/api/apps/v1beta2 +k8s.io/api/auditregistration/v1alpha1 +k8s.io/api/authentication/v1beta1 +k8s.io/api/authorization/v1 +k8s.io/api/authorization/v1beta1 +k8s.io/api/autoscaling/v2beta1 k8s.io/api/batch/v2alpha1 k8s.io/api/certificates/v1beta1 k8s.io/api/coordination/v1 k8s.io/api/coordination/v1beta1 -k8s.io/api/core/v1 k8s.io/api/discovery/v1alpha1 k8s.io/api/discovery/v1beta1 k8s.io/api/events/v1beta1 -k8s.io/api/extensions/v1beta1 k8s.io/api/flowcontrol/v1alpha1 -k8s.io/api/networking/v1 k8s.io/api/networking/v1beta1 k8s.io/api/node/v1alpha1 k8s.io/api/node/v1beta1 -k8s.io/api/policy/v1beta1 -k8s.io/api/rbac/v1 k8s.io/api/rbac/v1alpha1 k8s.io/api/rbac/v1beta1 k8s.io/api/scheduling/v1 k8s.io/api/scheduling/v1alpha1 k8s.io/api/scheduling/v1beta1 k8s.io/api/settings/v1alpha1 -k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 # k8s.io/apiextensions-apiserver v0.17.2 -k8s.io/apiextensions-apiserver/pkg/apis/apiextensions -k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 -k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset -k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 +k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 +k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme +k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 +k8s.io/apiextensions-apiserver/pkg/apis/apiextensions # k8s.io/apimachinery v0.17.2 -k8s.io/apimachinery/pkg/api/equality +k8s.io/apimachinery/pkg/runtime/schema k8s.io/apimachinery/pkg/api/errors -k8s.io/apimachinery/pkg/api/meta -k8s.io/apimachinery/pkg/api/resource -k8s.io/apimachinery/pkg/apis/meta/internalversion k8s.io/apimachinery/pkg/apis/meta/v1 -k8s.io/apimachinery/pkg/apis/meta/v1/unstructured -k8s.io/apimachinery/pkg/apis/meta/v1beta1 -k8s.io/apimachinery/pkg/conversion -k8s.io/apimachinery/pkg/conversion/queryparams -k8s.io/apimachinery/pkg/fields k8s.io/apimachinery/pkg/labels k8s.io/apimachinery/pkg/runtime -k8s.io/apimachinery/pkg/runtime/schema -k8s.io/apimachinery/pkg/runtime/serializer -k8s.io/apimachinery/pkg/runtime/serializer/json -k8s.io/apimachinery/pkg/runtime/serializer/protobuf -k8s.io/apimachinery/pkg/runtime/serializer/recognizer -k8s.io/apimachinery/pkg/runtime/serializer/streaming -k8s.io/apimachinery/pkg/runtime/serializer/versioning -k8s.io/apimachinery/pkg/selection k8s.io/apimachinery/pkg/types -k8s.io/apimachinery/pkg/util/cache -k8s.io/apimachinery/pkg/util/clock -k8s.io/apimachinery/pkg/util/diff -k8s.io/apimachinery/pkg/util/errors -k8s.io/apimachinery/pkg/util/framer +k8s.io/apimachinery/pkg/watch +k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/util/intstr +k8s.io/apimachinery/pkg/api/resource +k8s.io/apimachinery/pkg/conversion +k8s.io/apimachinery/pkg/util/runtime +k8s.io/apimachinery/pkg/util/wait +k8s.io/apimachinery/pkg/api/meta +k8s.io/apimachinery/pkg/apis/meta/v1/unstructured +k8s.io/apimachinery/pkg/runtime/serializer/json +k8s.io/apimachinery/pkg/runtime/serializer/streaming +k8s.io/apimachinery/pkg/util/validation/field +k8s.io/apimachinery/pkg/fields +k8s.io/apimachinery/pkg/selection +k8s.io/apimachinery/pkg/util/sets +k8s.io/apimachinery/pkg/util/validation +k8s.io/apimachinery/pkg/conversion/queryparams +k8s.io/apimachinery/pkg/util/errors k8s.io/apimachinery/pkg/util/json k8s.io/apimachinery/pkg/util/naming k8s.io/apimachinery/pkg/util/net +k8s.io/apimachinery/pkg/util/cache +k8s.io/apimachinery/pkg/util/clock +k8s.io/apimachinery/pkg/util/diff k8s.io/apimachinery/pkg/util/rand -k8s.io/apimachinery/pkg/util/runtime -k8s.io/apimachinery/pkg/util/sets -k8s.io/apimachinery/pkg/util/validation -k8s.io/apimachinery/pkg/util/validation/field -k8s.io/apimachinery/pkg/util/wait -k8s.io/apimachinery/pkg/util/yaml -k8s.io/apimachinery/pkg/version -k8s.io/apimachinery/pkg/watch +k8s.io/apimachinery/pkg/runtime/serializer k8s.io/apimachinery/third_party/forked/golang/reflect +k8s.io/apimachinery/pkg/runtime/serializer/recognizer +k8s.io/apimachinery/pkg/util/framer +k8s.io/apimachinery/pkg/util/yaml +k8s.io/apimachinery/pkg/apis/meta/internalversion +k8s.io/apimachinery/pkg/runtime/serializer/protobuf +k8s.io/apimachinery/pkg/runtime/serializer/versioning +k8s.io/apimachinery/pkg/apis/meta/v1beta1 +k8s.io/apimachinery/pkg/api/equality # k8s.io/apiserver v0.17.2 -k8s.io/apiserver/pkg/apis/apiserver k8s.io/apiserver/pkg/apis/apiserver/v1alpha1 -k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 k8s.io/apiserver/pkg/apis/config +k8s.io/apiserver/pkg/apis/apiserver +k8s.io/apiserver/pkg/apis/audit # k8s.io/client-go v2.0.0-alpha.0.0.20181121191925-a47917edff34+incompatible => k8s.io/client-go v0.17.2 -k8s.io/client-go/discovery +k8s.io/client-go/rest +k8s.io/client-go/tools/cache k8s.io/client-go/dynamic k8s.io/client-go/kubernetes -k8s.io/client-go/kubernetes/scheme +k8s.io/client-go/util/workqueue +k8s.io/client-go/rest/watch +k8s.io/client-go/pkg/version +k8s.io/client-go/plugin/pkg/client/auth/exec +k8s.io/client-go/tools/clientcmd/api +k8s.io/client-go/tools/metrics +k8s.io/client-go/transport +k8s.io/client-go/util/cert +k8s.io/client-go/util/flowcontrol +k8s.io/client-go/tools/pager +k8s.io/client-go/util/retry +k8s.io/client-go/discovery k8s.io/client-go/kubernetes/typed/admissionregistration/v1 k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1 k8s.io/client-go/kubernetes/typed/apps/v1 @@ -309,41 +321,29 @@ k8s.io/client-go/kubernetes/typed/storage/v1beta1 k8s.io/client-go/pkg/apis/clientauthentication k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1 k8s.io/client-go/pkg/apis/clientauthentication/v1beta1 -k8s.io/client-go/pkg/version -k8s.io/client-go/plugin/pkg/client/auth/exec -k8s.io/client-go/rest -k8s.io/client-go/rest/watch -k8s.io/client-go/tools/cache -k8s.io/client-go/tools/clientcmd/api -k8s.io/client-go/tools/metrics -k8s.io/client-go/tools/pager -k8s.io/client-go/tools/reference -k8s.io/client-go/transport -k8s.io/client-go/util/cert k8s.io/client-go/util/connrotation -k8s.io/client-go/util/flowcontrol k8s.io/client-go/util/keyutil -k8s.io/client-go/util/retry -k8s.io/client-go/util/workqueue +k8s.io/client-go/kubernetes/scheme +k8s.io/client-go/tools/reference # k8s.io/gengo v0.0.0-20191120174120-e74f70b9b27e k8s.io/gengo/args k8s.io/gengo/examples/deepcopy-gen/generators -k8s.io/gengo/examples/set-gen/sets k8s.io/gengo/generator +k8s.io/gengo/types k8s.io/gengo/namer k8s.io/gengo/parser -k8s.io/gengo/types +k8s.io/gengo/examples/set-gen/sets # k8s.io/klog v1.0.0 k8s.io/klog # k8s.io/kube-aggregator v0.17.2 -k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/v1 +k8s.io/kube-aggregator/pkg/apis/apiregistration # k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a k8s.io/kube-openapi/pkg/common # k8s.io/utils v0.0.0-20191114184206-e782cd3c129f -k8s.io/utils/buffer -k8s.io/utils/integer k8s.io/utils/pointer +k8s.io/utils/buffer k8s.io/utils/trace +k8s.io/utils/integer # sigs.k8s.io/yaml v1.1.0 sigs.k8s.io/yaml