[WIP] k8s rebase #5049

soltysh · 2015-10-09T23:31:16Z

No description provided.

liggitt · 2015-10-09T23:33:19Z

It begins

0xmichalis · 2015-10-10T13:49:27Z

0xmichalis · 2015-10-10T17:54:25Z

@soltysh you have included kubernetes/kubernetes#14726 in the bump which is a fix for #4785. We don't need 62e7141 anymore so drop it.

@liggitt @deads2k please confirm

0xmichalis · 2015-10-10T17:57:02Z

Godeps/Godeps.json

I don't think this should get bumped. It's coming from docker/distribution.

liggitt · 2015-10-10T17:58:03Z

No, we actually want validation disabled, but we should override that in our wrapper to leave kubectl behavior unchanged

0xmichalis · 2015-10-10T17:59:45Z

Godeps/Godeps.json

I don't think we want skydns backleved

Yeah… before we spend too much time with this, let's make sure the godep save was correct… this looks weird

0xmichalis · 2015-10-10T18:23:56Z

http://pastebin.com/CwgbnSYh

Lots of deps seem incorrectly touched

soltysh · 2015-10-10T21:13:52Z

Yeah, I've been fighting hard with godep yesterday. For some reason it was failing for me on every single step (restore and save) except for k8s part, which worked smoothly. I had to go get a lot of deps, though I don't remember any of those you guys mention being problematic, that's why it's weird for me.

0xmichalis · 2015-10-11T00:14:36Z

godep is a mess. Keep the Kube changes in a separate commit, and try to trim down any unnecessary bumps. Also check for any dropped patches in go-restful (you will pick these while cherry-picking), skydns, distribution, gophercloud. There may be others.

soltysh · 2015-10-12T20:20:21Z

I've fixed all the external deps. Next step I'll review k8s changes, because godep ignores by default _test.go files 😢 which we include everywhere.

liggitt · 2015-10-12T20:37:59Z

godep ignores by default _test.go files

really? it's always pulled in _test.go files for me...

soltysh · 2015-10-12T20:57:28Z

@liggitt if you add -t flag it does, at least the latest version I have.

…bed329bc60e

…20153022cfd08

soltysh · 2015-10-13T10:12:51Z

I've split the shared libs bumps into separate commits, as @Kargakis pointed me that.

Conflicts: Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/exec.go Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/portforward.go

Conflicts: Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/validation/validation_test.go

…ream PR.

Conflicts: Godeps/_workspace/src/k8s.io/kubernetes/pkg/controller/serviceaccount/serviceaccounts_controller.go Godeps/_workspace/src/k8s.io/kubernetes/pkg/controller/serviceaccount/serviceaccounts_controller_test.go

Used for keeping backwards compatibility for the Metadata field

openshift-bot · 2015-10-14T00:32:13Z

Origin Action Required: Pull request cannot be automatically merged, please rebase your branch from latest HEAD and push again

soltysh · 2015-10-15T20:10:49Z

Superseded by #5143.

0xmichalis reviewed Oct 10, 2015
View reviewed changes

Godeps/Godeps.json Outdated

Copy link

Contributor

0xmichalis Oct 10, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this should get bumped. It's coming from docker/distribution.

0xmichalis reviewed Oct 10, 2015
View reviewed changes

soltysh mentioned this pull request Oct 12, 2015

Post rebase issues #5068

Closed

4 tasks

soltysh force-pushed the rebase branch from b38d1a8 to a955795 Compare October 12, 2015 20:15

soltysh force-pushed the rebase branch 2 times, most recently from 84a93fc to 25de886 Compare October 13, 2015 08:33

soltysh added 4 commits October 13, 2015 11:09

bump(github.com/fsouza/go-dockerclient) 1399676f53e6ccf46e0bf00751b21…

436d160

…bed329bc60e

bump(github.com/ghodss/yaml) 73d445a93680fa1a78ae23a5839bad48f32ba1ee

26dcd6e

bump(github.com/prometheus/client_golang) 3b78d7a77f51ccbc364d4bc1709…

1057528

…20153022cfd08

bump(golang.org/x/net/context) c2528b2dd8352441850638a8bb678c2ad056fd3e

b37f621

soltysh force-pushed the rebase branch from 25de886 to 5d655fc Compare October 13, 2015 10:10

soltysh and others added 7 commits October 13, 2015 16:56

bump(k8s.io/kubernetes) ed382ec

ef08e61

UPSTREAM: <carry>: v1beta3

0fe3345

UPSTREAM: <carry>: Disable UIs for Kubernetes and etcd

539b1b1

UPSTREAM: <carry>: Allow pod start to be delayed in Kubelet

b5698bc

UPSTREAM: <carry>: Add deprecated fields to migrate 1.0.0 k8s v1 data

7a87336

UPSTREAM: <carry>: support pointing oc exec to old openshift server

0d9261a

Conflicts: Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/exec.go Godeps/_workspace/src/k8s.io/kubernetes/pkg/kubectl/cmd/portforward.go

UPSTREAM: <carry>: reallow the ability to post across namespaces in api

8864ff8

deads2k and others added 6 commits October 13, 2015 16:56

UPSTREAM: <carry>: update describer for dockercfg secrets

ea5bd60

UPSTREAM: <carry>: Disable --validate by default

9082da2

UPSTREAM: <none>: Suppress aggressive output of warning

dc41eb4

UPSTREAM: <none>: Hack date-time format on *util.Time

54054ff

UPSTREAM: <drop>: add back flag types to reduce noise during this rebase

600b18c

UPSTREAM: 8890: Allowing ActiveDeadlineSeconds to be updated for a pod

c72eeb4

Conflicts: Godeps/_workspace/src/k8s.io/kubernetes/pkg/api/validation/validation_test.go

soltysh force-pushed the rebase branch from 9db46f5 to c72eeb4 Compare October 13, 2015 14:58

Paul Weil and others added 7 commits October 13, 2015 17:58

UPSTREAM: 7893: scc

c6cd08f

UPSTREAM: 7893: scc allocation interface methods

03775cc

UPSTREAM: 9844: EmptyDir volume SELinux support

4a37de3

UPSTREAM: 12498: Re-add timeouts for kubelet which is not in the upst…

784a7aa

…ream PR.

UPSTREAM: 12221: Allow custom namespace creation in e2e framework

a27518e

UPSTREAM: 11827: allow permissive SA secret ref limitting

a337040

Conflicts: Godeps/_workspace/src/k8s.io/kubernetes/pkg/controller/serviceaccount/serviceaccounts_controller.go Godeps/_workspace/src/k8s.io/kubernetes/pkg/controller/serviceaccount/serviceaccounts_controller_test.go

UPSTREAM: <carry>: Back n forth downward/metadata conversions

7113e8e

Used for keeping backwards compatibility for the Metadata field

soltysh closed this Oct 15, 2015

soltysh deleted the rebase branch October 22, 2015 12:01

[WIP] k8s rebase #5049

[WIP] k8s rebase #5049

Conversation

soltysh commented Oct 9, 2015

Uh oh!

liggitt commented Oct 9, 2015

Uh oh!

0xmichalis commented Oct 10, 2015

Uh oh!

0xmichalis commented Oct 10, 2015

Uh oh!

0xmichalis Oct 10, 2015

Choose a reason for hiding this comment

Uh oh!

liggitt commented Oct 10, 2015

Uh oh!

0xmichalis Oct 10, 2015

Choose a reason for hiding this comment

Uh oh!

liggitt Oct 10, 2015

Choose a reason for hiding this comment

Uh oh!

0xmichalis commented Oct 10, 2015

Uh oh!

soltysh commented Oct 10, 2015

Uh oh!

0xmichalis commented Oct 11, 2015

Uh oh!

soltysh commented Oct 12, 2015

Uh oh!

liggitt commented Oct 12, 2015

Uh oh!

soltysh commented Oct 12, 2015

Uh oh!

soltysh commented Oct 13, 2015

Uh oh!

openshift-bot commented Oct 14, 2015

Uh oh!

soltysh commented Oct 15, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants