[Custom Agents] Return the policy name also for 9.x stacks#2761
Merged
mrodm merged 4 commits intoelastic:mainfrom Jul 23, 2025
Merged
[Custom Agents] Return the policy name also for 9.x stacks#2761mrodm merged 4 commits intoelastic:mainfrom
mrodm merged 4 commits intoelastic:mainfrom
Conversation
This reverts commit a2390d6.
Contributor
Author
|
test integrations |
|
Created or updated PR in integrations repository to test this version. Check elastic/integrations#14653 |
Collaborator
💚 Build Succeeded
History
cc @mrodm |
mrodm
commented
Jul 22, 2025
Comment on lines
275
to
284
| func getTokenPolicyName(stackVersion, policyName string) string { | ||
| if strings.HasPrefix(stackVersion, "7.") { | ||
| return "" | ||
| } | ||
| if policyName == "" { | ||
| policyName = defaulFleetTokenPolicyName | ||
| } | ||
| if strings.HasPrefix(stackVersion, "8.") { | ||
| return policyName | ||
| } | ||
| return "" | ||
| // For 8.x and later, we return the given policy name | ||
| return policyName | ||
| } |
Contributor
Author
There was a problem hiding this comment.
Similar to the one defined in agentdeployer module.
elastic-package/internal/agentdeployer/kubernetes.go
Lines 258 to 263 in 2f30958
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes the policy name used in Custom Agents (Deprecated).
with-customandsystem-flagssteps in Buildkite.The method needs to take into account also 9.x Elastic stacks.
This should just affect Custom Agents since in the other scenarios Elastic Agents are setup via Independent Elastic Agents (
agentdeployermodule).Relates #2758
How to test this PR locally