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.

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

Bug 1794022: Update deps, including informer fix #93

Merged
merged 3 commits into from
Jan 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
46 changes: 0 additions & 46 deletions glide.diff
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,3 @@ diff --no-dereference -N -r current/vendor/github.com/vishvananda/netlink/link_l
< gre.FlowBased = true
---
> gre.FlowBased = int8(datum.Value[0]) != 0
diff --no-dereference -N -r current/vendor/k8s.io/client-go/tools/cache/delta_fifo.go updated/vendor/k8s.io/client-go/tools/cache/delta_fifo.go
297a298,304
> // willObjectBeDeletedLocked returns true only if the last delta for the
> // given object is Delete. Caller must lock first.
> func (f *DeltaFIFO) willObjectBeDeletedLocked(id string) bool {
> deltas := f.items[id]
> return len(deltas) > 0 && deltas[len(deltas)-1].Type == Deleted
> }
>
303a311,317
> }
>
> // If object is supposed to be deleted (last event is Deleted),
> // then we should ignore Sync events, because it would result in
> // recreation of this object.
> if actionType == Sync && f.willObjectBeDeletedLocked(id) {
> return nil
diff --no-dereference -N -r current/vendor/k8s.io/client-go/tools/cache/delta_fifo_test.go updated/vendor/k8s.io/client-go/tools/cache/delta_fifo_test.go
88,114d87
< // TestDeltaFIFO_replaceWithDeleteDeltaIn tests that a `Sync` delta for an
< // object `O` with ID `X` is added when .Replace is called and `O` is among the
< // replacement objects even if the DeltaFIFO already stores in terminal position
< // a delta of type `Delete` for ID `X`. Not adding the `Sync` delta causes
< // SharedIndexInformers to miss `O`'s create notification, see https://github.com/kubernetes/kubernetes/issues/83810
< // for more details.
< func TestDeltaFIFO_replaceWithDeleteDeltaIn(t *testing.T) {
< oldObj := mkFifoObj("foo", 1)
< newObj := mkFifoObj("foo", 2)
<
< f := NewDeltaFIFO(testFifoObjectKeyFunc, keyLookupFunc(func() []testFifoObject {
< return []testFifoObject{oldObj}
< }))
<
< f.Delete(oldObj)
< f.Replace([]interface{}{newObj}, "")
<
< actualDeltas := Pop(f)
< expectedDeltas := Deltas{
< Delta{Type: Deleted, Object: oldObj},
< Delta{Type: Sync, Object: newObj},
< }
< if !reflect.DeepEqual(expectedDeltas, actualDeltas) {
< t.Errorf("expected %#v, got %#v", expectedDeltas, actualDeltas)
< }
< }
<
77 changes: 47 additions & 30 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import:
- package: k8s.io/apimachinery
version: kubernetes-1.16.0
- package: k8s.io/client-go
version: kubernetes-1.16.0
repo: https://github.com/openshift/kubernetes-client-go.git
version: sdn-4.4-kubernetes-1.16.0
- package: k8s.io/component-base
version: kubernetes-1.16.0
- package: k8s.io/kube-proxy
Expand All @@ -25,11 +26,11 @@ import:

# openshift second
- package: github.com/openshift/api
version: prebase-1.16
version: release-4.3
- package: github.com/openshift/client-go
version: prebase-1.16
version: release-4.3
- package: github.com/openshift/library-go
version: prebase-1.16
version: release-4.3

# ours: shared with kube, but forced by openshift
# master: co-exist with klog
Expand Down
18 changes: 1 addition & 17 deletions vendor/github.com/Microsoft/go-winio/file.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions vendor/github.com/Microsoft/go-winio/go.mod

This file was deleted.

18 changes: 0 additions & 18 deletions vendor/github.com/Microsoft/go-winio/go.sum

This file was deleted.