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

Set --insecure in container when FLEET_SERVER_ENABLE and FLEET_INSECURE set. #25137

Merged
merged 2 commits into from
Apr 19, 2021
Merged

Set --insecure in container when FLEET_SERVER_ENABLE and FLEET_INSECURE set. #25137

merged 2 commits into from
Apr 19, 2021

Conversation

blakerouse
Copy link
Contributor

@blakerouse blakerouse commented Apr 19, 2021 •
edited
Loading

What does this PR do?

Fixes an issue where when both FLEET_SERVER_ENABLE and FLEET_INSECURE is fails to pass --insecure to the enroll command, causing the Elastic Agent to expect that the SSL is fully verified.

Why is it important?

So FLEET_INSECURE works correctly when running with FLEET_SERVER_ENABLE.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • [ ] I have made corresponding changes to the documentation
  • [ ] I have made corresponding change to the default configuration files
  • [ ] I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@blakerouse blakerouse added bug Team:Elastic-Agent Label for the Agent team backport-v7.13.0 Automated backport with mergify labels Apr 19, 2021
@blakerouse blakerouse self-assigned this Apr 19, 2021
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 19, 2021
@blakerouse blakerouse marked this pull request as ready for review April 19, 2021 12:00
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 19, 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 #25137 updated

  • Start Time: 2021-04-19T12:00:58.382+0000

  • Duration: 50 min 6 sec

  • Commit: 15c394e

Test stats 🧪

Test Results
Failed 0
Passed 6740
Skipped 16
Total 6756

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 6740
Skipped 16
Total 6756

ruflin
ruflin approved these changes Apr 19, 2021
View reviewed changes
Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Did not test locally but change makes sense.

@ruflin ruflin mentioned this pull request Apr 19, 2021
Closed
@blakerouse blakerouse changed the title Set --inscure in container when FLEET_SERVER_ENABLE and FLEET_INSECURE set. Set --insecure in container when FLEET_SERVER_ENABLE and FLEET_INSECURE set. Apr 19, 2021
@blakerouse blakerouse merged commit 46a2438 into elastic:master Apr 19, 2021
@blakerouse blakerouse deleted the fix-25086 branch April 19, 2021 14:04
mergify bot pushed a commit that referenced this pull request Apr 19, 2021
@blakerouse
Set --insecure in container when FLEET_SERVER_ENABLE and FLEET_INSECU…
9e60d58 
…RE set. (#25137)

* Set --inscure in container when FLEET_SERVER_ENABLE and FLEET_INSECURE set.

* Add changelog.

(cherry picked from commit 46a2438)
@mergify mergify bot mentioned this pull request Apr 19, 2021
Merged
simitt pushed a commit that referenced this pull request Apr 19, 2021
@mergify @blakerouse
Set --insecure in container when FLEET_SERVER_ENABLE and FLEET_INSECU…
b3d01ef 
…RE set. (#25137) (#25144)

* Set --inscure in container when FLEET_SERVER_ENABLE and FLEET_INSECURE set.

* Add changelog.

(cherry picked from commit 46a2438)

Co-authored-by: Blake Rouse <blake.rouse@elastic.co>
v1v added a commit to v1v/beats that referenced this pull request Apr 20, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/customise…
2d9fb4d 
…-github-pr-comment-template

* upstream/master:
  [Ingest Manager] Keep http and logging config during enroll (elastic#25132)
  Refactor kubernetes autodiscover to avoid skipping short-living pods (elastic#24742)
  [libbeat] New decode xml wineventlog processor (elastic#25115)
  Add svc to agent k8s clusterRole (elastic#25146)
  Add awsfargate module to collect container logs from Amazon ECS on Fargate (elastic#25041)
  [Filebeat][Cisco ASA] log enhancement and performance (elastic#24744)
  Watch kubernetes namespaces for autodiscover metadata for pods (elastic#25117)
  Cyberark Privileged Access Security module (elastic#24803)
  [Elastic Agent] Log the container command output with LOGS_PATH (elastic#25150)
  Fix for tests after `device...` field has been removed (elastic#25141)
  [Ingest Manager] Restart process on output change (elastic#24907)
  Set --insecure in container when FLEET_SERVER_ENABLE and FLEET_INSECURE set. (elastic#25137)
  [filebeat] Update documentation / changelog / beta warnings for the syslog input (elastic#25047)
  Add support for ignore_inactive in filestream input (elastic#25036)
  Fix bug with annotations dedot config on k8s not used (elastic#25111)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simitt simitt simitt approved these changes

@ruflin ruflin ruflin approved these changes

Assignees

@blakerouse blakerouse

Labels
backport-v7.13.0 Automated backport with mergify bug Team:Elastic-Agent Label for the Agent team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[elastic-agent][fleet-server] enrollment fails when certs and localhost are configured
4 participants
@blakerouse @elasticmachine @ruflin @simitt