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

[Fleet] Add missing step showing K8 instructions for managed enrollment #130295

Merged
merged 4 commits into from
Apr 15, 2022
Merged

[Fleet] Add missing step showing K8 instructions for managed enrollment #130295

merged 4 commits into from
Apr 15, 2022

Conversation

criamico
Copy link
Contributor

@criamico criamico commented Apr 14, 2022 •
edited
Loading

Summary

Fix #130201

In 128381 the managed instructions for kubernetes are missing. This PR reintroduces them.

Testing

Case 1 (Fleet)

  • Go to fleet (with fleet server already running) click "Add agent" and and select an agent policy that has the kubernetes package policy installed. The "fleet" instructions should be like below:

Screenshot 2022-04-14 at 17 54 17
Screenshot 2022-04-14 at 17 54 26

Case 2 (Integrations)

  • Go to integrations and install the "Kubernetes" package, at the end go to the "Add agent to your hosts" and check the flyout, it should have the kubernetes manifest:

Screenshot 2022-04-14 at 15 37 50
Screenshot 2022-04-14 at 15 37 59

Checklist

Delete any items that are not applicable to this PR.

  • Unit or functional tests were updated or added to match the most common scenarios
  • Any UI touched in this PR is usable by keyboard only (learn more about keyboard accessibility)
  • Any UI touched in this PR does not create any new axe failures (run axe in browser: FF, Chrome)

@criamico criamico requested a review from a team as a code owner April 14, 2022 16:32
@botelastic botelastic bot added the Team:Fleet Team label for Observability Data Collection Fleet team label Apr 14, 2022
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@criamico criamico self-assigned this Apr 14, 2022
@criamico criamico added v8.2.0 v8.3.0 release_note:skip Skip the PR/issue when compiling release notes auto-backport Deprecated - use backport:version if exact versions are needed labels Apr 14, 2022
criamico
criamico commented Apr 14, 2022
View reviewed changes
x-pack/plugins/fleet/public/components/agent_enrollment_flyout/download_instructions.tsx
@@ -0,0 +1,187 @@
/*
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I extracted this component from the DownloadStep to avoid any rendering issue. Since the steps components are not actual react components but return EuiContainedStepProps instead, if any hook is used inside them, they tend to break badly. This solution avoids getting into that state.

@jen-huang jen-huang changed the title [Fleet] Add missing step showing K85 instructions for managed enrollment [Fleet] Add missing step showing K8 instructions for managed enrollment Apr 14, 2022
@nchaulet nchaulet self-requested a review April 14, 2022 17:14
@jen-huang jen-huang self-requested a review April 14, 2022 19:15
jen-huang
jen-huang reviewed Apr 14, 2022
View reviewed changes
Copy link
Contributor

@jen-huang jen-huang left a comment

Choose a reason for hiding this comment

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

Thanks for the quick turnaround @criamico. I tested locally and things are looking good. I noticed that the Installation step copy includes the normal copy as well as the K8 copy. Can we remove the normal copy (highlighted below) when installing on K8?

image

@criamico
Copy link
Contributor Author

@jen-huang I removed the duplicated text but also did some clean up/refactor of the manual and standalone commands. It's nothing risky, this is just to remove some difference in the implementation of two similar steps and will make our life easier in the next changes (like the fleet server one).

nchaulet
nchaulet approved these changes Apr 15, 2022
View reviewed changes
Copy link
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

Looks good to me 🚀

@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id before after diff
fleet 593 595 +2

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
fleet 693.0KB 692.7KB -239.0B

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

cc @criamico

@criamico criamico merged commit 92db72b into elastic:main Apr 15, 2022
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 8.2 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 130295

Questions ?

Please refer to the Backport tool documentation

@criamico criamico mentioned this pull request Apr 15, 2022
Merged
criamico added a commit to criamico/kibana that referenced this pull request Apr 15, 2022
@criamico
[Fleet] Add missing step showing K8 instructions for managed enrollme…
38343ea 
…nt (elastic#130295)

* [Fleet] Add missing step showing K85 instructions for managed enrollment

* Fix checks

* Remove duplicated text and clean up commands

* Fix failing check

(cherry picked from commit 92db72b)

# Conflicts:
#	x-pack/plugins/translations/translations/fr-FR.json
#	x-pack/plugins/translations/translations/ja-JP.json
#	x-pack/plugins/translations/translations/zh-CN.json
criamico added a commit that referenced this pull request Apr 15, 2022
@criamico
[8.2] [Fleet] Add missing step showing K8 instructions for managed en…
b227f03 
…rollment (#130295) (#130388)

* [Fleet] Add missing step showing K8 instructions for managed enrollment (#130295)

* [Fleet] Add missing step showing K85 instructions for managed enrollment

* Fix checks

* Remove duplicated text and clean up commands

* Fix failing check

(cherry picked from commit 92db72b)

# Conflicts:
#	x-pack/plugins/translations/translations/fr-FR.json
#	x-pack/plugins/translations/translations/ja-JP.json
#	x-pack/plugins/translations/translations/zh-CN.json

* Fix translations
dmlemeshko pushed a commit to dmlemeshko/kibana that referenced this pull request May 5, 2022
@criamico @dmlemeshko
[Fleet] Add missing step showing K8 instructions for managed enrollme…
a53ce11 
…nt (elastic#130295)

* [Fleet] Add missing step showing K85 instructions for managed enrollment

* Fix checks

* Remove duplicated text and clean up commands

* Fix failing check
kertal pushed a commit to kertal/kibana that referenced this pull request May 24, 2022
@criamico @kertal
[Fleet] Add missing step showing K8 instructions for managed enrollme…
7953b1f 
…nt (elastic#130295)

* [Fleet] Add missing step showing K85 instructions for managed enrollment

* Fix checks

* Remove duplicated text and clean up commands

* Fix failing check
@criamico criamico deleted the agent_flyout/130201_missing_k8s branch July 12, 2022 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jen-huang jen-huang jen-huang left review comments

@nchaulet nchaulet nchaulet approved these changes

Assignees

@criamico criamico

Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v8.2.0 v8.3.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Fleet] k8 instructions is lost after agent flyout redesign
6 participants
@criamico @elasticmachine @kibana-ci @kibanamachine @nchaulet @jen-huang