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

UPSTREAM: 35608: Update PodAntiAffinity to ignore calls to subresources #11578

Merged
merged 1 commit into from
Nov 3, 2016

Conversation

soltysh
Copy link
Contributor

@soltysh soltysh commented Oct 26, 2016

Upon curling Pod's evict endpoint I'm getting: Resource was marked with kind Pod but was unable to be converted since the code in antiaffinity admission is trying to cast Pod to Eviction, which fails. This PR is a cherry-pick from upstream that fixes that problem.

@soltysh
Copy link
Contributor Author

soltysh commented Oct 28, 2016

@mfojtik this is good to merge, since the upstream PR was approved. This will unblock QA testing PDB, so it's quite important to get in asap.

@mfojtik mfojtik added this to the 1.4.0 milestone Oct 31, 2016
@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@soltysh
Copy link
Contributor Author

soltysh commented Oct 31, 2016

Oh, that flake was fixed already, lemme rebase my PR.

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 4cdfcfb

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10861/) (Base Commit: 73c11af)

@mfojtik
Copy link
Contributor

mfojtik commented Nov 2, 2016

We need this to fix https://bugzilla.redhat.com/show_bug.cgi?id=1389255
Already added to list of cherry-picks for kube 1.4.

@ncdc fyi

[merge]

@soltysh
Copy link
Contributor Author

soltysh commented Nov 2, 2016

Flake #11682.

@mfojtik
Copy link
Contributor

mfojtik commented Nov 2, 2016

[merge]

@soltysh
Copy link
Contributor Author

soltysh commented Nov 2, 2016

Flake #10773.

@mfojtik mind retagging?

@mfojtik
Copy link
Contributor

mfojtik commented Nov 3, 2016

[merge]

@soltysh
Copy link
Contributor Author

soltysh commented Nov 3, 2016

Looks like #9355.

@mfojtik
Copy link
Contributor

mfojtik commented Nov 3, 2016

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 4cdfcfb

@soltysh
Copy link
Contributor Author

soltysh commented Nov 3, 2016

What kind of dance should I make to merge this PR 💃 ? Or sacrificing 🐐 🍻 or anything else?

@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 3, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/11072/) (Base Commit: 6abb256) (Image: devenv-rhel7_5307)

@openshift-bot openshift-bot merged commit 029c0dc into openshift:master Nov 3, 2016
@soltysh soltysh deleted the pdb_admission branch November 4, 2016 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants