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

1.8.4 rebase #47

Merged
merged 78 commits into from Dec 15, 2017
Merged

1.8.4 rebase #47

merged 78 commits into from Dec 15, 2017

Conversation

liggitt
Copy link

@liggitt liggitt commented Nov 28, 2017 •
edited

bumps to v1.8.4
based on upstreams on release-1.8.1 branch at 7f47d4b (sync(git@github.com:/openshift/origin.git): fe4f49890e510081eb3d8e433a380e15e7a420e0)

pick list at https://docs.google.com/spreadsheets/d/1R4JAr8i7j-eCFVYPqLjegUQmi_ppbk_TT38UGB9xLzE/edit#gid=0

three notable changes:

  • repicked the generator change to use full paths... the existing pick did not allow running generators
  • dropped 29a0d99 - UPSTREAM: carry: google.golang.org/grpc 231b4cfea0e79843053a33f5fe90bd4d84b23cd3 for kubelet api... there were no go changes, just godep json and markdown docs. @sttts, any feedback on this?
  • dropped 7b2fa48 - UPSTREAM: docker/engine-api: 26718: Add Logs to ContainerAttachOptions... we strip vendor, so this wouldn't have done anything I can see. @deads2k, do you concur?

deads2k and others added 30 commits November 28, 2017 15:24
@deads2k @liggitt
UPSTREAM: 53442: add nested encoder and decoder to admission config
a9e045d 
:000000 100644 0000000000... 0b849921b8... A	staging/src/k8s.io/apiserver/pkg/apis/apiserver/v1alpha1/conversion.go
@smarterclayton @liggitt
UPSTREAM: 53731: Use locks in fake dbus
54f6362 
:100644 100644 44131272e7... 28cde82fb2... M	pkg/util/dbus/fake_dbus.go
@pweil- @liggitt
UPSTREAM: <carry>: reallow the ability to post across namespaces in api
8a24429 
:100644 100644 a9b6b37... 2328ffc... M	pkg/apiserver/api_installer.go
@soltysh @liggitt
UPSTREAM: <carry>: add kubelet timeouts
08399a0 
:100644 100644 c561ddb... 17ef5df... M	pkg/kubelet/server.go
@DirectXMan12 @liggitt
UPSTREAM: <carry>: Tolerate node ExternalID changes with no cloud pro…
d93eb99 
…vider

Previously, if the kubelet tried to register itself with the API server,
and was rejected due to the external ID changing, it would delete the
node object and recreate it.  This commit causes it to tolerate
a change in ExternalID when the ExternalID is not being provided by a
cloud provider, assuming the new ExternalID is either the node's
(metadata) name, or one of node's addresses.

:100644 100644 0c4fdc1... 8deaa82... M	pkg/kubelet/kubelet.go
@liggitt
UPSTREAM: <carry>: Add our types to kubectl get error
6ebdf2a
@liggitt
UPSTREAM: <carry>: Allow overriding default generators for run
5cf278c
@liggitt
UPSTREAM: <carry>: force import ordering for stable codegen
9ed0b41
@deads2k @liggitt
UPSTREAM: <carry>: add service serving cert signer to token controller
d39b069 
:100644 100644 b32534e... 3e694fc... M	pkg/controller/serviceaccount/tokens_controller.go
@deads2k @liggitt
UPSTREAM: <carry>: fix fifo resync, remove after FIFO is dead
d97488e 
:100644 100644 eaa35e6... 2a50982... M	pkg/client/cache/fifo.go
:100644 100644 0f2ceb8... 667c168... M	pkg/client/cache/fifo_test.go
@smarterclayton @liggitt
UPSTREAM: <carry>: Disable file locking in clientcmd
d5805a5 
Doesn't offer enough use, complicates creation and setup.
@liggitt
UPSTREAM: <carry>: Disable e2e pre-check on scheduler predicates
d7f6486 
We don't run system pods so waiting for them is somewhat pointless
@deads2k @liggitt
UPSTREAM: <drop>: merge multiple registrations for the same group
dd107ae 
:100644 100644 ac7025a... dce57e1... M	pkg/apimachinery/registered/registered.go
@smarterclayton @liggitt
UPSTREAM: <carry>: Double container probe timeout
b240a6b 
Until kubernetes#11016 is resolved, we suspect that a combination of start latency
and the corresponding effect on sync pod latency is causing status
manager to fail to report within the 2 minute window. Double for now

