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

k8s minor bug fixes #56168

Open
wants to merge 1 commit into
base: devel
from

Conversation

Projects
None yet
3 participants
@willthames
Copy link
Contributor

commented May 7, 2019

SUMMARY

Ensure wait_conditions with Status: Unknown actually
complete

Return k8s object after wait rather than k8s object before
wait when object is patched.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

module_utils/k8s/raw

ADDITIONAL INFORMATION

Candidate for 2.8 backport.

@willthames willthames force-pushed the willthames:k8s_raw_fixes branch from 2dc594a to 818a877 May 7, 2019

@ansibot

This comment has been minimized.

@@ -437,6 +436,9 @@ def _custom_condition(resource):
# There should never be more than one condition of a specific type
match = match[0]
if match.status == 'Unknown':
if match.status == condition['status']:
if condition.get('reason'):
return match.reason == condition['reason']

This comment has been minimized.

Copy link
@fabianvf

fabianvf May 17, 2019

Contributor

Should we also return one step up from this conditional, in case they didn't specify a reason but did specify a status of Unknown?

This comment has been minimized.

Copy link
@willthames

willthames May 18, 2019

Author Contributor

Or change to condition.get('reason', True) ?

This comment has been minimized.

Copy link
@willthames

willthames May 18, 2019

Author Contributor

Could also be more explicit with condition.get('reason') or 'reason' not in condition

@ansibot ansibot removed the needs_triage label May 17, 2019

@willthames willthames force-pushed the willthames:k8s_raw_fixes branch from 818a877 to 368c4f4 May 19, 2019

@ansibot ansibot removed the stale_ci label May 19, 2019

k8s minor bug fixes
Ensure `wait_condition`s with `Status: Unknown` actually
complete

Return k8s object after wait rather than k8s object before
wait when object is patched.

@willthames willthames force-pushed the willthames:k8s_raw_fixes branch from 368c4f4 to 18b7abc May 20, 2019

@fabianvf

This comment has been minimized.

Copy link
Contributor

commented May 20, 2019

shipit

@ansibot ansibot added shipit and removed community_review labels May 20, 2019

@willthames

This comment has been minimized.

Copy link
Contributor Author

commented May 20, 2019

bot_status

@ansibot

This comment has been minimized.

Copy link
Contributor

commented May 20, 2019

Components

changelogs/fragments/k8s-raw-minor-fixes.yml
support: community
maintainers:

lib/ansible/module_utils/k8s/raw.py
support: community
maintainers: chouseknecht fabianvf flaper87 maxamillion willthames

test/integration/targets/k8s/tasks/waiter.yml
support: community
maintainers: chouseknecht fabianvf flaper87 maxamillion willthames

Metadata

waiting_on: maintainer
changes_requested_by: null
needs_info: False
needs_revision: False
needs_rebase: False
merge_commits: []
too many files or commits: False
mergeable_state: clean
shippable_status: success
maintainer_shipits (module maintainers): 1
community_shipits (namespace maintainers): 0
ansible_shipits (core team members): 1
shipit_actors (maintainers or core team members): fabianvf willthames
shipit_actors_other: []
automerge: automerge is_module test failed

click here for bot help

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.