From dfb080c50899d30c4acd9c482b09551a0d38c702 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 3 Apr 2023 10:46:28 +0200 Subject: [PATCH] ssh-demo: Use KBS URI in demo The offline_fs_kbc file needs to be updated to use a kbs-uri compatible name for the key, and the container image has been regenerated to reference the decryption key via kbs uri in it's annotation. The image has two tags: encrypted and decrypted. Fixes: #6604 Signed-off-by: Jeremi Piotrowski --- demos/ssh-demo/aa-offline_fs_kbc-keys.json | 2 +- demos/ssh-demo/k8s-cc-ssh.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demos/ssh-demo/aa-offline_fs_kbc-keys.json b/demos/ssh-demo/aa-offline_fs_kbc-keys.json index b853ffd..7c7e90b 100644 --- a/demos/ssh-demo/aa-offline_fs_kbc-keys.json +++ b/demos/ssh-demo/aa-offline_fs_kbc-keys.json @@ -1,3 +1,3 @@ { - "key_id": "HUlOu8NWz8si11OZUzUJMnjiq/iZyHBJZMSD3BaqgMc=" + "default/key/ssh-demo": "HUlOu8NWz8si11OZUzUJMnjiq/iZyHBJZMSD3BaqgMc=" } diff --git a/demos/ssh-demo/k8s-cc-ssh.yaml b/demos/ssh-demo/k8s-cc-ssh.yaml index c11c224..1f75fe8 100644 --- a/demos/ssh-demo/k8s-cc-ssh.yaml +++ b/demos/ssh-demo/k8s-cc-ssh.yaml @@ -24,5 +24,5 @@ spec: runtimeClassName: kata containers: - name: ccv0-ssh - image: docker.io/katadocker/ccv0-ssh + image: ghcr.io/confidential-containers/test-container:multi-arch-encrypted imagePullPolicy: Always