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.

Sign up for GitHub

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

Jump to bottom

K8s retry merge #44821

Merged
merged 2 commits into from
Aug 31, 2018
Merged

K8s retry merge #44821

merged 2 commits into from
Aug 31, 2018

Conversation

willthames
Copy link
Contributor

@willthames willthames commented Aug 29, 2018 •
edited

SUMMARY

Make merge_type a list and apply merge_type in order

Allow use case of preferring strategic-merge and failing
back to merge, or just preferring a different merge type

Improve test suite

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

k8s

ANSIBLE VERSION
ansible 2.7.0.a1.post0 (devel b35ac8080f) last updated 2018/08/29 21:48:14 (GMT +1000)
  config file = None
  configured module search path = [u'/Users/will/.ansible/plugins/modules', u'/usr/share/ansible/plugins/modules']
  ansible python module location = /Users/will/src/ansible/lib/ansible
  executable location = /Users/will/src/ansible/bin/ansible
  python version = 2.7.14 (default, Mar  9 2018, 23:57:12) [GCC 4.2.1 Compatible Apple LLVM 9.0.0 (clang-900.0.39.2)]
ADDITIONAL INFORMATION

@willthames
Make merge_type a list and apply merge_type in order
e7fed9e 
Allow use case of preferring strategic-merge and failing
back to merge, or just preferring a different merge type
@willthames willthames mentioned this pull request Aug 29, 2018
Merged
@ansibot
Copy link
Contributor

ansibot commented Aug 29, 2018

cc @chouseknecht @fabianvf @flaper87 @mattclay @maxamillion
click here for bot help

@ansibot ansibot added affects_2.7 This issue/PR affects Ansible v2.7 core_review In order to be merged, this PR must follow the core review workflow. feature This issue/PR relates to a feature request. 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 Aug 29, 2018
@ansibot
Copy link
Contributor

ansibot commented Aug 29, 2018

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

test/integration/targets/k8s/tasks/main.yml:403:1: empty-lines too many blank lines (1 > 0)

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. and removed core_review In order to be merged, this PR must follow the core review workflow. labels Aug 29, 2018
@jborean93 jborean93 removed the needs_triage Needs a first human triage before being processed. label Aug 30, 2018
@willthames willthames mentioned this pull request Aug 30, 2018
Closed
@maxamillion
Copy link
Contributor

rebuild_merge

@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 Aug 30, 2018
@ansibot
Copy link
Contributor

ansibot commented Aug 30, 2018

The test ansible-test sanity --test docs-build [explain] failed with 16 errors:

docs/docsite/rst/index.rst:0:0: unknown: 
docs/docsite/rst/index.rst:0:0: unknown: 
docs/docsite/rst/index.rst:0:0: unknown: 
docs/docsite/rst/index.rst:0:0: unknown: 
docs/docsite/rst/index.rst:0:0: unknown: ,,,,,,,,,,,,,,,,
docs/docsite/rst/index.rst:0:0: unknown: ,,,,,,,,,,,,,,,,,,,,,,,,,
docs/docsite/rst/index.rst:0:0: unknown: ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
docs/docsite/rst/index.rst:0:0: unknown: ,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
docs/docsite/rst/index.rst:0:0: unknown: Configure your local user
docs/docsite/rst/index.rst:0:0: unknown: Generate certificate and private key
docs/docsite/rst/index.rst:0:0: unknown: More information
docs/docsite/rst/index.rst:0:0: unknown: Use signature-based authentication with Ansible
docs/docsite/rst/scenario_guides/guide_aci.rst:298:0: warning: Title level inconsistent:
docs/docsite/rst/scenario_guides/guide_aci.rst:306:0: warning: Title level inconsistent:
docs/docsite/rst/scenario_guides/guide_aci.rst:338:0: warning: Title level inconsistent:
docs/docsite/rst/scenario_guides/guide_aci.rst:350:0: warning: Title level inconsistent:

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

docs/docsite/rst/scenario_guides/guide_aci.rst:298:0: Title level inconsistent:

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 Aug 30, 2018
@ansibot ansibot merged commit ce110ff into ansible:devel Aug 31, 2018
@willthames willthames deleted the k8s_retry_merge branch August 31, 2018 01:22
@fabianvf fabianvf mentioned this pull request Sep 3, 2018
Closed
@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.
Reviewers

@maxamillion maxamillion Awaiting requested review from maxamillion

Assignees
No one assigned
Labels
affects_2.7 This issue/PR affects Ansible v2.7 core_review In order to be merged, this PR must follow the core review workflow. feature This issue/PR relates to a feature request. k8s module This issue/PR relates to a module. 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@willthames @ansibot @maxamillion @dagwieers @jborean93