Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DO NOT MERGE] openshift picks for 1.6 #29

Closed
wants to merge 71 commits into from
Closed

[DO NOT MERGE] openshift picks for 1.6 #29

wants to merge 71 commits into from

Commits on May 22, 2017

  1. UPSTREAM: 43375: Set permission for volume subPaths 

    :100644 100644 20413aa49f... 0a7a566aad... M	pkg/kubelet/kubelet_pods.go
    @pmorie @deads2k
    pmorie authored and deads2k committed May 22, 2017
    Copy the full SHA
    c1960ce View commit details
    Browse the repository at this point in the history

  2. UPSTREAM: <drop>: Run make-update – vendor/ changes 

    :100644 100644 a5552f408a... 472a8454d9... M	pkg/api/v1/zz_generated.deepcopy.go
:100644 100644 b7e8d4e865... 98bbf4dc39... M	pkg/api/zz_generated.deepcopy.go
:100644 100644 2bbd414ad2... 903e622541... M	pkg/apis/authorization/v1beta1/zz_generated.deepcopy.go
:100644 100644 19ccebdaaa... 727fe25dda... M	pkg/apis/authorization/zz_generated.deepcopy.go
:100644 100644 07047c2b06... 391bd75cb0... M	pkg/apis/autoscaling/v1/zz_generated.deepcopy.go
:100644 100644 8639502a97... e3b184eef6... M	pkg/apis/autoscaling/zz_generated.deepcopy.go
:100644 100644 a5f0163a4e... 84339f9281... M	pkg/apis/batch/v1/zz_generated.deepcopy.go
:100644 100644 8e3ff29e75... 2548d2fd03... M	pkg/apis/batch/zz_generated.deepcopy.go
:100644 100644 c3d4fbee0d... 1d9257353c... M	pkg/apis/componentconfig/v1alpha1/zz_generated.deepcopy.go
:100644 100644 733137549d... 9e6e4eaa88... M	pkg/apis/componentconfig/zz_generated.deepcopy.go
:100644 100644 5188d3ed76... 0afe73c8b1... M	pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go
:100644 100644 d2187b5e42... 1685daaf1e... M	pkg/apis/extensions/zz_generated.deepcopy.go
:100644 100644 b5f7360e26... a4de96301d... M	staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go
:100644 100644 b75b3ebb22... 9e7167cfa5... M	staging/src/k8s.io/apimachinery/pkg/runtime/zz_generated.deepcopy.go
    @sttts @deads2k
    sttts authored and deads2k committed May 22, 2017
    Copy the full SHA
    8c1cfd5 View commit details
    Browse the repository at this point in the history

  3. UPSTREAM: 44861: NotRegisteredErr for known kinds not registered in t… 

    …arget GV

:100644 100644 c9a0e1696d... 8f9b8c38f1... M	staging/src/k8s.io/apimachinery/pkg/runtime/error.go
:100644 100644 fbec6ad9bc... dd87b4911e... M	staging/src/k8s.io/apimachinery/pkg/runtime/scheme.go
:100644 100644 f0bf8b35d9... b019e3d4ec... M	staging/src/k8s.io/client-go/dynamic/client_test.go
    @sttts @deads2k
    sttts authored and deads2k committed May 22, 2017
    Copy the full SHA
    f10894b View commit details
    Browse the repository at this point in the history

  4. UPSTREAM: 44859: e2e: handle nil ReplicaSet in checkDeploymentRevision 

    :100644 100644 4d9ce2b94c... 59ad47a9bf... M	test/e2e/deployment.go
    @sttts @deads2k
    sttts authored and deads2k committed May 22, 2017
    Copy the full SHA
    81b85c7 View commit details
    Browse the repository at this point in the history

  5. UPSTREAM: <carry>: add OpenShift resources to garbage collector ignor… 

    …e list

:100644 100644 703840ecf7... 87c3bf4aa3... M	pkg/controller/garbagecollector/graph_builder.go
    @ncdc @deads2k
    ncdc authored and deads2k committed May 22, 2017
    Copy the full SHA
    3df0384 View commit details
    Browse the repository at this point in the history

  6. UPSTREAM: 44570: Explicit namespace from kubeconfig should override i… 

    …n-cluster config

:100644 100644 92c1a5a006... f3eb6a40a4... M	staging/src/k8s.io/client-go/tools/clientcmd/merged_client_builder.go
:100644 100644 791327ec8e... b9a684a839... M	test/e2e/kubectl.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    9247337 View commit details
    Browse the repository at this point in the history

  7. UPSTREAM: 44221: validateClusterInfo: use clientcmdapi.NewCluster() 

    :100644 100644 41fb23bdfb... 6441f14837... M	staging/src/k8s.io/client-go/tools/clientcmd/validation_test.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    00ea260 View commit details
    Browse the repository at this point in the history

  8. UPSTREAM: <carry>: openapi test, patch in updated package name 

    :100644 100644 517a280dea... c29f226bc8... M	staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi_test.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    1d05e4b View commit details
    Browse the repository at this point in the history

  9. UPSTREAM: 00000: make AsVersionedObjects default cleanly 

    :100644 100644 c77502bfec... c018a4973a... M	pkg/kubectl/resource/result.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    3358bea View commit details
    Browse the repository at this point in the history

  10. UPSTREAM: <drop>: disable apiserver loopback loop in generic context 

    :100644 100644 23a36e9510... 3731720d67... M	staging/src/k8s.io/apiserver/pkg/server/hooks.go
    @sttts @deads2k
    sttts authored and deads2k committed May 22, 2017
    Copy the full SHA
    b2dcff4 View commit details
    Browse the repository at this point in the history

  11. UPSTREAM: 44730: Check for terminating Pod prior to launching success… 

    …or in StatefulSet

:100644 100644 6389d79117... 87cf3a9ba9... M	pkg/controller/statefulset/stateful_set_control.go
:100644 100644 2a74eeea89... 78e3ea79dd... M	pkg/controller/statefulset/stateful_set_control_test.go
:100644 100644 71b24b9171... 1f73b05126... M	pkg/controller/statefulset/stateful_set_test.go
:100644 100644 672fd5b165... ab8e3a4a3e... M	pkg/controller/statefulset/stateful_set_utils.go
    @sttts @deads2k
    sttts authored and deads2k committed May 22, 2017
    Copy the full SHA
    4a2e2e1 View commit details
    Browse the repository at this point in the history

  12. UPSTREAM: 44439: controller: fix saturation check in Deployments 

    Signed-off-by: Michail Kargakis <mkargaki@redhat.com>

:100644 100644 68f9c900a1... 8f88969785... M	pkg/controller/deployment/sync_test.go
:100644 100644 ee7b3995c1... af13c59353... M	pkg/controller/deployment/util/deployment_util.go
    @0xmichalis @deads2k
    0xmichalis authored and deads2k committed May 22, 2017
    Copy the full SHA
    856b550 View commit details
    Browse the repository at this point in the history

  13. UPSTREAM: 44970: CRI: Fix StopContainer timeout 

    :100644 100644 8a4e29f7ad... 0b0ef219f7... M	pkg/kubelet/remote/remote_runtime.go
    @sttts @deads2k
    sttts authored and deads2k committed May 22, 2017
    Copy the full SHA
    35b0fbe View commit details
    Browse the repository at this point in the history

  14. UPSTREAM: 41634: Handle error event type 

    :100644 100644 4cdfdacc7e... 6a595b6b34... M	test/e2e/statefulset.go
    @dshulyak @deads2k
    dshulyak authored and deads2k committed May 22, 2017
    Copy the full SHA
    de347c2 View commit details
    Browse the repository at this point in the history

  15. UPSTREAM: 45100: node-controller: deflake TestUpdateNodeWithMultiplePods 

    Use absolute time and increase grace duration to 500ms for tests under load.

:100644 100644 ac6261f79e... 1da538fb79... M	pkg/controller/node/taint_controller_test.go
    @sttts @deads2k
    sttts authored and deads2k committed May 22, 2017
    Copy the full SHA
    0ac3bdb View commit details
    Browse the repository at this point in the history

  16. UPSTREAM: 45105: taint-controller-tests: double 'a bit of time' to av… 

    …oid flakes

:100644 100644 ac6261f79e... 8f5fd7c195... M	pkg/controller/node/taint_controller_test.go
    @sttts @deads2k
    sttts authored and deads2k committed May 22, 2017
    Copy the full SHA
    7816322 View commit details
    Browse the repository at this point in the history

  17. UPSTREAM: 44462: 44489: fix selfLink for cluster-scoped resources 

    We can drop this patch in the rebase to 1.7.

:100644 100644 4d0709d379... e5b43ecadc... M	staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go
:100644 100644 75c5cc0683... e0de327781... M	staging/src/k8s.io/apiserver/pkg/endpoints/installer.go
    @ncdc @deads2k
    ncdc authored and deads2k committed May 22, 2017
    Copy the full SHA
    f958086 View commit details
    Browse the repository at this point in the history

  18. UPSTREAM: 40423: Support for v1/v2/autoprobe openstack cinder blockst… 

    …orage

Signed-off-by: Huamin Chen <hchen@redhat.com>

:100644 100644 8500007745... 0cc537dcd0... M	pkg/cloudprovider/providers/openstack/BUILD
:100644 100644 438b7e97ea... 9183baf134... M	pkg/cloudprovider/providers/openstack/openstack.go
:100644 100644 6916e6c43b... 2f91722b65... M	pkg/cloudprovider/providers/openstack/openstack_test.go
:100644 100644 8fdcc35a4f... 659e4305ac... M	pkg/cloudprovider/providers/openstack/openstack_volumes.go
    @rootfs @deads2k
    rootfs authored and deads2k committed May 22, 2017
    Copy the full SHA
    5a57ddf View commit details
    Browse the repository at this point in the history

  19. UPSTREAM: <drop>: remove hacks for delaying post start hooks 

    :100644 100644 3731720d67... 89ba6288a9... M	staging/src/k8s.io/apiserver/pkg/server/hooks.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    fc87d92 View commit details
    Browse the repository at this point in the history

  20. UPSTREAM: 45171: Use groupName comment for listers/informers 

    :100644 100644 5b39ceeb74... 177a7a6c7c... M	cmd/libs/go2idl/informer-gen/generators/packages.go
:100644 100644 d0a7d94707... 685b38d670... M	cmd/libs/go2idl/lister-gen/generators/lister.go
    @ncdc @deads2k
    ncdc authored and deads2k committed May 22, 2017
    Copy the full SHA
    3f230ed View commit details
    Browse the repository at this point in the history

  21. UPSTREAM: <carry>: Fix to avoid REST API calls at log level 2. 

    :100644 100644 4a4894cee0... fa2eb5773d... M	staging/src/k8s.io/apiserver/pkg/server/httplog/log.go
    @deads2k
    Avesh Agarwal authored and deads2k committed May 22, 2017
    Copy the full SHA
    b79c00b View commit details
    Browse the repository at this point in the history

  22. UPSTREAM: <drop>: resurrect extensions/v1beta1.HPA 

    :100644 100644 4392488ebd... cba56342ca... M	cmd/kube-apiserver/app/server.go
:100644 100644 b145548bf0... 2604a2212a... M	pkg/api/defaulting_test.go
:100644 100644 ee4ca5313e... 331ab2999e... M	pkg/apis/autoscaling/v1/generated.pb.go
:100644 100644 4953624af6... 0d31bb82a3... M	pkg/apis/autoscaling/v1/generated.proto
:100644 100644 acce4fd716... f668e5250a... M	pkg/apis/autoscaling/v2alpha1/generated.pb.go
:100644 100644 27b99c2242... 6dddca1782... M	pkg/apis/autoscaling/v2alpha1/generated.proto
:100644 100644 5983636c22... 192addffe9... M	pkg/apis/extensions/register.go
:100644 100644 38b8c2ac8f... afc126a06b... M	pkg/apis/extensions/v1beta1/conversion.go
:100644 100644 5f14d8160e... d50570b7ff... M	pkg/apis/extensions/v1beta1/defaults.go
:100644 100644 c6b840bbd2... 89af664134... M	pkg/apis/extensions/v1beta1/defaults_test.go
:100644 100644 053cf10dbf... bf9d6a0b3c... M	pkg/apis/extensions/v1beta1/generated.pb.go
:100644 100644 8ba21bc9b4... de142e39fd... M	pkg/apis/extensions/v1beta1/generated.proto
:100644 100644 fa5b2e1b24... 6b03fb0267... M	pkg/apis/extensions/v1beta1/register.go
:100644 100644 3b0a496e49... 8cb79f23a2... M	pkg/apis/extensions/v1beta1/types.go
:100644 100644 c6ccd16ec0... b82c7221af... M	pkg/apis/extensions/v1beta1/zz_generated.conversion.go
:100644 100644 0afe73c8b1... 7fccbfc048... M	pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go
:100644 100644 e9a844a266... 960bf270f8... M	pkg/apis/extensions/v1beta1/zz_generated.defaults.go
:100644 100644 6b7f099ecd... 5bf4eb9fcb... M	pkg/generated/openapi/zz_generated.openapi.go
:100644 100644 95bea0dcc3... 005e9d2bba... M	pkg/master/master.go
:100644 100644 d1ff1b01da... 23e0ebcc06... M	pkg/registry/extensions/rest/storage_extensions.go
:100644 100644 cbf25d15f1... 646938fc74... M	test/integration/master/master_test.go
    @sttts @deads2k
    sttts authored and deads2k committed May 22, 2017
    Copy the full SHA
    a6620e9 View commit details
    Browse the repository at this point in the history

  23. UPSTREAM: 45235: remove bearer token from headers after we consume it 

    :100644 100644 f4fff22d01... 5ca22f38ba... M	staging/src/k8s.io/apiserver/pkg/authentication/request/bearertoken/bearertoken.go
:100644 100644 f48b1b7872... 7b61f4314a... M	staging/src/k8s.io/apiserver/pkg/authentication/request/bearertoken/bearertoken_test.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    6c9e66d View commit details
    Browse the repository at this point in the history

  24. UPSTREAM: 44939: don't HandleError on container start failure 

    :100644 100644 f92017e5d8... 2080ab95ab... M	pkg/kubelet/dockertools/docker_manager.go
    @sjenning @deads2k
    sjenning authored and deads2k committed May 22, 2017
    Copy the full SHA
    13dfe89 View commit details
    Browse the repository at this point in the history

  25. UPSTREAM: 45238: expose kubelet authentication and authorization buil… 

    …ders

:100644 100644 d8f0f388ea... 20e9b3900b... M	cmd/kubelet/app/auth.go
:100644 100644 215ce27d55... a6d548c131... M	cmd/kubelet/app/server.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    23de984 View commit details
    Browse the repository at this point in the history

  26. UPSTREAM: 44625: Retry secret reference addition on conflict 

    :100644 100644 1c2b0fd289... 1193096250... M	pkg/controller/serviceaccount/tokens_controller.go
:100644 100644 791d120f4b... 06b9e375b4... M	pkg/controller/serviceaccount/tokens_controller_test.go
    @liggitt @deads2k
    liggitt authored and deads2k committed May 22, 2017
    Copy the full SHA
    b604ed3 View commit details
    Browse the repository at this point in the history

  27. UPSTREAM: 45505: expose the controller initializers 

    :100644 100644 479ffa2d7d... e5480a0916... M	cmd/kube-controller-manager/app/controllermanager.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    4aad2b5 View commit details
    Browse the repository at this point in the history

  28. UPSTREAM: 44072: Cleanup e2e framework for federation 

    :100644 100644 2fecaefc4a... 8038cd7605... M	test/e2e_federation/BUILD
:100644 100644 90c6412f7a... f6fbcbf135... M	test/e2e_federation/apiserver.go
:100644 100644 9fe203504e... eeaf2a2dad... M	test/e2e_federation/daemonset.go
:100644 100644 2a7c663cd8... e873dcd898... M	test/e2e_federation/deployment.go
:100644 100644 3d98d57591... 74e050070a... M	test/e2e_federation/framework/BUILD
:000000 100644 0000000000... d5dba98dd3... A	test/e2e_federation/framework/cluster.go
:100644 100644 38247ded63... 249854335d... M	test/e2e_federation/framework/framework.go
:100644 100644 7cc79aea45... 7778509ba3... M	test/e2e_federation/framework/util.go
:100644 100644 a35f4db837... a8876a568d... M	test/e2e_federation/ingress.go
:100644 100644 a5e0c22050... 69569d7882... M	test/e2e_federation/namespace.go
:100644 100644 4dfce571f3... 7b8e5a351e... M	test/e2e_federation/replicaset.go
:100644 100644 cd92951977... 40e8c41483... M	test/e2e_federation/secret.go
:100644 100644 648b1a1fd5... 29c196484a... M	test/e2e_federation/service.go
:100644 100644 ce24bf8b45... 6b893067e1... M	test/e2e_federation/upgrade.go
:100644 100644 21411ee017... 97743e2fd6... M	test/e2e_federation/util.go
    @marun @deads2k
    marun authored and deads2k committed May 22, 2017
    Copy the full SHA
    a84ddbb View commit details
    Browse the repository at this point in the history

  29. UPSTREAM: 44066: Improve federation e2e test setup 

    :100644 100644 167d8664ab... da67a519d3... M	test/e2e/framework/framework.go
:100644 100644 249854335d... 38c5fb2056... M	test/e2e_federation/framework/framework.go
    @marun @deads2k
    marun authored and deads2k committed May 22, 2017
    Copy the full SHA
    9885e51 View commit details
    Browse the repository at this point in the history

  30. UPSTREAM: 44073: Optionally retrieve fed e2e cluster config from secrets 

    :100644 100644 acb3ff7d87... e0ff888258... M	test/e2e/framework/test_context.go
:100644 100644 f6fbcbf135... 1a232234d6... M	test/e2e_federation/apiserver.go
:100644 100644 d5dba98dd3... c93af924bb... M	test/e2e_federation/framework/cluster.go
:100644 100644 38c5fb2056... 8c144ce287... M	test/e2e_federation/framework/framework.go
    @marun @deads2k
    marun authored and deads2k committed May 22, 2017
    Copy the full SHA
    a2e729d View commit details
    Browse the repository at this point in the history

  31. UPSTREAM: 43170: Add ability to customize fed namespace for e2e 

    :100644 100644 df5530ef4f... 79c26c19d1... M	test/e2e/e2e.go
:100644 100644 da5caacf09... 552473fab8... M	test/e2e/framework/federation_util.go
:100644 100644 7778509ba3... 0d9b167386... M	test/e2e_federation/framework/util.go
    @marun @deads2k
    marun authored and deads2k committed May 22, 2017
    Copy the full SHA
    cee1bff View commit details
    Browse the repository at this point in the history

  32. UPSTREAM: 44639: Set fed apiserver to bind to 8443 instead of 443 

    :100644 100644 cb81da6405... b076d00c3b... M	federation/pkg/kubefed/init/init.go
    @marun @deads2k
    marun authored and deads2k committed May 22, 2017
    Copy the full SHA
    43f962b View commit details
    Browse the repository at this point in the history

  33. UPSTREAM: 44082: use AvailabilityZone instead of Availability 

    Signed-off-by: Huamin Chen <hchen@redhat.com>

:100644 100644 659e4305ac... 48f77d56c7... M	pkg/cloudprovider/providers/openstack/openstack_volumes.go
    @rootfs @deads2k
    rootfs authored and deads2k committed May 22, 2017
    Copy the full SHA
    60a425f View commit details
    Browse the repository at this point in the history

  34. UPSTREAM: 41498: cinder: Add support for the KVM virtio-scsi driver 

    Signed-off-by: Huamin Chen <hchen@redhat.com>

