From 58014d189d2552de0aa349540d5e2ef6a8369394 Mon Sep 17 00:00:00 2001
From: Brad White <brad.white@elastic.co>
Date: Fri, 4 Apr 2025 12:13:21 -0600
Subject: [PATCH 1/2] rename fips image tags

---
 .buildkite/scripts/steps/fips/build.sh                  | 4 ++--
 .buildkite/scripts/steps/fips/build_cloud_fips_image.sh | 4 ++--
 src/dev/build/tasks/os_packages/docker_generator/run.ts | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.buildkite/scripts/steps/fips/build.sh b/.buildkite/scripts/steps/fips/build.sh
index be6af9cdd0e1c..310b67fc837b6 100755
--- a/.buildkite/scripts/steps/fips/build.sh
+++ b/.buildkite/scripts/steps/fips/build.sh
@@ -32,9 +32,9 @@ node scripts/build \
 cd "$KIBANA_DIR/target"
 buildkite-agent artifact upload "./*docker-image*.tar.gz"
 
-KIBANA_FIPS_IMAGE="docker.elastic.co/kibana-ci/kibana-fips:$FULL_VERSION-$BUILDKITE_COMMIT"
+KIBANA_FIPS_IMAGE="docker.elastic.co/kibana-ci/kibana-wolfi-fips:$FULL_VERSION-$BUILDKITE_COMMIT"
 
-cat <<EOF | buildkite-agent annotate --style "info" --context kibana-fips-image
+cat <<EOF | buildkite-agent annotate --style "info" --context kibana-wolfi-fips-image
 
   Kibana FIPS image: \`$KIBANA_FIPS_IMAGE\`
 EOF
diff --git a/.buildkite/scripts/steps/fips/build_cloud_fips_image.sh b/.buildkite/scripts/steps/fips/build_cloud_fips_image.sh
index 24cc594eb4400..e3f4d2f1ee050 100755
--- a/.buildkite/scripts/steps/fips/build_cloud_fips_image.sh
+++ b/.buildkite/scripts/steps/fips/build_cloud_fips_image.sh
@@ -33,8 +33,8 @@ node scripts/build \
   --skip-docker-serverless \
   --skip-docker-contexts
 
-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)
+cat <<EOF | buildkite-agent annotate --style "info" --context kibana-fips-image
 
   Kibana cloud FIPS image: \`$CLOUD_FIPS_IMAGE\`
 EOF
diff --git a/src/dev/build/tasks/os_packages/docker_generator/run.ts b/src/dev/build/tasks/os_packages/docker_generator/run.ts
index ad58e4e211d8a..e77112731be65 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/run.ts
+++ b/src/dev/build/tasks/os_packages/docker_generator/run.ts
@@ -53,8 +53,7 @@ export async function runDockerGenerator(
       'docker.elastic.co/wolfi/chainguard-base:latest@sha256:29150cd940cc7f69407d978d5a19c86f4d9e67cf44e4d6ded787a497e8f27c9a';
 
   let imageFlavor = '';
-  if (flags.baseImage === 'wolfi' && !flags.serverless && !flags.cloud && !flags.fips)
-    imageFlavor += `-wolfi`;
+  if (flags.baseImage === 'wolfi' && !flags.serverless && !flags.cloud) imageFlavor += `-wolfi`;
   if (flags.ironbank) imageFlavor += '-ironbank';
   if (flags.cloud) imageFlavor += '-cloud';
   if (flags.serverless) imageFlavor += '-serverless';

From cbd69ba090ca1d897b80b71a0da46e1b348242b9 Mon Sep 17 00:00:00 2001
From: Brad White <brad.white@elastic.co>
Date: Mon, 7 Apr 2025 08:43:46 -0600
Subject: [PATCH 2/2] revert cloud image rename

---
 .buildkite/scripts/steps/fips/build_cloud_fips_image.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildkite/scripts/steps/fips/build_cloud_fips_image.sh b/.buildkite/scripts/steps/fips/build_cloud_fips_image.sh
index e3f4d2f1ee050..24cc594eb4400 100755
--- a/.buildkite/scripts/steps/fips/build_cloud_fips_image.sh
+++ b/.buildkite/scripts/steps/fips/build_cloud_fips_image.sh
@@ -33,8 +33,8 @@ node scripts/build \
   --skip-docker-serverless \
   --skip-docker-contexts
 
-CLOUD_FIPS_IMAGE=$(docker images --format "{{.Repository}}:{{.Tag}}" docker.elastic.co/kibana-ci/kibana-fips)
-cat <<EOF | buildkite-agent annotate --style "info" --context kibana-fips-image
+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
 
   Kibana cloud FIPS image: \`$CLOUD_FIPS_IMAGE\`
 EOF