Skip to content

[8.19] (backport #8429) Add docker image name template and renamed fips cloud specs #8443

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.

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

Merged
merged 2 commits into from
Jun 10, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 10, 2025

What does this PR do?

This PR adds FIPS artifacts elastic-agent-cloud-fips* alongside the existing elastic-agent-fips-cloud* to ease scripting around fips/non-fips capable image variants.

Introduced a new optional packaging spec setting docker_image_name_template where a go template can be specified to control the rendered name of the docker image.

Why is it important?

Simplify scripting around fips/non-fips capable docjer image names.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • 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/fragments using the changelog tool
  • [ ] I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

This is an automatic backport of pull request #8429 done by [Mergify](https://mergify.com).

@mergify mergify bot requested a review from a team as a code owner June 10, 2025 15:25
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 10, 2025
@mergify mergify bot requested review from blakerouse and pchila and removed request for a team June 10, 2025 15:25
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 10, 2025
@mergify mergify bot assigned pchila Jun 10, 2025
@mergify mergify bot added the backport label Jun 10, 2025
Copy link
Contributor Author

mergify bot commented Jun 10, 2025

Cherry-pick of 79dec1c has failed:

On branch mergify/bp/8.19/pr-8429
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 79dec1cc2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   dev-tools/packaging/packages.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   dev-tools/mage/dockerbuilder.go
	both modified:   dev-tools/mage/pkgtypes.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added enhancement New feature or request Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Jun 10, 2025
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

* Add docker image name template and renamed fips cloud specs

* Add debug log for saving docker images
@pchila pchila force-pushed the mergify/bp/8.19/pr-8429 branch from 31d4094 to beba904 Compare June 10, 2025 16:20
pchila
pchila previously approved these changes Jun 10, 2025
@pchila pchila force-pushed the mergify/bp/8.19/pr-8429 branch from fa8541b to fd5864f Compare June 10, 2025 16:33
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

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

cc @pchila

@pchila pchila merged commit 23a0b70 into 8.19 Jun 10, 2025
11 checks passed
@pchila pchila deleted the mergify/bp/8.19/pr-8429 branch June 10, 2025 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request enhancement New feature or request skip-changelog Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants