1. 11 May, 2016 5 commits
    • k8s-merge-robot's avatar
      Merge pull request #25414 from derekwaynecarr/quota_int_test_improvements · bfccd929
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      Quota integration test improvements
      
      This PR does the following:
      
      * allow a replication manager to get created that does not record events
      * improve the shutdown behavior of replication manager and resource quota to ensure doWork funcs exit properly
      * update quota integration test to use non event generating replication manager, reduce number of pods to provision
      
      I am hoping this combination of changes should fix the referenced flake.
      
      Fixes https://github.com/kubernetes/kubernetes/issues/25037
      bfccd929
    • k8s-merge-robot's avatar
      Merge pull request #25162 from mikebrow/devel-tree-80col-updates-C · 7339b7c0
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      devel/ tree further minor edits
      
      Address line wrap issue #1488. Also cleans up other minor editing issues in the docs/devel/* tree such as spelling errors, links, content tables...
      Signed-off-by: 's avatarMike Brown <brownwm@us.ibm.com>
      7339b7c0
    • k8s-merge-robot's avatar
      Merge pull request #25369 from liggitt/cached-watch · aa8fddb7
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      Return 'too old' errors from watch cache via watch stream
      
      Fixes #25151
      
      This PR updates the API server to produce the same results when a watch is attempted with a resourceVersion that is too old, regardless of whether the etcd watch cache is enabled. The expected result is a `200` http status, with a single watch event of type `ERROR`. Previously, the watch cache would deliver a `410` http response.
      
      This is the uncached watch impl:
      ```
      // Implements storage.Interface.
      func (h *etcdHelper) WatchList(ctx context.Context, key string, resourceVersion string, filter storage.FilterFunc) (watch.Interface, error) {
      	if ctx == nil {
      		glog.Errorf("Context is nil")
      	}
      	watchRV, err := storage.ParseWatchResourceVersion(resourceVersion)
      	if err != nil {
      		return nil, err
      	}
      	key = h.prefixEtcdKey(key)
      	w := newEtcdWatcher(true, h.quorum, exceptKey(key), filter, h.codec, h.versioner, nil, h)
      	go w.etcdWatch(ctx, h.etcdKeysAPI, key, watchRV)
      	return w, nil
      }
      ```
      
      once the resourceVersion parses, there is no path that returns a direct error, so all errors would have to be returned as an `ERROR` event via the ResultChan().
      aa8fddb7
    • k8s-merge-robot's avatar
      Merge pull request #25437 from zmerlynn/gke_test_custom_cidr · bf7dad01
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      GKE provider: Add cluster-ipv4-cidr and arbitrary flags
      
      cc @roberthbailey @a-robinson @cjcullen
      
      <!-- Reviewable:start -->
      ---
      This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/25437)
      <!-- Reviewable:end -->
      bf7dad01
    • k8s-merge-robot's avatar
      Merge pull request #25377 from freehan/kubenetmutex · 9f00ed60
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      modify kubenet mutex and add timer
      9f00ed60
  2. 10 May, 2016 35 commits