rebase to kube 1.7 on master #15234

deads2k · 2017-07-17T13:36:18Z

Rebase branch on master. Original review of all commits completed in #15100

[test]

deads2k · 2017-07-17T15:38:46Z

I think the last bit of outstanding work is to open the upstream commits.

deads2k · 2017-07-17T18:11:33Z

@eparis @sttts @liggitt @smarterclayton Holy crap, fully reviewed and green! merge it quick!

https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3203/

enj · 2017-07-17T18:24:55Z

bparees · 2017-07-17T20:02:13Z

[testextended][extended:core(builds|templates)]

smarterclayton · 2017-07-17T20:28:52Z

Can we continue to get folks fixing things merged into this until we branch?

…

On Mon, Jul 17, 2017 at 4:08 PM, OpenShift Bot ***@***.***> wrote: continuous-integration/openshift-jenkins/testextended Running ( https://ci.openshift.redhat.com/jenkins/job/test_pull_ request_origin_extended/862/) (Base Commit: 6c3acd2 <6c3acd2>) (PR Branch Commit: ddc1938 <ddc1938>) (Extended Tests: core(templates), core(builds)) — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#15234 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABG_p3L-nkos-wTLKoEkbKiuOdqVSQYVks5sO78vgaJpZM4OZ-zJ> .

bparees · 2017-07-17T21:06:47Z

@stevekuznetsov err:

+ make test-extended 'SUITE=core(templates),core' FOCUS=builds
test/extended/core(templates),core.sh --ginkgo.focus="builds"
/bin/sh: -c: line 0: syntax error near unexpected token `templates'
/bin/sh: -c: line 0: `test/extended/core(templates),core.sh --ginkgo.focus="builds"'

?

i'm going to just run one and then the other, but it seems like rosie didn't combine the focuses properly.

deads2k · 2017-07-17T21:27:21Z

@smarterclayton I'd rather not. This is green and trying to manually determine if their code can/should merge on mine isn't good from a review or stability perspective.

People can create their own branches from here for merge after this. We could also move the branch up. I don't want to become Rosie on a psuedo-fork that periodically gets to rebase everyone's pulls on a new head. It's hard enough keeping this up to date already

smarterclayton · 2017-07-17T22:13:11Z

Let me rephrase this - have you made sure everyone whose code you disabled who *isn't* working on 3.6 closeout knows they can now start using this to test their fixes?

…

On Mon, Jul 17, 2017 at 5:27 PM, David Eads ***@***.***> wrote: @smarterclayton <https://github.com/smarterclayton> I'd rather not. This is green and trying to manually determine if their code can/should merge on mine isn't good from a review or stability perspective. People can create their own branches from here for merge after this. We could also move the branch up. I don't want to become Rosie on a psuedo-fork that periodically gets to rebase everyone's pulls on a new head. It's hard enough keeping this up to date already — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#15234 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABG_pzOm6psGwcWAA6bPcQx2iYRdaueUks5sO9G8gaJpZM4OZ-zJ> .

bparees · 2017-07-18T02:48:49Z

The BuildConfig "sample-build" is invalid: 
* spec.source.git.httpproxy: Invalid value: "127.0.0.1:3128": proxy is not a valid url
* spec.source.git.httpsproxy: Invalid value: "127.0.0.1:3128": proxy is not a valid url

@jim-minter looks like we have another case of using url parse that has been broken by golang 1.8. Think you can throw together a commit for @deads2k to cherry-pick here?

(https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_extended/863/)

smarterclayton · 2017-07-18T03:11:43Z

pkg/router/metrics/haproxy/haproxy.go

-	e.serverThresholdCurrent.Set(float64(servers))
-	e.serverThresholdLimit.Set(float64(e.opts.ServerThreshold))
+	// TODO counters only go up
+	// e.serverThresholdCurrent.Set(float64(servers))


You can just make these gauges

smarterclayton · 2017-07-18T03:43:28Z

Saw this in the logs:

W0718 03:42:32.685569   20120 reflector.go:323] github.com/openshift/origin/vendor/k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/factory.go:72: watch of *v1beta1.ThirdPartyResource ended with: etcdserver: mvcc: required revision has been compacted

GC or lost Mo's "disable TPR controller" commit?

liggitt · 2017-07-18T04:00:55Z

W0718 03:42:32.685569 20120 reflector.go:323] github.com/openshift/origin/vendor/k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/factory.go:72: watch of *v1beta1.ThirdPartyResource ended with: etcdserver: mvcc: required revision has been compacted

could also be storage cacher... not sure

smarterclayton · 2017-07-18T04:40:13Z

How are you tracking post-rebase (so I can add things)

sttts · 2017-07-18T06:42:39Z

@smarterclayton post rebase todos: #14647

stevekuznetsov · 2017-07-18T11:44:00Z

@bparees that logic lives here

…call NewLogged

deads2k · 2017-07-18T18:20:33Z

Opened a PR for etcd

It didn't build. I've opened #15313 and I'll keep chasing it.

deads2k · 2017-07-18T18:20:46Z

[test]

deads2k · 2017-07-18T18:20:59Z

All the upstream 00000's have associated pulls.

openshift-bot · 2017-07-18T18:24:03Z

Evaluated for origin testextended up to 7d969d4

openshift-bot · 2017-07-18T18:24:16Z

Evaluated for origin test up to 7d969d4

deads2k · 2017-07-18T19:08:27Z

I kicked a few jobs for flake handling:

Overall: green!

https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3233/
check failed on flake: TestStoreWatch panicked #13068
integration green
networking green
gce failed on yum
conformance green
https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3234/
check green
integration green
networking green
gce failed on yum
conformance failed on Extended.deploymentconfigs with revision history limits [Conformance] should never persist more old deployments than acceptable after being observed by the controller #11114
https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3235/
check failed on 'oc get netnamespace default -o jsonpath=
integration flaked on Flake: github.com/openshift/origin/test/end-to-end/core.test/end-to-end/core.sh:389 #14897
networking green
gce green
conformance green
https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3236/ green
check green
integration green
networking green
gce green
conformance green

openshift-bot · 2017-07-18T20:29:24Z

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3233/) (Base Commit: 20e72f7) (PR Branch Commit: 7d969d4)

openshift-bot · 2017-07-18T21:15:50Z

continuous-integration/openshift-jenkins/testextended FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_extended/868/) (Base Commit: 20e72f7) (PR Branch Commit: 7d969d4) (Extended Tests: core(builds|templates))

sttts · 2017-07-19T08:00:02Z

🎉

Picked commit from rebase to kube 1.7 Commit: cb0c13a PR: openshift#15234

Picked commit from rebase PR to kube 1.7 Commit: f39394b: handle printer changes PR: openshift#15234

deads2k assigned sttts Jul 17, 2017

deads2k force-pushed the rebase-02-0717 branch from 28d3057 to ddc1938 Compare July 17, 2017 15:37

deads2k mentioned this pull request Jul 17, 2017

rebase to 1.7 #15100

Closed

9 tasks

deads2k mentioned this pull request Jul 17, 2017

Fix duplicate listing of PodNodeConstraints in the CombinedAdmissionControlPlugins list. #15221

Closed

openshift deleted a comment from openshift-bot Jul 17, 2017

openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 17, 2017

smarterclayton reviewed Jul 18, 2017

View reviewed changes

deads2k mentioned this pull request Jul 18, 2017

Re-enable idler #15101

Closed

deads2k and others added 12 commits July 18, 2017 14:05

remove dead volume source migrator

9b01cb1

boring: generated

719706b

disable go version checking

715e2f6

disable registry url validation in prune

e824c14

node default config value changes

fa7ce0b

Fix cross-platform compile of pod manager

6d6152d

sdn: additional kube-1.7 rebase fixup

ae8e183

add FSStorageOS to SCC

a2adb09

defer adding new oc/kubectl commands until after the rebase

df37357

disable projectrequest unit test because the fake client is weird

812ec33

disable a few failing e2e tests

4f26b45

UPSTREAM: 48813: maxinflight handle should let panicrecovery handler …

7d969d4

…call NewLogged

