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

[7.13](backport #25741) [Elastic Agent] Fix fleet-server.yml spec to not overwrite existing keys #25745

Merged
merged 3 commits into from
May 18, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2021

This is an automatic backport of pull request #25741 done by Mergify.
Cherry-pick of e1676e7 has failed:

On branch mergify/bp/7.13/pr-25741
Your branch is up to date with 'origin/7.13'.

You are currently cherry-picking commit e1676e76e5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   x-pack/elastic-agent/CHANGELOG.next.asciidoc
	modified:   x-pack/elastic-agent/pkg/agent/program/testdata/fleet_server-fleet-server.yml
	modified:   x-pack/elastic-agent/pkg/agent/program/testdata/fleet_server.yml
	modified:   x-pack/elastic-agent/pkg/agent/transpiler/rules.go
	modified:   x-pack/elastic-agent/pkg/agent/transpiler/rules_test.go
	modified:   x-pack/elastic-agent/spec/fleet-server.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/elastic-agent/pkg/agent/program/supported.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

…eys (#25741)

* Fix fleet-server.yml spec to not overwrite exsting keys.

* Add changelog.

* Fix test.

(cherry picked from commit e1676e7)

# Conflicts:
#	x-pack/elastic-agent/pkg/agent/program/supported.go
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 17, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 17, 2021
@botelastic
Copy link

botelastic bot commented May 17, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 17, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #25745 updated

  • Start Time: 2021-05-18T04:27:52.256+0000

  • Duration: 55 min 17 sec

  • Commit: 9c575b4

Test stats 🧪

Test Results
Failed 0
Passed 6860
Skipped 24
Total 6884

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 6860
Skipped 24
Total 6884

@blakerouse
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Contributor Author

mergify bot commented May 18, 2021

Command rebase: success

Branch already up to date

@ruflin ruflin merged commit 64ec737 into 7.13 May 18, 2021
@ruflin ruflin deleted the mergify/bp/7.13/pr-25741 branch May 18, 2021 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants