rvps: adjust docker compose and k8s configs for rvps

Adjust various configs to match the new RVPS config Signed-off-by: Tobin Feldman-Fitzthum <[email protected]>
confidential-containers · Dec 16, 2024 · 0716cc1 · 0716cc1
1 parent f3e2105
commit 0716cc1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -52,6 +52,11 @@ services:
     volumes:
       - ./kbs/data/reference-values:/opt/confidential-containers/attestation-service/reference_values:rw
       - ./kbs/config/rvps.json:/etc/rvps.json:rw
+    command: [
+      "rvps",
+      "--address",
+      "0.0.0.0:50003"
+    ]
 
   keyprovider:
     image: ghcr.io/confidential-containers/coco-keyprovider:latest

diff --git a/kbs/config/kbs-config.toml b/kbs/config/kbs-config.toml
@@ -15,7 +15,6 @@ duration_min = 5
 
 [attestation_service.rvps_config]
 type = "BuiltIn"
-store_type = "LocalFs"
 
 [policy_engine]
 policy_path = "/opa/confidential-containers/kbs/policy.rego"

diff --git a/kbs/config/kubernetes/base/kbs-config.toml b/kbs/config/kubernetes/base/kbs-config.toml
@@ -20,7 +20,6 @@ key_path = "/kbs/as-private-key.pem"
 
 [attestation_service.rvps_config]
 type = "BuiltIn"
-store_type = "LocalFs"
 
 [admin]
 auth_public_key = "/kbs/kbs.pem"

diff --git a/kbs/config/rvps.json b/kbs/config/rvps.json
@@ -1,7 +1,6 @@
 {
-    "address": "0.0.0.0:50003",
-    "store_type": "LocalFs",
-    "store_config": {
-        "file_path": "/opt/confidential-containers/attestation-service/reference_values"
+    "storage": {
+	"type":"LocalFs",
+	"file_path": "/opt/confidential-containers/attestation-service/reference_values"
     }
-}
+}
diff --git a/kbs/test/config/kbs.toml b/kbs/test/config/kbs.toml
@@ -22,7 +22,6 @@ cert_path = "./work/token-cert-chain.pem"
 
 [attestation_service.rvps_config]
 type = "BuiltIn"
-store_type = "LocalFs"
 
 [policy_engine]
 policy_path = "./work/kbs-policy.rego"