Skip to content

Kube 1.4 cherry picks#11709

Merged
openshift-bot merged 27 commits intoopenshift:masterfrom
ncdc:kube_1_4_cherry_picks
Nov 2, 2016
Merged

Kube 1.4 cherry picks#11709
openshift-bot merged 27 commits intoopenshift:masterfrom
ncdc:kube_1_4_cherry_picks

Conversation

@ncdc
Copy link
Contributor

@ncdc ncdc commented Nov 1, 2016 •
edited
Loading

xref #11642

I've added a drop commit to fix the e2es panicking. We'll see how it goes.

soltysh and others added 27 commits November 1, 2016 06:57
@soltysh
bump(github.com/google/cadvisor): 0cdf4912793fac9990de3790c273342ec31…
0b322f9 
…817fb
@soltysh
UPSTREAM: 33086: Fix possible panic in PodAffinityChecker
5057dc1
@soltysh
UPSTREAM: 33170: Remove closing audit log file and add error check wh…
f7268ad 
…en writing to audit
@soltysh
UPSTREAM: 33346: disallow user to update loadbalancerSourceRanges
ef4569f
@soltysh
UPSTREAM: 32807: Fix race condition in setting node statusUpdateNeede…
836eb43 
…d flag
@soltysh
UPSTREAM: 32914: Limit the number of names per image reported in the …
de98767 
…node status
@soltysh
UPSTREAM: 33796: Fix issue in updating device path when volume is att…
fff5b28 
…ached multiple times
@soltysh
UPSTREAM: 33735: Fixes in HPA: consider only running pods; proper den…
3298cfa 
…ominator in avg
@soltysh
UPSTREAM: 33968: scheduler: initialize podsWithAffinity
8fa403c
@soltysh
UPSTREAM: 34076: Remove headers that are unnecessary for proxy target
72217b6
@soltysh
UPSTREAM: 34694: Handle DeletedFinalStateUnknown in NodeController
16809da
@soltysh
UPSTREAM: 34809: NodeController waits for informer sync before doing …
c35ab27 
…anything
@soltysh
UPSTREAM: 34251: Fix nil pointer issue when getting metrics from volu…
4f830f3 
…me mounter
@soltysh
UPSTREAM: 34851: Only wait for cache syncs once in NodeController
5b39af7
@soltysh
UPSTREAM: 34895: Fix non-starting node controller in 1.4 branch
4ded5a2
@soltysh
UPSTREAM: 34955: HPA: fixed wrong count for target replicas calculations
cfad37d
@soltysh
UPSTREAM: 35071: Change merge key for VolumeMount to mountPath
d2da288
@soltysh
UPSTREAM: 35273: Fixed mutation warning in Attach/Detach controller
cd49d55
@soltysh
UPSTREAM: 34368: Node status updater should SetNodeStatusUpdateNeeded…
0b478e6 
… if it fails to
@soltysh
bump(github.com/openshift/source-to-image): 2dffea37104471547b8653074…
4d92913 
…15876cba2bdf1fc - revert

This reverts commit d3506b1.
@soltysh
bump(github.com/google/cadvisor): ef63d70156d509efbbacfc3e86ed120228f…
f5bfb96 
…ab914
@soltysh
UPSTREAM: 33806: Update cAdvisor godeps for v1.4.1
11cd90d
@soltysh
UPSTREAM: <drop>: Continue to carry the cAdvisor patch - revert
aa5ca2e 
This reverts commit b0c9f3b.
@soltysh
Add cloud.google.com to supported hosts
013e890
@soltysh
bump(k8s.io/client-go): d72c0e162789e1bbb33c33cfa26858a1375efe01
ab858ac
@soltysh
Generated clientset
f7027fd
UPSTREAM: <drop>: add Timeout to client-go Config
b4597a4 
Add Timeout field to client-go Config object to keep e2e tests happy. This will
be replaced naturally during the rebase to 1.5.
@ncdc
Copy link
Contributor Author

ncdc commented Nov 1, 2016

[test]

@ncdc ncdc mentioned this pull request Nov 1, 2016
Closed
@ncdc
Copy link
Contributor Author

ncdc commented Nov 1, 2016

[test] #10228

@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 1, 2016

Evaluated for origin test up to b4597a4

@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 1, 2016

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10956/) (Base Commit: 16306a6)

1 similar comment
@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 1, 2016

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10956/) (Base Commit: 16306a6)

@soltysh
Copy link
Contributor

soltysh commented Nov 1, 2016

That additional commit LGTM.

@smarterclayton
Copy link
Contributor

smarterclayton commented Nov 1, 2016

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 1, 2016 •
edited
Loading

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10956/) (Image: devenv-rhel7_5300)

@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 1, 2016

Evaluated for origin merge up to b4597a4

@openshift-bot openshift-bot merged commit 235ed24 into openshift:master Nov 2, 2016
@timothysc
Copy link

timothysc commented Nov 2, 2016

It looks like we dropped the etcd3 perf changes... so, I would pretty much never recommend to go clientv3 then.

/cc @mffiedler

@ncdc
Copy link
Contributor Author

ncdc commented Nov 2, 2016

@timothysc dropped as in they used to be there and we accidentally removed them, or we didn't get around to pulling them in?

@timothysc
Copy link

timothysc commented Nov 2, 2016

@ncdc there was a question on the original issue #11642 about whether to pull them in, so it looks like an oversight.

@ncdc
Copy link
Contributor Author

ncdc commented Nov 2, 2016

@smarterclayton do you want upstream 35205 in?

@ncdc ncdc mentioned this pull request Nov 2, 2016
Closed
@soltysh
Copy link
Contributor

soltysh commented Nov 2, 2016

Both of the doubtful PRs are:

  • 35205 - contains fixes to etcd3
  • 33699 - moves informer to client

and I decided not to include them by default due to possible complications at this point in time. I'm leaving that decision to @smarterclayton about both of them.

@smarterclayton
Copy link
Contributor

smarterclayton commented Nov 2, 2016

Pretty sure we need 35205 - is it a hard patch?

On Nov 2, 2016, at 3:50 PM, Maciej Szulik notifications@github.com wrote:

Both of the doubtful PRs are:

  • 35205 - contains fixes to etcd3
  • 33699 - moves informer to client

and I decided not to include them by default due to possible complications
at this point in time. I'm leaving that decision to @smarterclayton
https://github.com/smarterclayton about both of them.

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#11709 (comment),
or mute
the thread
https://github.com/notifications/unsubscribe-auth/ABG_pwh_obo3gsJhR4E6qNKtlULB2tjrks5q6OmTgaJpZM4KmaY8
.

@soltysh
Copy link
Contributor

soltysh commented Nov 3, 2016

Not sure if hard, but a big one. I'll give it a shot on my way to Brno.

@soltysh soltysh mentioned this pull request Nov 3, 2016
Closed
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.

5 participants

@ncdc @openshift-bot @soltysh @smarterclayton @timothysc