From e865359f4ed62a143b6a6d4c0f778d63407053a3 Mon Sep 17 00:00:00 2001
From: Biao Lu <biao.lu@intel.com>
Date: Wed, 30 Aug 2023 15:32:12 +0800
Subject: [PATCH] osbuilder: add api-server-rest in rootfs

Integrate api-server-rest into rootfs image.

Fixes: #7555

Signed-off-by: Biao Lu <biao.lu@intel.com>
---
 tools/osbuilder/rootfs-builder/rootfs.sh | 5 +++++
 versions.yaml                            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/osbuilder/rootfs-builder/rootfs.sh b/tools/osbuilder/rootfs-builder/rootfs.sh
index 127f37dafa..ee7569d7ce 100755
--- a/tools/osbuilder/rootfs-builder/rootfs.sh
+++ b/tools/osbuilder/rootfs-builder/rootfs.sh
@@ -705,6 +705,11 @@ EOF
 		make RESOURCE_PROVIDER=${CDH_RESOURCE_PROVIDER}
 		make install DESTDIR="${ROOTFS_DIR}/usr/local/bin/"
 		popd
+
+		pushd guest-components/api-server-rest
+		cargo build --release --target-dir ./target
+		install -D -m0755 ./target/release/api-server-rest ${ROOTFS_DIR}/usr/local/bin/
+		popd
 	fi
 
 	if [ "${KATA_BUILD_CC}" == "yes" ]; then
diff --git a/versions.yaml b/versions.yaml
index 65bb063141..e32ea79c8e 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -200,7 +200,7 @@ externals:
   attestation-agent:
     description: "Provide attested key unwrapping for image decryption"
     url: "https://github.com/confidential-containers/guest-components/"
-    version: "53ddd632424432077e95d3901deb64727be0b4c1"
+    version: "29086ca22583f0dcfa6548866e9bf2a5e07881e9"
 
   cni-plugins:
     description: "CNI network plugins"