AMLII-2213 Add FIPS agent image option #1310
Merged
+31
−0
Conversation
This file contains 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
Also expose FIPS and JMX options via command-line config arguments for local testing
The image name is `foo-fips-jmx`. `-fips` must be added to the suffix first, thus it's defer must come last.
vickenty
changed the title
pducolin
reviewed
Dec 19, 2024
components/datadog/agent/docker.go
Outdated
| if p.FIPS { | ||
| p.FullImagePath += "-fips" | ||
| } | ||
| }(params) |
There was a problem hiding this comment.
❓ question
How does this work if both jmx and fips are set?
There was a problem hiding this comment.
It produces -fips-jmx suffix, that matches the naming scheme for our images. (defers run in the opposite order compared to source code).
There was a problem hiding this comment.
What about having them in a single defer function? Might help with readability
Co-authored-by: pducolin <[email protected]>
pducolin
approved these changes
Dec 23, 2024
|
/merge |
Devflow running:
|
dd-devflow
bot
added
mergequeue-status: queued
mergequeue-status: in_progress
and removed
mergequeue-status: queued
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What does this PR do?
Add option to request FIPS-flavored agent image
Which scenarios this will impact?
New e2e JMXFetch tests (TBD) using FIPS JMX agent images
Motivation
Additional Notes