:100644 100644 30b6fd0e94... ea322bbddb... M	test/e2e/common/container_probe.go
@smarterclayton @liggitt
UPSTREAM: <carry>: Increase service endpoint test timeout
0064370 
Until kubernetes#11016 is fixed, this reduces flakiness in extended suites where
long start delays result in this test failing.

:100644 100644 62b8918f36... 99d37eca2f... M	test/e2e/framework/util.go
@smarterclayton @liggitt
UPSTREAM: <carry>: Pod deletion can be contended, causing test failure
52ef948 
Add a longer timeout to the test to deal with kubernetes#11016.

:100644 100644 fee5a4c9b4... 2fa0a919b4... M	test/e2e/pods.go
@deads2k @liggitt
UPSTREAM: 00000: make AsVersionedObjects default cleanly
fb9d85c
@deads2k @liggitt
UPSTREAM: 00000: disambiguate operation names for legacy discovery
d5ec5b3 
:100644 100644 fb648e5285... 21d36a92dd... M	staging/src/k8s.io/apiserver/pkg/endpoints/discovery/legacy.go
@deads2k @liggitt
UPSTREAM: 47347: actually check for a live discovery endpoint before …
a59f230 
…aggregating
@deads2k @liggitt
UPSTREAM: <carry>: commit generated openapi
5403b0d
@deads2k @liggitt
UPSTREAM: 49131: expose direct from config new scheduler method
0cee52c 
:000000 100644 0000000000... c47e998a04... A	plugin/pkg/scheduler/scheduler_patch.go
@deads2k @liggitt
UPSTREAM: <carry>: make wiring in kubeproxy easy until we sort out co…
d44a7f3 
…nfig

:000000 100644 0000000000... 29aa4dd35d... A	cmd/kube-proxy/app/server_patch.go
@deads2k @liggitt
UPSTREAM: <carry>: compensate for poor printer behavior
f8a2d02 
:000000 100644 0000000000... cba0760ef5... A	pkg/printers/printer_patch.go
:100644 100644 2177558529... 30fd8ab5f2... M	pkg/printers/printers.go
@deads2k @liggitt
UPSTREAM: <carry>: increase wait in kubecontrollers
748eece 
:100644 100644 f30df0fa2e... 0c114a330a... M	cmd/kube-controller-manager/app/controllermanager.go
:100644 100644 491366288b... 74f4dec20e... M	pkg/controller/client_builder.go
:100644 100644 e6d1b91001... 7be7278c9d... M	pkg/master/client_ca_hook.go
@deads2k @liggitt
UPSTREAM: <carry>: add patch to allow shimming SCC
cc78573 
:000000 100644 0000000000... b684356ed4... A	pkg/registry/core/rest/scc_patch.go
:100644 100644 66e2a7be20... ea1028e61e... M	pkg/registry/core/rest/storage_core.go
@smarterclayton @liggitt
UPSTREAM: 48884: Do not mutate pods on update
1a4fa81 
They fail validation

:100644 100644 0d71f127ab... 6d49746c08... M	plugin/pkg/admission/alwayspullimages/admission.go
:100644 100644 e291e6e669... f22fb59942... M	plugin/pkg/admission/alwayspullimages/admission_test.go
@deads2k @liggitt
UPSTREAM: 49312: allow the /version endpoint to pass through
ffd1763 
:100644 100644 9708277f37... 7ad9d21e27... M	staging/src/k8s.io/apiserver/pkg/server/config.go
:100644 100644 dd9ab0dcfe... fcaec9e519... M	staging/src/k8s.io/apiserver/pkg/server/routes/version.go
@soltysh @liggitt
UPSTREAM: <carry>: increase timeout in TestCancelAndReadd even more
51f05b3 
:100644 100644 31228219fe... 72987e330d... M	pkg/controller/node/timed_workers_test.go
@deads2k @liggitt
UPSTREAM: <carry>: allow a filter function on admission registration
2dd69bc 
:000000 100644 0000000000... 748bed00fb... A	staging/src/k8s.io/apiserver/pkg/admission/patch.go
:100644 100644 dd1368d4dd... 0e422f990c... M	staging/src/k8s.io/apiserver/pkg/admission/plugins.go
@sjenning @liggitt
UPSTREAM: 53318: create separate transports for liveness and readines…
01f114a 
…s probes

:100644 100644 9cff34a208... 37a94b06ac... M	pkg/kubelet/prober/prober.go
@liggitt liggitt changed the title 1.8.4 rebase WIP - 1.8.4 rebase Nov 28, 2017
soltysh and others added 3 commits November 28, 2017 17:20
@soltysh @liggitt
UPSTREAM: 56367: Use full gopath for externalTypes
1278104
@liggitt
UPSTREAM: 55772: Only attempt to construct GC informers for watchable…
021d92e 
… resources

:100644 100644 8853640871... 23783a6593... M	pkg/controller/garbagecollector/garbagecollector.go
:100644 100644 c19305312e... 2eed274c36... M	pkg/controller/garbagecollector/graph_builder.go
@liggitt
UPSTREAM: 55974: Allow constructing spdy executor from existing trans…
be214c7 
…ports

:100644 100644 bcbe9fcd4f... 6b69f366e4... M	staging/src/k8s.io/client-go/tools/remotecommand/remotecommand.go
@liggitt liggitt changed the title WIP - 1.8.4 rebase 1.8.4 rebase Nov 28, 2017
@liggitt liggitt mentioned this pull request Nov 29, 2017
Closed
@sttts
Copy link

sttts commented Nov 30, 2017

About UPSTREAM: carry: google.golang.org/grpc 231b4cfea0e79843053a33f5fe90bd4d84b23cd3 for kubelet api, I would guess there was a commit creating the local vendor/ dir next to it? If I remember right this was to choose another grpc version (4?) for CRI than for etcd embedded into origin.

@liggitt
Copy link
Author

liggitt commented Nov 30, 2017

About UPSTREAM: carry: google.golang.org/grpc 231b4cfea0e79843053a33f5fe90bd4d84b23cd3 for kubelet api, I would guess there was a commit creating the local vendor/ dir next to it? If I remember right this was to choose another grpc version (4?) for CRI than for etcd embedded into origin.

I can't find that commit in openshift/origin... only in openshift/kubernetes

All the branches I see that commit in, there is no accompanying commit with anything related I can see

mfojtik and others added 16 commits December 15, 2017 11:25
@mfojtik @liggitt
UPSTREAM: <carry>: switch back to use ugorji/go to avoid deserializat…
4b843b0 
…ion errors

:100644 100644 5d82f92cb4... 8b0c14664d... M	pkg/api/serialization_test.go
:100644 100644 1a13377e7d... 8b2b3957f1... M	staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer/fuzzer.go
:100644 100644 8ec26f54c4... b261dd2ed5... M	staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/group_version_test.go
:100644 100644 c7442ed7ff... 59a82bbfe5... M	staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_test.go
:100644 100644 76579e5f2f... 80644d3a68... M	staging/src/k8s.io/apimachinery/pkg/runtime/serializer/json/json.go
@deads2k @liggitt
UPSTREAM: <drop>: disable flaky InitFederation unit test
9c6df7e 
:100644 100644 c6d5b1ea65... 1ce682b668... M	federation/pkg/kubefed/init/init_test.go
@deads2k @liggitt
UPSTREAM: <carry>: disable failing etcd test for old level
04ba547 
:100644 100644 e5a9eb24d4... 0290024128... M	third_party/forked/etcd221/pkg/fileutil/fileutil_test.go
@humblec @liggitt
UPSTREAM: 55796: Correct ConstructVolumeSpec()
b30f1be 
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>

:100644 100644 e1118b3ba0... 4bf855b962... M	pkg/volume/glusterfs/glusterfs.go
@mfojtik @liggitt
UPSTREAM: 56045: Fix getting logs from daemonset
eeabd42
@jsafrane @liggitt
UPSTREAM: 53135: Fixed counting of unbound PVCs towards limit of atta…
68ee5dd 
…ched volumes

:100644 100644 ff893c3c41... c940d2f538... M	plugin/pkg/scheduler/algorithm/predicates/BUILD
:100644 100644 d047c0ffcd... efe1fac490... M	plugin/pkg/scheduler/algorithm/predicates/predicates.go
:100644 100644 d085d9d6f6... a148e112bc... M	plugin/pkg/scheduler/algorithm/predicates/predicates_test.go
@jsafrane @liggitt
UPSTREAM: 53989: Remove repeated random string generations in schedul…
c604bb9 
…er volume predicate

:100644 100644 efe1fac490... 4282fb82cd... M	plugin/pkg/scheduler/algorithm/predicates/predicates.go
@sjenning @liggitt
UPSTREAM: 55641: dockershim: remove corrupt checkpoints immediately u…
3943aab 
…pon detection

:100644 100644 5398ff8159... 92534b83d8... M	pkg/kubelet/dockershim/BUILD
:100644 100644 b8160bbd9b... 34254d3488... M	pkg/kubelet/dockershim/checkpoint_store.go
:100644 100644 6ad1d79416... 18f9d2d0d5... M	pkg/kubelet/dockershim/docker_checkpoint.go
:100644 100644 47220063e4... 56bfc3598c... M	pkg/kubelet/dockershim/docker_sandbox.go
:100644 100644 745286038a... d0614fc05c... M	pkg/kubelet/dockershim/docker_service.go
:100644 100644 02195b0266... 34bbb5303e... M	pkg/kubelet/dockershim/testing/util.go
@runcom @liggitt
UPSTREAM: 55631: Parse and return the last line in the log even if it…
a054249 
… is partial

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

:100644 100644 4f9513d4b5... 99f7c13934... M	pkg/kubelet/kuberuntime/kuberuntime_logs.go
@php-coder @liggitt
UPSTREAM: 56503: MustRunAsNonRoot should reject a pod if it has non-n…
df0eb54 
…umeric USER

:100644 100644 70bb933393... c470118306... M	pkg/kubelet/kuberuntime/kuberuntime_container.go
:100644 100644 e07834c071... 9c45e0a283... M	pkg/kubelet/kuberuntime/kuberuntime_container_test.go
:100644 100644 c0d4ce7347... 3d48d372ac... M	pkg/kubelet/kuberuntime/security_context.go
:100644 100644 ae724ab314... d3261b51f5... M	pkg/kubelet/kuberuntime/security_context_test.go
@tnozicka @liggitt
UPSTREAM: 56356: Wait for controllerrevision informer to sync on stat…
6602fbe 
…efulset controller startup

:100644 100644 2cde7ab3fe... 077eb0504c... M	pkg/controller/statefulset/stateful_set.go
@tnozicka @liggitt
UPSTREAM: 54597: kubelet: check for illegal container state transition
311cdd4 
:100644 100644 20c751038a... 768c437fe4... M	pkg/kubelet/status/status_manager.go
@liggitt
UPSTREAM: <drop>: generated files
557e173
@soltysh @liggitt
UPSTREAM: <carry>: allow multiple containers to union for swagger
7f4757a 
:100644 100644 9fa52a0021... dab9e7233d... M	staging/src/k8s.io/apiserver/pkg/server/config.go
:100644 100644 9be725d4e2... 65e2ed1670... M	staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
:100644 100644 08e342ef56... 9218a1e185... M	staging/src/k8s.io/apiserver/pkg/server/routes/swagger.go
@soltysh @liggitt
UPSTREAM: <drop>: etcd testing
0c298c7 
:100644 100644 c02d75b61a... 57990372e8... M	staging/src/k8s.io/apiserver/pkg/storage/etcd/testing/utils.go
@liggitt
sync(git@github.com:/openshift/origin.git): a050d411d8fe01a4216723cff…
7618833 
…dc7f6c72145729c
@liggitt liggitt merged commit 7618833 into openshift:release-1.8.4 Dec 15, 2017
@liggitt liggitt deleted the release-1.8.4 branch April 22, 2019 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mfojtik mfojtik

@sttts sttts

@deads2k deads2k

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet