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

Backport fixes for k8s module 2.6 #42525

Merged
merged 3 commits into from Jul 27, 2018

Conversation

@ansibot
Copy link
Contributor

ansibot commented Jul 9, 2018

@ansibot ansibot added affects_2.6 This issue/PR affects Ansible v2.6 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. support:community This issue/PR relates to code supported by the Ansible community. support:core This issue/PR relates to code supported by the Ansible Engineering Team. test This PR relates to tests. labels Jul 9, 2018
@ansibot
Copy link
Contributor

ansibot commented Jul 9, 2018

The test ansible-test sanity --test pep8 [explain] failed with 1 error:

lib/ansible/module_utils/k8s/raw.py:115:5: E303 too many blank lines (2)

click here for bot help

@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. and removed core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jul 9, 2018
@bcoca bcoca removed the needs_triage Needs a first human triage before being processed. label Jul 9, 2018
@fabianvf
Copy link
Contributor Author

rebuild_merge

@fabianvf
Copy link
Contributor Author

fabianvf commented Jul 10, 2018

@maxamillion don't think the build failure is related, or if it is not sure what would cause it. Looks like it failed to find the openshift python client.

@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. labels Jul 10, 2018
@maxamillion
Copy link
Contributor

rekicking CI, network timeouts seem to be failing unrelated tests

@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. labels Jul 10, 2018
@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. core_review In order to be merged, this PR must follow the core review workflow. labels Jul 10, 2018
@mattclay
Copy link
Member

bot_status

@ansibot
Copy link
Contributor

ansibot commented Jul 17, 2018

@ansibot
Copy link
Contributor

ansibot commented Jul 17, 2018

Components

lib/ansible/module_utils/k8s/common.py
support: core
maintainers: chouseknecht fabianvf flaper87 maxamillion willthames

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

lib/ansible/modules/clustering/k8s/k8s.py
support: community
maintainers: chouseknecht fabianvf flaper87 maxamillion willthames

lib/ansible/utils/module_docs_fragments/k8s_resource_options.py
support: core
maintainers:

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

Metadata

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

click here for bot help

@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jul 17, 2018
@mattclay
Copy link
Member

Two of the PRs being backported appear to be new features rather than bug fixes:

#40730
#42377

Normally only bug fixes are backported to stable releases.

@fabianvf
Copy link
Contributor Author

I suppose they are features. I was really hoping #40730 could make it back, because many existing kubernetes files are multidocument yaml, which can't be read by the from_yaml. This means a large portion of existing kubernetes projects can't be easily automated in Ansible 2.6.

#42377 is a follow-up that enabled lists as well, as a stop-gap for proper support of *List kinds in the Python client.

These two PRs together fix a lot of behavior that makes the modules look broken from a user perspective, without them they may have to make significant changes to their templates to make their existing kubernetes definitions work in Ansible.

@willthames
Copy link
Contributor

For #40730 we could just document the workaround for multi-document yaml

k8s:
  definition="{{ item }}"
loop: "{{ lookup('template', 'resource.yaml').split('\n---\n')|map('from_yaml')|select('ne', None)|list) }}"

@fabianvf
Copy link
Contributor Author

@mattclay should I take those two out and bring them up at the next community meeting to discuss backporting them?

@fabianvf
Copy link
Contributor Author

@mattclay removed the offending commits.

@ansibot ansibot added needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed core_review In order to be merged, this PR must follow the core review workflow. module This issue/PR relates to a module. support:community This issue/PR relates to code supported by the Ansible community. labels Jul 19, 2018
@fabianvf
Copy link
Contributor Author

Failures seem unrelated, can we rekick?

@ansibot ansibot removed the needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. label Jul 20, 2018
@fabianvf
Copy link
Contributor Author

ping @mattclay

@mattclay mattclay merged commit 953cd53 into ansible:stable-2.6 Jul 27, 2018
@dagwieers dagwieers added the k8s label Feb 8, 2019
@ansible ansible locked and limited conversation to collaborators Jul 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects_2.6 This issue/PR affects Ansible v2.6 backport This PR does not target the devel branch. bug This issue/PR relates to a bug. k8s support:core This issue/PR relates to code supported by the Ansible Engineering Team. test This PR relates to tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants