Skip to content

[7.x](backport #26529) [Elastic Agent] Fix issue with FLEET_CA not being used with Fleet Server in container#26540

Merged
blakerouse merged 2 commits into7.xfrom
mergify/bp/7.x/pr-26529
Jun 28, 2021
Merged

[7.x](backport #26529) [Elastic Agent] Fix issue with FLEET_CA not being used with Fleet Server in container#26540
blakerouse merged 2 commits into7.xfrom
mergify/bp/7.x/pr-26529

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 28, 2021 •
edited by zube bot
Loading

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

On branch mergify/bp/7.x/pr-26529
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit a8cb588d1.
  (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/pkg/agent/cmd/container.go

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

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/

@blakerouse
[Elastic Agent] Fix issue with FLEET_CA not being used with Fleet Ser…
31ea3ee 
…ver in container (#26529)

* Fix issue with FLEET_CA not being used with fleet server is enabled in container.

* Add changelog.

(cherry picked from commit a8cb588)

# Conflicts:
#	x-pack/elastic-agent/CHANGELOG.asciidoc
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 28, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 28, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 28, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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 #26540 updated

  • Start Time: 2021-06-28T19:58:52.608+0000

  • Duration: 94 min 4 sec

  • Commit: 03e10c7

Test stats 🧪

Test Results
Failed 0
Passed 6916
Skipped 24
Total 6940

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 6916
Skipped 24
Total 6940

@blakerouse blakerouse added the Team:Elastic-Agent Label for the Agent team label Jun 28, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 28, 2021

Pinging @elastic/agent (Team:Agent)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 28, 2021
@blakerouse blakerouse merged commit 6547261 into 7.x Jun 28, 2021
@blakerouse blakerouse deleted the mergify/bp/7.x/pr-26529 branch June 28, 2021 23:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@blakerouse blakerouse

Labels

backport conflicts There is a conflict in the backported pull request Team:Elastic-Agent Label for the Agent team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@elasticmachine @blakerouse