:100644 100644 48f77d56c7... 68e35d520f... M	pkg/cloudprovider/providers/openstack/openstack_volumes.go
    @rootfs @deads2k
    rootfs authored and deads2k committed May 22, 2017
    Copy the full SHA
    f8a4fbb View commit details
    Browse the repository at this point in the history

  35. UPSTREAM: 45515: Ignore openrc group 

    :100644 100644 ba782d50dc... e30d73bac7... M	pkg/kubelet/cm/cgroup_manager_linux.go
    @csrwng @deads2k
    csrwng authored and deads2k committed May 22, 2017
    Copy the full SHA
    16e7e32 View commit details
    Browse the repository at this point in the history

  36. UPSTREAM: 44781: Ensure desired state of world populator runs before … 

    …volume reconstructor

:100644 100644 a73b968f96... 7124d3b2d2... M	pkg/kubelet/volumemanager/BUILD
:100644 100644 c844e3e68a... f511169072... M	pkg/kubelet/volumemanager/populator/BUILD
:100644 100644 5854fbbe5c... 8cd40adb24... M	pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go
:100644 100644 d8212e6ac7... 76d718c68d... M	pkg/kubelet/volumemanager/reconciler/BUILD
:100644 100644 5a76a4ad8f... d1fa392bd3... M	pkg/kubelet/volumemanager/reconciler/reconciler.go
:100644 100644 6b027e2b93... 5fcb4f4d38... M	pkg/kubelet/volumemanager/reconciler/reconciler_test.go
:100644 100644 c0f6850b50... 54a45f3b86... M	pkg/kubelet/volumemanager/volume_manager.go
    @wongma7 @deads2k
    wongma7 authored and deads2k committed May 22, 2017
    Copy the full SHA
    5611c11 View commit details
    Browse the repository at this point in the history

  37. UPSTREAM: 44566: WaitForCacheSync before running attachdetach controller 

    :100644 100644 4d9487ee48... 73a8c61d79... M	pkg/controller/volume/attachdetach/attach_detach_controller.go
:100644 100644 d17dab5237... f24dcdd72e... M	test/integration/volume/attach_detach_test.go
    @wongma7 @deads2k
    wongma7 authored and deads2k committed May 22, 2017
    Copy the full SHA
    d030ff4 View commit details
    Browse the repository at this point in the history

  38. UPSTREAM: 42033: fix TODO: find and add active pods for dswp 

    :100644 100644 e8e7313eb2... d3de5fdf98... M	pkg/controller/volume/attachdetach/BUILD
:100644 100644 73a8c61d79... 01d2adc016... M	pkg/controller/volume/attachdetach/attach_detach_controller.go
:100644 100644 7e87c31a72... 1ebeaca4d8... M	pkg/controller/volume/attachdetach/populator/BUILD
:100644 100644 91bbaeae57... 25e95741d6... M	pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go
:000000 100644 0000000000... d57d336055... A	pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator_test.go
:000000 100644 0000000000... 39c39359ba... A	pkg/controller/volume/attachdetach/util/BUILD
:000000 100644 0000000000... ba898ac292... A	pkg/controller/volume/attachdetach/util/util.go
:100644 100644 5854fbbe5c... 613cc9d2d9... M	pkg/kubelet/volumemanager/populator/desired_state_of_world_populator.go
:100644 100644 7c51b7ed53... c55c8db60e... M	pkg/volume/util/volumehelper/volumehelper.go
:100644 100644 f24dcdd72e... e0253dbd61... M	test/integration/volume/attach_detach_test.go
    @wongma7 @deads2k
    wongma7 authored and deads2k committed May 22, 2017
    Copy the full SHA
    58ed2d0 View commit details
    Browse the repository at this point in the history

  39. UPSTREAM: 44452: Implement LRU for AWS device allocator 

    :100644 100644 8d52f0c906... e5af4a6d84... M	pkg/cloudprovider/providers/aws/aws.go
:100644 100644 482d99bf57... 490b673bb1... M	pkg/cloudprovider/providers/aws/device_allocator.go
:100644 100644 aa377c7b48... 5c45dcbf66... M	pkg/cloudprovider/providers/aws/device_allocator_test.go
    @wongma7 @deads2k
    wongma7 authored and deads2k committed May 22, 2017
    Copy the full SHA
    7c474d7 View commit details
    Browse the repository at this point in the history

  40. UPSTREAM: 39732: Fix issue kubernetes#34242: Attach/detach should rec… 

    …over from a crash

:100644 100644 d3de5fdf98... 01658bd9b3... M	pkg/controller/volume/attachdetach/BUILD
:100644 100644 01d2adc016... 66cac888ca... M	pkg/controller/volume/attachdetach/attach_detach_controller.go
:100644 100644 4a7a8ebfd2... a1a2266d65... M	pkg/controller/volume/attachdetach/attach_detach_controller_test.go
:100644 100644 5387bec0d9... db40529822... M	pkg/controller/volume/attachdetach/cache/actual_state_of_world.go
:100644 100644 86f0461493... fa19728b33... M	pkg/controller/volume/attachdetach/cache/actual_state_of_world_test.go
:100644 100644 505e11e071... 08ce7effc1... M	pkg/controller/volume/attachdetach/reconciler/reconciler.go
:100644 100644 7911072557... baf67d9ca7... M	pkg/controller/volume/attachdetach/reconciler/reconciler_test.go
:100644 100644 b484cfa8ce... 2b954e6b79... M	pkg/controller/volume/attachdetach/testing/testvolumespec.go
:100644 100644 b78c76d2f9... 89b29be2a5... M	pkg/volume/plugins.go
:100644 100644 8e28405786... f8ae260244... M	pkg/volume/util/operationexecutor/operation_executor.go
:100644 100644 f1aff52c81... f6a9eb092b... M	pkg/volume/util/operationexecutor/operation_generator.go
:100644 100644 c55c8db60e... d4dd45dfe3... M	pkg/volume/util/volumehelper/volumehelper.go
    @wongma7 @deads2k
    wongma7 authored and deads2k committed May 22, 2017
    Copy the full SHA
    c808e22 View commit details
    Browse the repository at this point in the history

  41. UPSTREAM: 43396: iSCSI CHAP support 

    Signed-off-by: Huamin Chen <hchen@redhat.com>

:100644 100644 89f47bb709... e05c44af6e... M	api/swagger-spec/apps_v1beta1.json
:100644 100644 b238649768... 64350bac6b... M	api/swagger-spec/batch_v1.json
:100644 100644 2686a203e3... 5e4e940f59... M	api/swagger-spec/extensions_v1beta1.json
:100644 100644 465f636717... 09b3db1a35... M	api/swagger-spec/settings.k8s.io_v1alpha1.json
:100644 100644 2ca4e71175... 1813cd960e... M	api/swagger-spec/v1.json
:100644 100644 50e6b2cd81... a71bdfedf7... M	pkg/api/pod/util.go
:100644 100644 dc850372c6... f3530cb191... M	pkg/api/pod/util_test.go
:100644 100644 6df277f578... 806ec70915... M	pkg/api/types.go
:100644 100644 4e091f6f34... 040071370a... M	pkg/api/v1/pod/util.go
:100644 100644 7227efa72e... 4e04f83451... M	pkg/api/v1/pod/util_test.go
:100644 100644 5d58341ff8... 486b1d6499... M	pkg/api/v1/types.go
:100644 100644 8641b1654d... e9d51294d5... M	pkg/api/v1/zz_generated.conversion.go
:100644 100644 472a8454d9... 0c15fad278... M	pkg/api/v1/zz_generated.deepcopy.go
:100644 100644 da2fd8cbca... e6ad97c8a3... M	pkg/api/validation/validation.go
:100644 100644 643ad805c8... 5c79353564... M	pkg/api/validation/validation_test.go
:100644 100644 98bbf4dc39... f6b1e7a6d4... M	pkg/api/zz_generated.deepcopy.go
:100644 100644 6b7f099ecd... 4c704493fa... M	pkg/generated/openapi/zz_generated.openapi.go
:100644 100644 6ccf90cc71... e7e83e96e0... M	pkg/volume/iscsi/iscsi.go
:100644 100644 596a85d3ac... f18b9e33f5... M	pkg/volume/iscsi/iscsi_test.go
:100755 100755 70eed21fd4... 8c441ab55e... M	pkg/volume/iscsi/iscsi_util.go
    @rootfs @deads2k
    rootfs authored and deads2k committed May 22, 2017
    Copy the full SHA
    2558dcf View commit details
    Browse the repository at this point in the history

  42. UPSTREAM: 45685: fix quota resync 

    :100644 100644 f3fd866809... 3b6123f2d6... M	pkg/controller/resourcequota/resource_quota_controller.go
    @derekwaynecarr @deads2k
    derekwaynecarr authored and deads2k committed May 22, 2017
    Copy the full SHA
    3053ed7 View commit details
    Browse the repository at this point in the history

  43. UPSTREAM: 43289: Attach/detach controller: fix potential race in cons… 

    …tructor

:100644 100644 66cac888ca... 715aca917b... M	pkg/controller/volume/attachdetach/attach_detach_controller.go
    @wongma7 @deads2k
    wongma7 authored and deads2k committed May 22, 2017
    Copy the full SHA
    459a2d6 View commit details
    Browse the repository at this point in the history

  44. UPSTREAM: 44760: Fix issue kubernetes#44757: Flaky Test_AttachDetachC… 

    …ontrollerRecovery

:100644 100644 a1a2266d65... 08e1e1fc25... M	pkg/controller/volume/attachdetach/attach_detach_controller_test.go
    @wongma7 @deads2k
    wongma7 authored and deads2k committed May 22, 2017
    Copy the full SHA
    32324b1 View commit details
    Browse the repository at this point in the history

  45. UPSTREAM: 44798: Cinder: Automatically Generate Zone if Availability … 

    …in Storage Class is not Configured

Backport of Kubernetes PR kubernetes#44798 (kubernetes#44798).

In case the availability parameter is not configured in a cinder Storage Class the cinder volume is always provisioned in the nova availability zone. That is incorrect.

Now, the cinder volume is provisioned in a zone that is generated by an algorithm from the set of zone available in the cluster.

Positive side-effect: cinder volumes for individual pods in a StatefulSet are provisioned in unique zones. This increases the StatefulSet resilience.

:100644 100644 2f91722b65... d4a75b3a40... M	pkg/cloudprovider/providers/openstack/openstack_test.go
:100644 100644 68e35d520f... cdd1c8d2f4... M	pkg/cloudprovider/providers/openstack/openstack_volumes.go
:100644 100644 5939ba3a2e... 052c3e1e92... M	pkg/cloudprovider/providers/rackspace/rackspace.go
:100644 100644 c9a7fc435b... eb5e1d20e2... M	pkg/volume/cinder/BUILD
:100644 100644 d45b99784d... 956f7a1088... M	pkg/volume/cinder/attacher_test.go
:100644 100644 047e735568... 06d4528434... M	pkg/volume/cinder/cinder.go
:100644 100644 7b1735fa69... 66acbcd22e... M	pkg/volume/cinder/cinder_test.go
:100644 100644 5b0402afd6... c0013e29e3... M	pkg/volume/cinder/cinder_util.go
    @deads2k
    pospispa authored and deads2k committed May 22, 2017
    Copy the full SHA
    557913f View commit details
    Browse the repository at this point in the history

  46. UPSTREAM: 43377: only log stacks on server errors 

    :100644 100644 a918f577d0... 38bc48c59c... M	staging/src/k8s.io/apiserver/pkg/server/config.go
:100644 100644 4f651360c3... f252fedd89... M	staging/src/k8s.io/apiserver/pkg/server/filters/wrap.go
:100644 100644 142882a89e... bca08d2023... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    a3d03d2 View commit details
    Browse the repository at this point in the history

  47. UPSTREAM: 43575: util/iptables: check for and use new iptables-restor… 

    …e 'wait' argument

iptables-restore did not previously perform any locking, meaning that
when callers (like kube-proxy) asked iptables-restore to write large
numbers of rules, the iptables-restore process might run in parallel
with other 'iptables' invocations in kubelet (hostports), docker,
and other software.  This causes errors like:

"CNI request failed with status 400: 'Failed to ensure that nat chain
POSTROUTING jumps to MASQUERADE: error checking rule: exit status 4:
iptables: Resource temporarily  unavailable."

or from Docker

"Failed to allocate and map port 1095-1095: iptables failed:
iptables --wait -t nat -A DOCKER -p tcp -d 0/0 --dport 1095
-j DNAT --to-destination 10.1.0.2:1095 ! -i lbr0: iptables:
Resource temporarily unavailable.\n (exit status 4)"

iptables-restore "wait" functionality was added in iptables git
commit 999eaa241212d3952ddff39a99d0d55a74e3639e but is NOT YET
in a released version of iptables.

See also https://bugzilla.redhat.com/show_bug.cgi?id=1417234

:100644 100644 1b09ff7720... c7166bc7ea... M	pkg/util/iptables/iptables.go
:100644 100644 14ed4dedcb... f65f14ddc7... M	pkg/util/iptables/iptables_test.go
    @dcbw @deads2k
    dcbw authored and deads2k committed May 22, 2017
    Copy the full SHA
    adc6fc6 View commit details
    Browse the repository at this point in the history

  48. UPSTREAM: 44895: util/iptables: grab iptables locks if iptables-resto… 

    …re doesn't support --wait

When iptables-restore doesn't support --wait (which < 1.6.2 don't), it may
conflict with other iptables users on the system, like docker, because it
doesn't acquire the iptables lock before changing iptables rules. This causes
sporadic docker failures when starting containers.

To ensure those don't happen, essentially duplicate the iptables locking
logic inside util/iptables when we know iptables-restore doesn't support
the --wait option.

Unfortunately iptables uses two different locking mechanisms, one until
1.4.x (abstract socket based) and another from 1.6.x (/run/xtables.lock
flock() based).  We have to grab both locks, because we don't know what
version of iptables-restore exists since iptables-restore doesn't have
a --version option before 1.6.2.  Plus, distros (like RHEL) backport the
/run/xtables.lock patch to 1.4.x versions.

Related: kubernetes#43575
See also: openshift/origin#13845
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1417234

:100644 100644 c7166bc7ea... 5f60898a32... M	pkg/util/iptables/iptables.go
:100644 100644 f65f14ddc7... 17cd665f04... M	pkg/util/iptables/iptables_test.go
    @dcbw @deads2k
    dcbw authored and deads2k committed May 22, 2017
    Copy the full SHA
    13f2a59 View commit details
    Browse the repository at this point in the history

  49. UPSTREAM: 45601: util/iptables: fix cross-build failures due to sysca… 

    …ll.Flock()

Fixes: kubernetes#45554

:100644 100644 5f60898a32... 28843b39d5... M	pkg/util/iptables/iptables.go
:000000 100644 0000000000... 4f614cb523... A	pkg/util/iptables/iptables_linux.go
:100644 100644 17cd665f04... cdc51773c8... M	pkg/util/iptables/iptables_test.go
:000000 100644 0000000000... c6a5f0d7dc... A	pkg/util/iptables/iptables_unsupported.go
    @dcbw @deads2k
    dcbw authored and deads2k committed May 22, 2017
    Copy the full SHA
    954c5c8 View commit details
    Browse the repository at this point in the history

  50. UPSTREAM: 45286: When pods are terminated we should detach the volume 

    Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1446788

:100644 100644 e5480a0916... fb9921c1d0... M	cmd/kube-controller-manager/app/controllermanager.go
:100644 100644 715aca917b... 10bc329574... M	pkg/controller/volume/attachdetach/attach_detach_controller.go
:100644 100644 08e1e1fc25... 75cfbd0e41... M	pkg/controller/volume/attachdetach/attach_detach_controller_test.go
:100644 100644 f55a716ac8... aa4371773f... M	pkg/controller/volume/attachdetach/cache/desired_state_of_world.go
:100644 100644 49896c435a... 65cf159c87... M	pkg/controller/volume/attachdetach/cache/desired_state_of_world_test.go
:100644 100644 25e95741d6... 20b5daaae0... M	pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator.go
:100644 100644 d57d336055... c86a1a982b... M	pkg/controller/volume/attachdetach/populator/desired_state_of_world_populator_test.go
:100644 100644 baf67d9ca7... 7106caa091... M	pkg/controller/volume/attachdetach/reconciler/reconciler_test.go
:100644 100644 ba898ac292... 837c6b08cb... M	pkg/controller/volume/attachdetach/util/util.go
:100644 100644 4c1b8698f7... 6f4921897d... M	pkg/kubelet/kubelet_node_status.go
:100644 100644 d4dd45dfe3... f667af25f5... M	pkg/volume/util/volumehelper/volumehelper.go
:100644 100644 e0253dbd61... 94ce831ef2... M	test/integration/volume/attach_detach_test.go
    @gnufied @deads2k
    gnufied authored and deads2k committed May 22, 2017
    Copy the full SHA
    072ea78 View commit details
    Browse the repository at this point in the history

  51. UPSTREAM: 42801: add local option to APIService 

    :100644 100644 cabe68d003... 40d8bcee9b... M	staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go
:100644 100644 5e0b3a9392... 3a76c032e8... M	staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.generated.go
:100644 100644 8f32989432... 8fa17bb535... M	staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/types.go
:100644 100644 0e3cf6469f... f38d018012... M	staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.conversion.go
:100644 100644 0cde9442cb... 858bbbfbc7... M	staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1alpha1/zz_generated.deepcopy.go
:100644 100644 94ff63fb7c... ef69b78e61... M	staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/validation/validation.go
:100644 100644 07b2ea48f4... 55039d0016... M	staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/zz_generated.deepcopy.go
:100644 100644 bca08d2023... 919db371d2... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
:100644 100644 fac2853f96... 298009bc08... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go
:100644 100644 8e06be4192... 0d7cf318ae... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis_test.go
:100644 100644 025bae6299... 9622a31d53... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go
:100644 100644 642250f987... ca1e547af7... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy_test.go
:100644 100644 30b0474179... 31fa79be92... M	test/integration/examples/apiserver_test.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    0110011 View commit details
    Browse the repository at this point in the history

  52. UPSTREAM: 42672: use separate scheme to serve the kube-aggregator 

    :100644 100644 809259de84... d31f8a5cdd... M	staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/install/install.go
:100644 100644 919db371d2... 64b278620b... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
:100644 100644 298009bc08... ebe7b2904d... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go
:100644 100644 0d7cf318ae... a0d20cf422... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis_test.go
:100644 100644 4b04b92ac4... d2bdf3f74a... M	staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go
:100644 100644 84fcaac28e... bbf304131b... M	staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/etcd/etcd.go
:100644 100644 bf24c520b6... 1689e1f6ac... M	staging/src/k8s.io/kube-aggregator/pkg/registry/apiservice/strategy.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    0e7afb4 View commit details
    Browse the repository at this point in the history

  53. UPSTREAM: 42886: allow fallthrough handling from go-restful routes 

    :100644 100644 95d1948b6d... 212e0e4f1a... M	federation/cmd/federation-apiserver/app/server.go
:100644 100644 005e9d2bba... 0a80da163f... M	pkg/master/master.go
:100644 100644 d4f96bdf49... 6f855a47d3... M	pkg/master/master_openapi_test.go
:100644 100644 3f640e0df4... 44114f4077... M	pkg/master/master_test.go
:100644 100644 0d4b85e06c... fd7baf1f39... M	pkg/routes/ui.go
:100644 100644 38bc48c59c... 249ae64aa6... M	staging/src/k8s.io/apiserver/pkg/server/config.go
:100644 100644 6ae2f5583d... d86327f281... M	staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
:100644 100644 098180e3ab... 755385368a... M	staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go
:100644 100644 db8a132c4e... 2d9116cab9... M	staging/src/k8s.io/apiserver/pkg/server/healthz.go
:100644 100644 8c0f4d154c... 4cd7614f22... M	staging/src/k8s.io/apiserver/pkg/server/mux/container.go
:100644 100644 4de891a733... 7c1ed2a7d1... M	staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder.go
:100644 100644 6602e97ca1... c6865c8860... R052	staging/src/k8s.io/apiserver/pkg/server/mux/container_test.go	staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder_test.go
:100644 100644 258347f3ae... 10f3872c1a... M	staging/src/k8s.io/apiserver/pkg/server/openapi/openapi.go
:100644 100644 d2da396ec7... b535ff0ac7... M	staging/src/k8s.io/apiserver/pkg/server/routes/index.go
:100644 100644 541362cdc0... 6d4e56edcb... M	staging/src/k8s.io/apiserver/pkg/server/routes/metrics.go
:100644 100644 073866fde2... a547e00e3f... M	staging/src/k8s.io/apiserver/pkg/server/routes/openapi.go
:100644 100644 071b784f76... fce6b631f9... M	staging/src/k8s.io/apiserver/pkg/server/routes/profiling.go
:100644 100644 e9e73ef4da... fbb1be1843... M	staging/src/k8s.io/apiserver/pkg/server/routes/swaggerui.go
:100644 100644 64b278620b... 585ed60f26... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    eea0952 View commit details
    Browse the repository at this point in the history

  54. UPSTREAM: 43144: start informers as a post-start-hook 

    :100644 100644 cba56342ca... c2b62a586d... M	cmd/kube-apiserver/app/server.go
:100644 100644 585ed60f26... f5fd71c7f8... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    c867239 View commit details
    Browse the repository at this point in the history

  55. UPSTREAM: 43226: don't start controllers against unhealthy master 

    :100644 100644 e5480a0916... 446cda8e0c... M	cmd/kube-controller-manager/app/controllermanager.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    57c9614 View commit details
    Browse the repository at this point in the history

  56. UPSTREAM: 43141: Create controller to auto register TPRs with the agg… 

    …regator

:100644 100644 fbcc4ce05d... 4437572230... M	pkg/master/thirdparty/BUILD
:000000 100644 0000000000... f9b5afb9fa... A	pkg/master/thirdparty/tprregistration_controller.go
:000000 100644 0000000000... 1782a78177... A	pkg/master/thirdparty/tprregistration_controller_test.go
:000000 100644 0000000000... d6167fae2d... A	staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister/autoregister_controller.go
:000000 100644 0000000000... f34e0b530a... A	staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister/autoregister_controller_test.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    e2b3767 View commit details
    Browse the repository at this point in the history

  57. UPSTREAM: 43149: break kube-apiserver start into stages 

    :100644 100644 c7b9ca686e... 5c32a46d28... M	cmd/kube-apiserver/app/BUILD
:100644 100644 c2b62a586d... 8bd2cda93a... M	cmd/kube-apiserver/app/server.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    69aa327 View commit details
    Browse the repository at this point in the history

  58. UPSTREAM: 43076: allow combining API servers 

    :100644 100644 249ae64aa6... bb11e91d94... M	staging/src/k8s.io/apiserver/pkg/server/config.go
:000000 100644 0000000000... 2902f5279c... A	staging/src/k8s.io/apiserver/pkg/server/config_test.go
:100644 100644 d86327f281... bb0c3ef738... M	staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
:100644 100644 4cd7614f22... f2598e1a26... M	staging/src/k8s.io/apiserver/pkg/server/mux/container.go
:100644 100644 7c1ed2a7d1... 3efd232263... M	staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder.go
:100644 100644 c6865c8860... 3d7e6b6108... M	staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder_test.go
:100644 100644 b535ff0ac7... 2b7c1ea6c4... M	staging/src/k8s.io/apiserver/pkg/server/routes/index.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    276bcf6 View commit details
    Browse the repository at this point in the history

  59. UPSTREAM: 42900: rewire aggregation handling chain to be normal 

    :100644 100644 bb11e91d94... 7f15d1cea5... M	staging/src/k8s.io/apiserver/pkg/server/config.go
:100644 100644 bb0c3ef738... 04e92c9978... M	staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
:100644 100644 f5fd71c7f8... 4dcdda7197... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
:100644 100644 d2bdf3f74a... 02463179df... M	staging/src/k8s.io/kube-aggregator/pkg/cmd/server/start.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    4071a60 View commit details
    Browse the repository at this point in the history

  60. UPSTREAM: 42911: combine kube-apiserver and kube-aggregator 

    :100644 100644 d9fe1bb286... 28d98f08b3... M	api/swagger-spec/autoscaling_v2alpha1.json
:100644 100644 904850abbb... 84d480fad4... M	api/swagger-spec/batch_v2alpha1.json
:100644 100644 3d78f92639... e356009c2a... M	cmd/hyperkube/kube-apiserver.go
:100644 100644 ac808dea0d... 8c369f6f9d... M	cmd/kube-apiserver/apiserver.go
:100644 100644 5c32a46d28... 23def4b718... M	cmd/kube-apiserver/app/BUILD
:000000 100644 0000000000... 66f262c1c8... A	cmd/kube-apiserver/app/aggregator.go
:100644 100644 c42d7a75bc... 57ee8b3cfb... M	cmd/kube-apiserver/app/options/options.go
:100644 100644 8bd2cda93a... f7e0c5c6fe... M	cmd/kube-apiserver/app/server.go
:100644 100644 87c3bf4aa3... 33c9936e47... M	pkg/controller/garbagecollector/graph_builder.go
:100644 100644 f9b5afb9fa... f607bcbb02... M	pkg/master/thirdparty/tprregistration_controller.go
:100644 100644 7f15d1cea5... 6a41aa0b54... M	staging/src/k8s.io/apiserver/pkg/server/config.go
:100644 100644 04e92c9978... 033204822c... M	staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
:100644 100644 3efd232263... 40a9e75cfc... M	staging/src/k8s.io/apiserver/pkg/server/mux/pathrecorder.go
:100644 100644 b4ab9cb9c8... 91969b398f... M	staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
:100644 100644 9b0769a187... 69f161ac8d... M	staging/src/k8s.io/client-go/discovery/restmapper.go
:100644 100644 4dcdda7197... fb0e575a8d... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
:100644 100644 ebe7b2904d... 7d3c60abda... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis.go
:100644 100644 a0d20cf422... f955fbf0ef... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis_test.go
:100644 100644 d6167fae2d... ec14692fdd... M	staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister/autoregister_controller.go
:100644 100644 4620691f18... 607824d3df... M	test/e2e_node/services/apiserver.go
:100644 100644 31fa79be92... ad6dea52a1... M	test/integration/examples/apiserver_test.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    73febc7 View commit details
    Browse the repository at this point in the history

  61. UPSTREAM: 43383: proxy to IP instead of name, but still use host veri… 

    …fication

:100644 100644 f7e0c5c6fe... f6bdca62ff... M	cmd/kube-apiserver/app/server.go
:100644 100644 fb0e575a8d... 313c0c55bd... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiserver.go
:100644 100644 5cc31b9354... b826a01178... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiservice_controller.go
:000000 100644 0000000000... 0084802bbd... A	staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiservice_controller_test.go
:100644 100644 9622a31d53... d3fdc92a50... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go
:100644 100644 ca1e547af7... e819246d53... M	staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy_test.go
:100644 100644 ad6dea52a1... 356c469d7d... M	test/integration/examples/apiserver_test.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    1c40128 View commit details
    Browse the repository at this point in the history

  62. UPSTREAM: <drop>: kube-apiserver must not start aggregator 

    :100644 100644 57ee8b3cfb... 64c3233601... M	cmd/kube-apiserver/app/options/options.go
:100644 100644 f6bdca62ff... 768741d20f... M	cmd/kube-apiserver/app/server.go
    @deads2k
    deads2k committed May 22, 2017
    Copy the full SHA
    21c1846 View commit details
    Browse the repository at this point in the history

  63. UPSTREAM: 45623: Don't attempt to make and chmod subPath if it alread… 

    …y exists

:100644 100644 754028ca91... ee6a2b3d3d... M	pkg/kubelet/kubelet_pods.go
    @wongma7 @deads2k
    wongma7 authored and deads2k committed May 22, 2017
    Copy the full SHA
    ebd7c7a View commit details
    Browse the repository at this point in the history

  64. UPSTREAM: 45826: prevent pods/status from touching ownerreferences 

    :100644 100644 58d868f2c8... 6d73e1c783... M	pkg/registry/core/pod/strategy.go
    @derekwaynecarr @deads2k
    derekwaynecarr authored and deads2k committed May 22, 2017
    Copy the full SHA
    4ac2c51 View commit details
    Browse the repository at this point in the history

  65. UPSTREAM: 45747: OwnerReferencesPermissionEnforcement ignores pods/st… 

    …atus

:100644 100644 30992f412a... a756522bf8... M	plugin/pkg/admission/gc/gc_admission.go
:100644 100644 b37dbe17c6... 10eec420c6... M	plugin/pkg/admission/gc/gc_admission_test.go
    @derekwaynecarr @deads2k
    derekwaynecarr authored and deads2k committed May 22, 2017
    Copy the full SHA
    0c5cf6c View commit details
    Browse the repository at this point in the history

  66. UPSTREAM: 45413: Extend timeouts in timed_workers_test 

    Signed-off-by: Monis Khan <mkhan@redhat.com>

:100644 100644 dfc19a3dbd... 08761371db... M	pkg/controller/node/timed_workers_test.go
    @enj @deads2k
    enj authored and deads2k committed May 22, 2017
    Copy the full SHA
    3194240 View commit details
    Browse the repository at this point in the history

  67. UPSTREAM: 45940: apiserver: no Status in body for http 204 

    :100644 100644 13af2505a8... 78faefbac7... M	staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go
    @sttts @deads2k
    sttts authored and deads2k committed May 22, 2017
    Copy the full SHA
    8bc9d29 View commit details
    Browse the repository at this point in the history

  68. UPSTREAM: 44068: Use Docker API Version instead of docker version 

    :100644 100644 220c787063... 676233228b... M	pkg/kubelet/cadvisor/cadvisor_linux.go
:100644 100644 52f9f32fc0... 889401f4ab... M	pkg/kubelet/cm/container_manager_linux.go
:100644 100644 fd88e6277b... dc9380fc96... M	pkg/kubelet/dockershim/cm/container_manager_linux.go
    @soltysh @deads2k
    soltysh authored and deads2k committed May 22, 2017
    Copy the full SHA
    2d623d6 View commit details
    Browse the repository at this point in the history

  69. UPSTREAM: 41939: Add an AEAD encrypting transformer for storing secre… 

    …ts encrypted at rest.

:100644 100644 1c9b200170... 011de7f71f... M	staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
:100644 100644 fca49d9ccc... b42ae4b80f... M	staging/src/k8s.io/apiserver/pkg/storage/etcd3/watcher.go
:100644 100644 dc55bc4287... 2a88ddf745... M	staging/src/k8s.io/apiserver/pkg/storage/storagebackend/config.go
:100644 100644 b7b3b799c4... 2c838a09ce... M	staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go
:000000 100644 0000000000... 8a180eb3c4... A	staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/aes.go
:000000 100644 0000000000... ea2ea3936f... A	staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/aes/aes_test.go
:000000 100644 0000000000... ab5d4af959... A	staging/src/k8s.io/apiserver/pkg/storage/value/transformer.go
:000000 100644 0000000000... 63b9e0a754... A	staging/src/k8s.io/apiserver/pkg/storage/value/transformer_test.go
    @php-coder @deads2k
    php-coder authored and deads2k committed May 22, 2017
    Copy the full SHA
    5ee10c9 View commit details
    Browse the repository at this point in the history

  70. UPSTREAM: 45835: client-gen: honor groupName overrides in customArgs 

    :100644 100644 00880df577... 29ebffe021... M	cmd/libs/go2idl/client-gen/generators/client_generator.go
    @ncdc @deads2k
    ncdc authored and deads2k committed May 22, 2017
    Copy the full SHA
    9e9e2ec View commit details
    Browse the repository at this point in the history

  71. UPSTREAM: 45741: Fix discovery version for autoscaling to be v1 

    The order of the storage setup blocks in the setup for the autoscaling
API group was accidentally inverted, meaning that if the v2alpha1 API
group was turned on, it would be set to the preferred API group-version
for discovery.

This was unintentional; the latest stable version should (v1) should be
preferred instead.

Fixes bug 1452021 (https://bugzilla.redhat.com/show_bug.cgi?id=1452021)

:100644 100644 ce52e55842... 60b3bf3a19... M	pkg/registry/autoscaling/rest/storage_autoscaling.go
    @DirectXMan12 @deads2k
    DirectXMan12 authored and deads2k committed May 22, 2017
    Copy the full SHA
    0ba07b9 View commit details
    Browse the repository at this point in the history