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

Conversation

deads2k
Copy link

@deads2k deads2k commented May 22, 2017

@sttts @ncdc do a sanity check for me? I used UPSTREAM_REPO_LOCATION=/home/deads/workspaces/kube/src/k8s.io/kubernetes/ TARGET_BRANCH=picks hack/move-upstream.sh e8d67d3ea07a726c1bbd34d5c0a86872c54567de..master to pick these.

As I recall, we generally push these instead of merging, but I don't feel strongly if you guys want to argue one way or the other.

@liggitt @smarterclayton our branches are all over the place. Let's actually plan what we're going to do.

pmorie and others added 30 commits May 22, 2017 11:24
@pmorie @deads2k
UPSTREAM: 43375: Set permission for volume subPaths
c1960ce 
:100644 100644 20413aa49f... 0a7a566aad... M	pkg/kubelet/kubelet_pods.go
@sttts @deads2k
UPSTREAM: <drop>: Run make-update – vendor/ changes
8c1cfd5 
: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
UPSTREAM: 44861: NotRegisteredErr for known kinds not registered in t…
f10894b 
…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
UPSTREAM: 44859: e2e: handle nil ReplicaSet in checkDeploymentRevision
81b85c7 
:100644 100644 4d9ce2b94c... 59ad47a9bf... M	test/e2e/deployment.go
@ncdc @deads2k
UPSTREAM: <carry>: add OpenShift resources to garbage collector ignor…
3df0384 
…e list

:100644 100644 703840ecf7... 87c3bf4aa3... M	pkg/controller/garbagecollector/graph_builder.go
@deads2k
UPSTREAM: 44570: Explicit namespace from kubeconfig should override i…
9247337 
…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
UPSTREAM: 44221: validateClusterInfo: use clientcmdapi.NewCluster()
00ea260 
:100644 100644 41fb23bdfb... 6441f14837... M	staging/src/k8s.io/client-go/tools/clientcmd/validation_test.go
@deads2k
UPSTREAM: <carry>: openapi test, patch in updated package name
1d05e4b 
:100644 100644 517a280dea... c29f226bc8... M	staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi_test.go
@deads2k
UPSTREAM: 00000: make AsVersionedObjects default cleanly
3358bea 
:100644 100644 c77502bfec... c018a4973a... M	pkg/kubectl/resource/result.go
@sttts @deads2k
UPSTREAM: <drop>: disable apiserver loopback loop in generic context
b2dcff4 
:100644 100644 23a36e9510... 3731720d67... M	staging/src/k8s.io/apiserver/pkg/server/hooks.go
@sttts @deads2k
UPSTREAM: 44730: Check for terminating Pod prior to launching success…
4a2e2e1 
…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
@0xmichalis @deads2k
UPSTREAM: 44439: controller: fix saturation check in Deployments
856b550 
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
@sttts @deads2k
UPSTREAM: 44970: CRI: Fix StopContainer timeout
35b0fbe 
:100644 100644 8a4e29f7ad... 0b0ef219f7... M	pkg/kubelet/remote/remote_runtime.go
@dshulyak @deads2k
UPSTREAM: 41634: Handle error event type
de347c2 
:100644 100644 4cdfdacc7e... 6a595b6b34... M	test/e2e/statefulset.go
@sttts @deads2k
UPSTREAM: 45100: node-controller: deflake TestUpdateNodeWithMultiplePods
0ac3bdb 
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
UPSTREAM: 45105: taint-controller-tests: double 'a bit of time' to av…
7816322 
…oid flakes

:100644 100644 ac6261f79e... 8f5fd7c195... M	pkg/controller/node/taint_controller_test.go
@ncdc @deads2k
UPSTREAM: 44462: 44489: fix selfLink for cluster-scoped resources
f958086 
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
@rootfs @deads2k
UPSTREAM: 40423: Support for v1/v2/autoprobe openstack cinder blockst…
5a57ddf 
…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
@deads2k
UPSTREAM: <drop>: remove hacks for delaying post start hooks
fc87d92 
:100644 100644 3731720d67... 89ba6288a9... M	staging/src/k8s.io/apiserver/pkg/server/hooks.go
@ncdc @deads2k
UPSTREAM: 45171: Use groupName comment for listers/informers
3f230ed 
: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
@deads2k
UPSTREAM: <carry>: Fix to avoid REST API calls at log level 2.
b79c00b 
:100644 100644 4a4894cee0... fa2eb5773d... M	staging/src/k8s.io/apiserver/pkg/server/httplog/log.go
@sttts @deads2k
UPSTREAM: <drop>: resurrect extensions/v1beta1.HPA
a6620e9 
: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
@deads2k
UPSTREAM: 45235: remove bearer token from headers after we consume it
6c9e66d 
: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
@sjenning @deads2k
UPSTREAM: 44939: don't HandleError on container start failure
13dfe89 
:100644 100644 f92017e5d8... 2080ab95ab... M	pkg/kubelet/dockertools/docker_manager.go
@deads2k
UPSTREAM: 45238: expose kubelet authentication and authorization buil…
23de984 
…ders

:100644 100644 d8f0f388ea... 20e9b3900b... M	cmd/kubelet/app/auth.go
:100644 100644 215ce27d55... a6d548c131... M	cmd/kubelet/app/server.go
@liggitt @deads2k
UPSTREAM: 44625: Retry secret reference addition on conflict
b604ed3 
:100644 100644 1c2b0fd289... 1193096250... M	pkg/controller/serviceaccount/tokens_controller.go
:100644 100644 791d120f4b... 06b9e375b4... M	pkg/controller/serviceaccount/tokens_controller_test.go
@deads2k
UPSTREAM: 45505: expose the controller initializers
4aad2b5 
:100644 100644 479ffa2d7d... e5480a0916... M	cmd/kube-controller-manager/app/controllermanager.go
@marun @deads2k
UPSTREAM: 44072: Cleanup e2e framework for federation
a84ddbb 
: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
UPSTREAM: 44066: Improve federation e2e test setup
9885e51 
:100644 100644 167d8664ab... da67a519d3... M	test/e2e/framework/framework.go
:100644 100644 249854335d... 38c5fb2056... M	test/e2e_federation/framework/framework.go
@marun @deads2k
UPSTREAM: 44073: Optionally retrieve fed e2e cluster config from secrets
a2e729d 
: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
deads2k and others added 20 commits May 22, 2017 11:24
@deads2k
UPSTREAM: 42672: use separate scheme to serve the kube-aggregator
0e7afb4 
: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
UPSTREAM: 42886: allow fallthrough handling from go-restful routes
eea0952 
: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
UPSTREAM: 43144: start informers as a post-start-hook
c867239 
: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
UPSTREAM: 43226: don't start controllers against unhealthy master
57c9614 
:100644 100644 e5480a0916... 446cda8e0c... M	cmd/kube-controller-manager/app/controllermanager.go
@deads2k
UPSTREAM: 43141: Create controller to auto register TPRs with the agg…
e2b3767 
…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
UPSTREAM: 43149: break kube-apiserver start into stages
69aa327 
:100644 100644 c7b9ca686e... 5c32a46d28... M	cmd/kube-apiserver/app/BUILD
:100644 100644 c2b62a586d... 8bd2cda93a... M	cmd/kube-apiserver/app/server.go
@deads2k
UPSTREAM: 43076: allow combining API servers
276bcf6 
: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
UPSTREAM: 42900: rewire aggregation handling chain to be normal
4071a60 
: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
UPSTREAM: 42911: combine kube-apiserver and kube-aggregator
73febc7 
: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
UPSTREAM: 43383: proxy to IP instead of name, but still use host veri…
1c40128 
…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
UPSTREAM: <drop>: kube-apiserver must not start aggregator
21c1846 
:100644 100644 57ee8b3cfb... 64c3233601... M	cmd/kube-apiserver/app/options/options.go
:100644 100644 f6bdca62ff... 768741d20f... M	cmd/kube-apiserver/app/server.go
@wongma7 @deads2k
UPSTREAM: 45623: Don't attempt to make and chmod subPath if it alread…
ebd7c7a 
…y exists

:100644 100644 754028ca91... ee6a2b3d3d... M	pkg/kubelet/kubelet_pods.go
@derekwaynecarr @deads2k
UPSTREAM: 45826: prevent pods/status from touching ownerreferences
4ac2c51 
:100644 100644 58d868f2c8... 6d73e1c783... M	pkg/registry/core/pod/strategy.go
@derekwaynecarr @deads2k
UPSTREAM: 45747: OwnerReferencesPermissionEnforcement ignores pods/st…
0c5cf6c 
…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
@enj @deads2k
UPSTREAM: 45413: Extend timeouts in timed_workers_test
3194240 
Signed-off-by: Monis Khan <mkhan@redhat.com>

:100644 100644 dfc19a3dbd... 08761371db... M	pkg/controller/node/timed_workers_test.go
@sttts @deads2k
UPSTREAM: 45940: apiserver: no Status in body for http 204
8bc9d29 
:100644 100644 13af2505a8... 78faefbac7... M	staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters/writers.go
@soltysh @deads2k
UPSTREAM: 44068: Use Docker API Version instead of docker version
2d623d6 
: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
@php-coder @deads2k
UPSTREAM: 41939: Add an AEAD encrypting transformer for storing secre…
5ee10c9 
…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
@ncdc @deads2k
UPSTREAM: 45835: client-gen: honor groupName overrides in customArgs
9e9e2ec 
:100644 100644 00880df577... 29ebffe021... M	cmd/libs/go2idl/client-gen/generators/client_generator.go
@DirectXMan12 @deads2k
UPSTREAM: 45741: Fix discovery version for autoscaling to be v1
0ba07b9 
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
@ncdc
Copy link

ncdc commented May 22, 2017

@deads2k it looks like maybe you're missing 5a2ed74 UPSTREAM: <drop>: missing test file?

@sttts
Copy link

sttts commented May 22, 2017 •
edited

A quick scan matches with what I get here locally. But the order is slightly different than a git log --oneline e8d67d3ea07a726c1bbd34d5c0a86872c54567de..origin/master vendor/k8s.io/kubernetes | grep -v Merge. And one commit was added on-top.

@ncdc
Copy link

ncdc commented May 22, 2017

I had an exact match for all commits except the one I listed above

@sttts
Copy link

sttts commented May 22, 2017

Double checked in detail, same result as @ncdc

@deads2k
Copy link
Author

deads2k commented May 22, 2017

@deads2k it looks like maybe you're missing 5a2ed74 UPSTREAM: : missing test file?

The file added in that commit is already present in openshift/kubernetes here https://github.com/openshift/kubernetes/blob/openshift-1.6-20170501/staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_apis_test.go . No idea why it wasn't in openshift's vendored copy when I needed it.

@ncdc
Copy link

ncdc commented May 22, 2017 via email

@ncdc ncdc mentioned this pull request May 23, 2017
Closed
@smarterclayton
Copy link

Something is weird about UPSTREAM: 40423: Support for v1/v2/autoprobe openstack cinder blockstorage - i don't see those dependencies in the repo.

@deads2k deads2k closed this Jun 12, 2017
@deads2k deads2k deleted the picks branch August 3, 2017 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet