Skip to content

Conversation

norrietaylor
Copy link
Member

What does this PR do?

The Elastic Endpoint in K8s project has been deprecated. This PR cleans up artifacts that remained in the Agent YAML due to that project.

This PR is tested in the cloud-defend CI pipeline.

Copy link
Contributor

mergify bot commented Jan 12, 2024

This pull request does not have a backport label. Could you fix it @norrietaylor? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v./d./d./d is the label to automatically backport to the 8./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@norrietaylor norrietaylor assigned cmacknz and unassigned norrietaylor Jan 12, 2024
@norrietaylor norrietaylor added backport-v8.11.0 Automated backport with mergify backport-v8.12.0 Automated backport with mergify skip-changelog and removed backport-skip labels Jan 12, 2024
Copy link
Member

@cmacknz cmacknz left a comment

Choose a reason for hiding this comment

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

Thanks!

Copy link
Contributor

@gizas gizas left a comment

Choose a reason for hiding this comment

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

The node autodiscovery of elastic agent is based (in one of the alternatives) to machine-id: https://github.com/elastic/elastic-agent-autodiscover/blob/e3da20d82e3f0fa03637f298d73d631cbd9b0068/kubernetes/util.go#L198

So the mounting of this /etc/machine-id is needed and not to be removed

@MichaelKatsoulis
Copy link
Contributor

The node autodiscovery of elastic agent is based (in one of the alternatives) to machine-id: https://github.com/elastic/elastic-agent-autodiscover/blob/e3da20d82e3f0fa03637f298d73d631cbd9b0068/kubernetes/util.go#L198

So the mounting of this /etc/machine-id is needed and not to be removed

It is the last alternative in case the NODE_NAME env var is not set for any reason. I think it is ok to leave the mount there and update the comment to Needed for Kubernetes node autodiscovery

@norrietaylor norrietaylor force-pushed the norrietaylor/removehostpid branch from 8504235 to bf68154 Compare January 18, 2024 23:15
Copy link

Quality Gate passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No Coverage information No data about Coverage
No Duplication information No data about Duplication

See analysis details on SonarQube

@pierrehilbert
Copy link
Contributor

@norrietaylor what is the plan with this PR? Still relevant?

Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@norrietaylor
Copy link
Member Author

This certainly slipped through the cracks. Apologies.

This is clean up, that we should probably do, as the Elastic Defend integration in K8s is no longer supported or distributed.

I made the changes requested by @gizas and @MichaelKatsoulis. If they give the LGTM, we can merge.

@pierrehilbert pierrehilbert added backport-v8.14.0 Automated backport with mergify and removed backport-v8.11.0 Automated backport with mergify backport-v8.12.0 Automated backport with mergify labels Jul 4, 2024
@pierrehilbert pierrehilbert merged commit 8e35021 into main Jul 4, 2024
@pierrehilbert pierrehilbert deleted the norrietaylor/removehostpid branch July 4, 2024 07:31
mergify bot pushed a commit that referenced this pull request Jul 4, 2024
pierrehilbert pushed a commit that referenced this pull request Jul 8, 2024
…) (#5055)

Co-authored-by: Pierre HILBERT <[email protected]>
(cherry picked from commit 8e35021)

Co-authored-by: Norrie Taylor <[email protected]>
florianl added a commit that referenced this pull request Sep 26, 2025
#4081 removed hostPID. Add comment that this setting is essential for Universal Profiling.

Signed-off-by: Florian Lehner <[email protected]>
florianl added a commit that referenced this pull request Sep 26, 2025
#4081 removed hostPID. Add comment that this setting is essential for Universal Profiling.

Signed-off-by: Florian Lehner <[email protected]>
florianl added a commit that referenced this pull request Sep 26, 2025
…10173)

#4081 removed hostPID. Add comment that this setting is essential for Universal Profiling.

Signed-off-by: Florian Lehner <[email protected]>
mergify bot pushed a commit that referenced this pull request Sep 26, 2025
…10173)

#4081 removed hostPID. Add comment that this setting is essential for Universal Profiling.

Signed-off-by: Florian Lehner <[email protected]>
(cherry picked from commit 6cd7ffc)
mergify bot pushed a commit that referenced this pull request Sep 26, 2025
…10173)

#4081 removed hostPID. Add comment that this setting is essential for Universal Profiling.

Signed-off-by: Florian Lehner <[email protected]>
(cherry picked from commit 6cd7ffc)
florianl added a commit that referenced this pull request Sep 26, 2025
…10173) (#10175)

#4081 removed hostPID. Add comment that this setting is essential for Universal Profiling.


(cherry picked from commit 6cd7ffc)

Signed-off-by: Florian Lehner <[email protected]>
Co-authored-by: Florian Lehner <[email protected]>
florianl added a commit that referenced this pull request Sep 26, 2025
…10173) (#10176)

#4081 removed hostPID. Add comment that this setting is essential for Universal Profiling.


(cherry picked from commit 6cd7ffc)

Signed-off-by: Florian Lehner <[email protected]>
Co-authored-by: Florian Lehner <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v8.14.0 Automated backport with mergify Cleanup skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants