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

3.5 Upstream pick list #13025

Closed
20 tasks done
pweil- opened this issue Feb 20, 2017 · 21 comments
Closed
20 tasks done

3.5 Upstream pick list #13025

pweil- opened this issue Feb 20, 2017 · 21 comments
Assignees
Milestone

Comments

@pweil-
Copy link
Contributor

pweil- commented Feb 20, 2017

Suggested picks from the last 4 weeks in the kube 1.5 branch. @smarterclayton @ncdc @liggitt @mfojtik @deads2k PTAL and confirm/deny any that you can. Thanks.

Not from 1.5 branch:

@pweil- pweil- added this to the 1.5.0 milestone Feb 20, 2017
@stevekuznetsov
Copy link
Contributor

@pweil- I thought we didn't want the Docker security opt separator choosing logic as we didn't support the older Docker API version anyway

@mdshuai
Copy link

mdshuai commented Feb 21, 2017

@stevekuznetsov Not support doesn't means no one use it, just in case someone use it. If we have this, it will be better. I vote better contain this.
Recently there are two cases use old docker though we don't know why they still use old version.

  1. UPSTREAM: <carry>: Change docker security opt separator to be compatible with 1.11+ #12831 (comment)
  2. https://bugzilla.redhat.com/show_bug.cgi?id=1424629#c2

@pweil-
Copy link
Contributor Author

pweil- commented Feb 21, 2017

@stevekuznetsov yeah, what @mdshuai mentioned is why I'm proposing we pick it. A) it went in to upstream with version specific support so we'll get it anyway in 1.6 and B) we're already receiving bugs on it being "broken".

@stevekuznetsov
Copy link
Contributor

I thought @pmorie had done that for the explicit reason that we do not support that version of Docker and do not want to enable people to use it in the unsupported state. I'll let you guys duke it out :)

@pweil-
Copy link
Contributor Author

pweil- commented Feb 21, 2017

then we need a min version check on startup RFE, not random code that fails 😄

@mfojtik
Copy link
Contributor

mfojtik commented Feb 21, 2017

@pweil- definitely want the AWS: recognize eu-west-2 region :-)

@stevekuznetsov
Copy link
Contributor

@pweil- I am 100% certain that the installer will fail you if you try to install OCP on a system with an old Docker.

@vikaslaad
Copy link

I was able to install OCP 3.5 (with Docker 1.10.3) and installer did not fail, should I create a bug for that ?
https://bugzilla.redhat.com/show_bug.cgi?id=1424629

@stevekuznetsov
Copy link
Contributor

@sdodson seems like a bug ^^

@ncdc
Copy link
Contributor

ncdc commented Feb 21, 2017

kubernetes/kubernetes@3151e6e - flag gate critical pods annotation support in kubelet
Do we need the above? We never allowed those, did we?

I believe @sjenning / @derekwaynecarr reverted upstream changes that enabled "critical pods" in a <carry> commit

@pweil-
Copy link
Contributor Author

pweil- commented Feb 21, 2017

believe @sjenning / @derekwaynecarr reverted upstream changes that enabled "critical pods" in a commit

Removed from the list

@sdodson
Copy link
Member

sdodson commented Feb 21, 2017

@sdodson seems like a bug ^^

Yeah, I think that particular instance was on atomic host where our only recourse is to abort the install/upgrade and have them upgrade to a newer version of atomic host. If for some reason they need downgrade, like 3.3 requiring docker-1.10 then they'll have to downgrade atomic host.

@gnufied
Copy link
Member

gnufied commented Feb 23, 2017

@pweil-
Copy link
Contributor Author

pweil- commented Feb 23, 2017

thanks @gnufied, added to the list. I see the 3.4 PRs but not master ones. Since you've already gone through the trouble of backporting to 3.4 can you open the master/3.5 PRs? If you want to respond on this thread or ping me the numbers in IRC I'll update the main comment.

@gnufied
Copy link
Member

gnufied commented Feb 23, 2017

@pweil- Yes I will bring them to 3.5/master. I was going to in fact, just caught up with 1.6 freeze in upstream.

@mfojtik
Copy link
Contributor

mfojtik commented Feb 28, 2017

@deads2k kubernetes/kubernetes@37cd179 - present request header cert CA (4 weeks ago) -> this does not apply cleanely, can you please check?

@sttts it seems like this overlaps with your 15aaac7 :-)

@sttts
Copy link
Contributor

sttts commented Feb 28, 2017

@mfojtik looks like that's the backport we need to get rid of my patch.

@0xmichalis
Copy link
Contributor

Also needed: kubernetes/kubernetes#42236

@soltysh
Copy link
Contributor

soltysh commented Feb 28, 2017

docker opt separator (consider a backported version of this with docker version check rather than the existing fix)

@pmorie since you're the original author of the PR do we still want to have it for 1.5?

@mfojtik
Copy link
Contributor

mfojtik commented Mar 1, 2017

@pweil- and we are done :-)

@soltysh
Copy link
Contributor

soltysh commented Mar 1, 2017

I think we're done with all cherry-picks, I'm closing this then.

@soltysh soltysh closed this as completed Mar 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests