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

bump kubeclient ~> 2.4.0 #156

Merged
merged 1 commit into from
May 10, 2017
Merged

bump kubeclient ~> 2.4.0 #156

merged 1 commit into from
May 10, 2017

Conversation

cben
Copy link
Contributor

@cben cben commented May 10, 2017

@agrare
Copy link
Member

agrare commented May 10, 2017

@cben is there a reason you want to lock it to =2.4.0 and not ~>2.4.0?

@cben
Copy link
Contributor Author

cben commented May 10, 2017

Dunno, it was =2.3.0 :-) @simon3z what do you prefer?
Also, what are your backport/hotfix plans? Will you release kubeclient 2.3.1 or use 2.4.0?

@simon3z
Copy link
Contributor

simon3z commented May 10, 2017

Dunno, it was =2.3.0 :-) @simon3z what do you prefer?
Also, what are your backport/hotfix plans? Will you release kubeclient 2.3.1 or use 2.4.0?

@cben @agrare I don't plan to do hotfixes, but I guess ~>2.4.0 is safe/good anyway.

@cben cben force-pushed the kubeclient-timeout branch from 4aff6a9 to dfb49ce Compare May 10, 2017 13:03
@cben cben changed the title bump kubeclient = 2.4.0 bump kubeclient ~> 2.4.0 May 10, 2017
@miq-bot
Copy link
Member

miq-bot commented May 10, 2017

Checked commit cben@dfb49ce with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
0 files checked, 0 offenses detected
Everything looks fine. 👍

Copy link

@moolitayer moolitayer left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@agrare agrare merged commit 0aeea3d into ManageIQ:master May 10, 2017
@agrare
Copy link
Member

agrare commented May 10, 2017

Thanks @cben !

@cben
Copy link
Contributor Author

cben commented May 10, 2017

@miq-bot add-label euwe/yes, fine/yes

@cben
Copy link
Contributor Author

cben commented May 10, 2017

FYI kubeclient 2.4.0 also brings much newer http gem (which is used for watches).
I've tested it a little bit, but are we confident backporting it?
Well, z-streams do go through QE...

@agrare
Copy link
Member

agrare commented May 10, 2017

@cben could we use kubeclient-2.3.1 (ManageIQ/kubeclient#246) and update the euwe gemfile to be ~>2.3.0?

@cben
Copy link
Contributor Author

cben commented May 10, 2017 via email

@simon3z
Copy link
Contributor

simon3z commented May 10, 2017

@cben could we use kubeclient-2.3.1 (ManageIQ/kubeclient#246) and update the euwe gemfile to be ~>2.3.0?

@agrare why? 2.4 is backward compatible and the only changes are the timeout addition.

@agrare
Copy link
Member

agrare commented May 10, 2017

@simon3z because @cben didn't sound confident​ backporting 2.4.0

@cben
Copy link
Contributor Author

cben commented May 10, 2017 via email

@simon3z
Copy link
Contributor

simon3z commented May 10, 2017

@simon3z because @cben didn't sound confident​ backporting 2.4.0

@agrare @cben 2.4.0 was built only with the addition of the timeout. It's all in the git history you can check:

$ git log --no-merges --oneline v2.3.0..v2.4.0
6f12480 Bump version to 2.4.0
539591f Add timeouts option
991871e ParameterLists rubocop: don't penalize keyword args
cecf873 Test both rest-client 1.8 and latest

@cben
Copy link
Contributor Author

cben commented May 10, 2017

aaaah cool 👍. Now the v2.x branch name makes perfect sense.
For some reason I always assumed master will become 2.4 (and v2.x might become 2.3.1) and was blind to contrary evidence.

@agrare
Copy link
Member

agrare commented May 10, 2017

👍 I'm good with backporting it then

cben added a commit to cben/manageiq-providers-kubernetes that referenced this pull request May 14, 2017
cben added a commit to cben/manageiq-providers-kubernetes that referenced this pull request May 15, 2017
cben added a commit to cben/manageiq that referenced this pull request May 15, 2017
  bump kubeclient ~> 2.4.0
  (ported from manageiq-gems-pending.gemspec to gems/pending/Gemfile)

- Merge ManageIQ/manageiq-providers-kubernetes#10
  kubernetes_connect: add timeout settings
  (cherry picked from merge commit ManageIQ/manageiq-providers-kubernetes@1ee90b5)

- openshift_connect: use kubernetes timeout settings
  (cherry picked from unmerged ManageIQ/manageiq-providers-openshift#8 -
  unnecessary on master but required in backports)
@simaishi
Copy link
Contributor

Marking as euwe/conflict as this needs to go to gems/pending/Gemfile in manageiq repo. @cben please remove the conflict label when you have Euwe PR. Thanks!

@simaishi
Copy link
Contributor

Backported to Euwe via ManageIQ/manageiq#15188

simaishi pushed a commit that referenced this pull request Jun 8, 2017
@simaishi
Copy link
Contributor

simaishi commented Jun 8, 2017

Fine backport details:

$ git log -1
commit 090bb77f454bdb351f34e3f365eadb6ec368b1fe
Author: Adam Grare <[email protected]>
Date:   Wed May 10 09:07:44 2017 -0400

    Merge pull request #156 from cben/kubeclient-timeout
    
    bump kubeclient ~> 2.4.0
    (cherry picked from commit 0aeea3dee8d470eca4f0553d79bf8cb35d66e344)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1459929

simaishi pushed a commit to simaishi/manageiq-gems-pending that referenced this pull request Jul 19, 2017
bump kubeclient ~> 2.4.0
(cherry picked from commit 0aeea3d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants