github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/staging
History
Kubernetes Submit Queue 1bbd9dfa11 Merge pull request #39810 from enj/enj/f/and_selectors 
Automatic merge from submit-queue (batch tested with PRs 40703, 40093, 40618, 40659, 39810)

Add AndSelectors helper function

I needed a simple way to logically `AND` two `Selectors` in https://github.com/openshift/origin/pull/11909 for [this](7259bf7596/pkg/oauth/registry/oauthclientauthorization/etcd/etcd.go (L95-L114)).

This seems like the cleanest way to express that intent.

Signed-off-by: Monis Khan <mkhan@redhat.com>
 		2017-01-30 17:14:57 -08:00
..
src/k8s.io Merge pull request #39810 from enj/enj/f/and_selectors 2017-01-30 17:14:57 -08:00
README.md make modifications for README 2016-12-02 09:54:16 +08:00
copy.sh move workqueue to client-go 2017-01-30 09:08:21 -05:00
godeps-json-updater.go move pkg/client/transport to client-go 2017-01-18 07:56:01 -05:00
prime-apimachinery.sh k8s.io/apimachinery scripts 2017-01-11 08:15:34 -05:00

README.md

This staging/src/k8s.io/client-go directory is the staging area of the client repo. It contains a versioned client, tools built around the client like the reflector, and all the client dependencies. The content will be periodically published to k8s.io/client-go repo. The staged content is copied from the main repo, i.e., k8s.io/kubernetes, with directory rearrangement and necessary rewritings. To sync the content with the latest code in your local k8s.io/kubernetes, you need to run godep restore in k8s root directory, then run staging/copy.sh. vendor/k8s.io/client-go is a symlink pointing to this staging area, so to use the packages in the staging area, you can import it as "vendor/client-go/", as if the client were vendored. The client will be vendored from k8s.io/client-go for real after the test matrix is converted to vendor k8s components.