deads2k force-pushed the rebase-02-0717 branch from ddc1938 to 7d969d4 Compare July 18, 2017 18:16

deads2k mentioned this pull request Jul 18, 2017

Git spec handling revamp for 3.7 #15071

Merged

openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2017

liggitt merged commit a5f7000 into openshift:master Jul 19, 2017

enj mentioned this pull request Jul 25, 2017

[DO NOT MERGE] Revert oadm migrate volumesource in 3.7 #14873

Closed

deads2k deleted the rebase-02-0717 branch August 3, 2017 19:27

juanvallejo added a commit to juanvallejo/origin that referenced this pull request Nov 7, 2017

UPSTREAM: <carry>: compensate for poor printer behavior

cf73b40

Picked commit from rebase to kube 1.7 Commit: cb0c13a PR: openshift#15234

juanvallejo added a commit to juanvallejo/origin that referenced this pull request Nov 7, 2017

pick f39394b

d15cb34

Picked commit from rebase PR to kube 1.7 Commit: f39394b: handle printer changes PR: openshift#15234

juanvallejo added a commit to juanvallejo/origin that referenced this pull request Nov 7, 2017

partial pick of f39394b

170648a

Picked commit from rebase PR to kube 1.7 Commit: f39394b: handle printer changes PR: openshift#15234

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

rebase to kube 1.7 on master #15234

rebase to kube 1.7 on master #15234

deads2k commented Jul 17, 2017 •

edited

Loading

deads2k commented Jul 17, 2017

deads2k commented Jul 17, 2017 •

edited

Loading

enj commented Jul 17, 2017

bparees commented Jul 17, 2017 •

edited

Loading

smarterclayton commented Jul 17, 2017 via email

bparees commented Jul 17, 2017

deads2k commented Jul 17, 2017

smarterclayton commented Jul 17, 2017 via email

bparees commented Jul 18, 2017 •

edited

Loading

smarterclayton Jul 18, 2017

smarterclayton commented Jul 18, 2017

liggitt commented Jul 18, 2017

smarterclayton commented Jul 18, 2017

sttts commented Jul 18, 2017

stevekuznetsov commented Jul 18, 2017

deads2k commented Jul 18, 2017

deads2k commented Jul 18, 2017

deads2k commented Jul 18, 2017

openshift-bot commented Jul 18, 2017

openshift-bot commented Jul 18, 2017

deads2k commented Jul 18, 2017 •

edited

Loading

openshift-bot commented Jul 18, 2017

openshift-bot commented Jul 18, 2017

sttts commented Jul 19, 2017

rebase to kube 1.7 on master #15234

rebase to kube 1.7 on master #15234

Conversation

deads2k commented Jul 17, 2017 • edited Loading

deads2k commented Jul 17, 2017

deads2k commented Jul 17, 2017 • edited Loading

enj commented Jul 17, 2017

bparees commented Jul 17, 2017 • edited Loading

smarterclayton commented Jul 17, 2017 via email

bparees commented Jul 17, 2017

deads2k commented Jul 17, 2017

smarterclayton commented Jul 17, 2017 via email

bparees commented Jul 18, 2017 • edited Loading

smarterclayton Jul 18, 2017

Choose a reason for hiding this comment

smarterclayton commented Jul 18, 2017

liggitt commented Jul 18, 2017

smarterclayton commented Jul 18, 2017

sttts commented Jul 18, 2017

stevekuznetsov commented Jul 18, 2017

deads2k commented Jul 18, 2017

deads2k commented Jul 18, 2017

deads2k commented Jul 18, 2017

openshift-bot commented Jul 18, 2017

openshift-bot commented Jul 18, 2017

deads2k commented Jul 18, 2017 • edited Loading

openshift-bot commented Jul 18, 2017

openshift-bot commented Jul 18, 2017

sttts commented Jul 19, 2017

deads2k commented Jul 17, 2017 •

edited

Loading

deads2k commented Jul 17, 2017 •

edited

Loading

bparees commented Jul 17, 2017 •

edited

Loading

bparees commented Jul 18, 2017 •

edited

Loading

deads2k commented Jul 18, 2017 •

edited

Loading