Skip to content

[FIPS][Build] Add Wolfi tag to FIPS image#217247

Merged
Ikuni17 merged 3 commits into
elastic:mainfrom
Ikuni17:fix/rename-fips-images
Apr 7, 2025
Merged

[FIPS][Build] Add Wolfi tag to FIPS image#217247
Ikuni17 merged 3 commits into
elastic:mainfrom
Ikuni17:fix/rename-fips-images

Conversation

@Ikuni17
Copy link
Copy Markdown
Contributor

@Ikuni17 Ikuni17 commented Apr 4, 2025 •
edited by kibanamachine
Loading

Summary

Adjusts the Docker tag for the Wolfi FIPS image from kibana-fips to kibana-wolfi-fips to avoid confusion in the future. The other products use <product>-fips naming for released Cloud artifacts but our artifact is kibana-cloud-fips.

Considerations

This changeset could be further reaching, but unsure if it's necessary and would like other opinions. If we want to change it now is the time while adoption is low. For example, we're using --skip-docker-fips in build scripts or GH label ci:build-docker-fips. We could align these better, adding wolfi but don't think it is necessary.

@Ikuni17 Ikuni17 added Team:Operations Kibana-Operations Team release_note:skip Skip the PR/issue when compiling release notes v9.0.0 ci:build-docker-fips Build Docker FIPS image backport:version Backport to applied version labels v8.19.0 ci:build-cloud-fips-image labels Apr 4, 2025
@Ikuni17 Ikuni17 self-assigned this Apr 4, 2025
@Ikuni17 Ikuni17 requested a review from a team as a code owner April 4, 2025 18:26
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 4, 2025

Pinging @elastic/kibana-operations (Team:Operations)

jbudz
jbudz reviewed Apr 7, 2025
View reviewed changes
Comment thread .buildkite/scripts/steps/fips/build_cloud_fips_image.sh Outdated
jbudz
jbudz reviewed Apr 7, 2025
View reviewed changes
Comment thread .buildkite/scripts/steps/fips/build_cloud_fips_image.sh Outdated

CLOUD_FIPS_IMAGE=$(docker images --format "{{.Repository}}:{{.Tag}}" docker.elastic.co/kibana-ci/kibana-cloud-fips)
cat <<EOF | buildkite-agent annotate --style "info" --context kibana-cloud-fips-image
CLOUD_FIPS_IMAGE=$(docker images --format "{{.Repository}}:{{.Tag}}" docker.elastic.co/kibana-ci/kibana-fips)
Copy link
Copy Markdown
Contributor

@jbudz jbudz Apr 7, 2025

Choose a reason for hiding this comment

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

The rename seems off to me, but if it's the decided approach I'm not going to block.

Cloud images have a different entrypoint and include beats, and to not note that in the image name seems misleading.

Copy link
Copy Markdown
Contributor Author

@Ikuni17 Ikuni17 Apr 7, 2025

Choose a reason for hiding this comment

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

I'm not really set on the rename either and agree with you. My main concern was someone pulling kibana-fips expecting the released, Cloud artifact since the naming aligns with the rest of the stack products.

I reverted the changes (cbd69ba) to the Cloud FIPS image naming, and added the -wolfi tag to the other image. So we'll have kibana-wolfi-fips and kibana-cloud-fips.

@Ikuni17 Ikuni17 changed the title [FIPS][Build] Rename FIPS image tags [FIPS][Build] Add Wolfi tag to FIPS iamge Apr 7, 2025
@Ikuni17 Ikuni17 changed the title [FIPS][Build] Add Wolfi tag to FIPS iamge [FIPS][Build] Add Wolfi tag to FIPS image Apr 7, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 7, 2025

⏳ Build in-progress

  • Buildkite Build
  • Commit: cbd69ba
  • Kibana FIPS Image: docker.elastic.co/kibana-ci/kibana-wolfi-fips:9.1.0-SNAPSHOT-cbd69ba090ca1d897b80b71a0da46e1b348242b9

History

cc @Ikuni17

@Ikuni17 Ikuni17 merged commit dcb4242 into elastic:main Apr 7, 2025
@Ikuni17 Ikuni17 deleted the fix/rename-fips-images branch April 7, 2025 17:27
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Apr 7, 2025

Starting backport for target branches: 8.x, 9.0

https://github.com/elastic/kibana/actions/runs/14315589916

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Apr 7, 2025
@Ikuni17
[FIPS][Build] Add Wolfi tag to FIPS image (elastic#217247)
0db22f7 
## Summary

Adjusts the Docker tag for the Wolfi FIPS image from `kibana-fips` to
`kibana-wolfi-fips` to avoid confusion in the future. The other products
use `<product>-fips` naming for released Cloud artifacts but our
artifact is `kibana-cloud-fips`.

### Considerations

This changeset could be further reaching, but unsure if it's necessary
and would like other opinions. If we want to change it now is the time
while adoption is low. For example, we're using `--skip-docker-fips` in
build scripts or GH label `ci:build-docker-fips`. We could align these
better, adding `wolfi` but don't think it is necessary.

(cherry picked from commit dcb4242)
@kibanamachine kibanamachine mentioned this pull request Apr 7, 2025
Merged
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Apr 7, 2025

💔 Some backports could not be created

Status Branch Result
❌ 8.x Backport failed because of merge conflicts
✅ 9.0

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 217247

Questions ?

Please refer to the Backport tool documentation

@Ikuni17 Ikuni17 mentioned this pull request Apr 7, 2025
Merged
@Ikuni17
Copy link
Copy Markdown
Contributor Author

Ikuni17 commented Apr 7, 2025

💚 All backports created successfully

Status Branch Result
✅ 8.x

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

Ikuni17 added a commit that referenced this pull request Apr 7, 2025
@kibanamachine @Ikuni17
[9.0] [FIPS][Build] Add Wolfi tag to FIPS image (#217247) (#217382)
50ac820 
# Backport

This will backport the following commits from `main` to `9.0`:
- [[FIPS][Build] Add Wolfi tag to FIPS image
(#217247)](#217247)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Brad
White","email":"Ikuni17@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-04-07T17:27:18Z","message":"[FIPS][Build]
Add Wolfi tag to FIPS image (#217247)\n\n## Summary\n\nAdjusts the
Docker tag for the Wolfi FIPS image from `kibana-fips`
to\n`kibana-wolfi-fips` to avoid confusion in the future. The other
products\nuse `<product>-fips` naming for released Cloud artifacts but
our\nartifact is `kibana-cloud-fips`.\n\n\n### Considerations\n\nThis
changeset could be further reaching, but unsure if it's necessary\nand
would like other opinions. If we want to change it now is the
time\nwhile adoption is low. For example, we're using
`--skip-docker-fips` in\nbuild scripts or GH label
`ci:build-docker-fips`. We could align these\nbetter, adding `wolfi` but
don't think it is
necessary.","sha":"dcb4242843e6ee4ec7d7448075b0f5d985e0f1f4","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","v9.0.0","ci:build-docker-fips","backport:version","v9.1.0","v8.19.0","ci:build-cloud-fips-image"],"title":"[FIPS][Build]
Add Wolfi tag to FIPS
image","number":217247,"url":"https://github.com/elastic/kibana/pull/217247","mergeCommit":{"message":"[FIPS][Build]
Add Wolfi tag to FIPS image (#217247)\n\n## Summary\n\nAdjusts the
Docker tag for the Wolfi FIPS image from `kibana-fips`
to\n`kibana-wolfi-fips` to avoid confusion in the future. The other
products\nuse `<product>-fips` naming for released Cloud artifacts but
our\nartifact is `kibana-cloud-fips`.\n\n\n### Considerations\n\nThis
changeset could be further reaching, but unsure if it's necessary\nand
would like other opinions. If we want to change it now is the
time\nwhile adoption is low. For example, we're using
`--skip-docker-fips` in\nbuild scripts or GH label
`ci:build-docker-fips`. We could align these\nbetter, adding `wolfi` but
don't think it is
necessary.","sha":"dcb4242843e6ee4ec7d7448075b0f5d985e0f1f4"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.x"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/217247","number":217247,"mergeCommit":{"message":"[FIPS][Build]
Add Wolfi tag to FIPS image (#217247)\n\n## Summary\n\nAdjusts the
Docker tag for the Wolfi FIPS image from `kibana-fips`
to\n`kibana-wolfi-fips` to avoid confusion in the future. The other
products\nuse `<product>-fips` naming for released Cloud artifacts but
our\nartifact is `kibana-cloud-fips`.\n\n\n### Considerations\n\nThis
changeset could be further reaching, but unsure if it's necessary\nand
would like other opinions. If we want to change it now is the
time\nwhile adoption is low. For example, we're using
`--skip-docker-fips` in\nbuild scripts or GH label
`ci:build-docker-fips`. We could align these\nbetter, adding `wolfi` but
don't think it is
necessary.","sha":"dcb4242843e6ee4ec7d7448075b0f5d985e0f1f4"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Brad White <Ikuni17@users.noreply.github.com>
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Apr 8, 2025
@kibanamachine
Copy link
Copy Markdown
Contributor

kibanamachine commented Apr 8, 2025

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

Ikuni17 added a commit that referenced this pull request Apr 8, 2025
@Ikuni17
[8.x] [FIPS][Build] Add Wolfi tag to FIPS image (#217247) (#217383)
cc4a91d 
# Backport

This will backport the following commits from `main` to `8.x`:
- [[FIPS][Build] Add Wolfi tag to FIPS image
(#217247)](#217247)

<!--- Backport version: 9.6.6 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sorenlouv/backport)

<!--BACKPORT [{"author":{"name":"Brad
White","email":"Ikuni17@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-04-07T17:27:18Z","message":"[FIPS][Build]
Add Wolfi tag to FIPS image (#217247)\n\n## Summary\n\nAdjusts the
Docker tag for the Wolfi FIPS image from `kibana-fips`
to\n`kibana-wolfi-fips` to avoid confusion in the future. The other
products\nuse `<product>-fips` naming for released Cloud artifacts but
our\nartifact is `kibana-cloud-fips`.\n\n\n### Considerations\n\nThis
changeset could be further reaching, but unsure if it's necessary\nand
would like other opinions. If we want to change it now is the
time\nwhile adoption is low. For example, we're using
`--skip-docker-fips` in\nbuild scripts or GH label
`ci:build-docker-fips`. We could align these\nbetter, adding `wolfi` but
don't think it is
necessary.","sha":"dcb4242843e6ee4ec7d7448075b0f5d985e0f1f4","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","v9.0.0","ci:build-docker-fips","backport:version","v9.1.0","v8.19.0","ci:build-cloud-fips-image"],"title":"[FIPS][Build]
Add Wolfi tag to FIPS
image","number":217247,"url":"https://github.com/elastic/kibana/pull/217247","mergeCommit":{"message":"[FIPS][Build]
Add Wolfi tag to FIPS image (#217247)\n\n## Summary\n\nAdjusts the
Docker tag for the Wolfi FIPS image from `kibana-fips`
to\n`kibana-wolfi-fips` to avoid confusion in the future. The other
products\nuse `<product>-fips` naming for released Cloud artifacts but
our\nartifact is `kibana-cloud-fips`.\n\n\n### Considerations\n\nThis
changeset could be further reaching, but unsure if it's necessary\nand
would like other opinions. If we want to change it now is the
time\nwhile adoption is low. For example, we're using
`--skip-docker-fips` in\nbuild scripts or GH label
`ci:build-docker-fips`. We could align these\nbetter, adding `wolfi` but
don't think it is
necessary.","sha":"dcb4242843e6ee4ec7d7448075b0f5d985e0f1f4"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/217382","number":217382,"state":"OPEN"},{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/217247","number":217247,"mergeCommit":{"message":"[FIPS][Build]
Add Wolfi tag to FIPS image (#217247)\n\n## Summary\n\nAdjusts the
Docker tag for the Wolfi FIPS image from `kibana-fips`
to\n`kibana-wolfi-fips` to avoid confusion in the future. The other
products\nuse `<product>-fips` naming for released Cloud artifacts but
our\nartifact is `kibana-cloud-fips`.\n\n\n### Considerations\n\nThis
changeset could be further reaching, but unsure if it's necessary\nand
would like other opinions. If we want to change it now is the
time\nwhile adoption is low. For example, we're using
`--skip-docker-fips` in\nbuild scripts or GH label
`ci:build-docker-fips`. We could align these\nbetter, adding `wolfi` but
don't think it is
necessary.","sha":"dcb4242843e6ee4ec7d7448075b0f5d985e0f1f4"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Apr 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jbudz jbudz jbudz approved these changes

Assignees

@Ikuni17 Ikuni17

Labels

backport:version Backport to applied version labels ci:build-cloud-fips-image ci:build-docker-fips Build Docker FIPS image release_note:skip Skip the PR/issue when compiling release notes Team:Operations Kibana-Operations Team v8.19.0 v9.0.0 v9.1.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Ikuni17 @elasticmachine @kibanamachine @jbudz