mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-20 08:54:03 +00:00
Merge pull request #4529 from GeorginaKin/CCv0
CCv0: Refactor ccv0.sh to use bats test
This commit is contained in:
commit
e52d6b1d0b
@ -275,8 +275,6 @@ create_a_local_rootfs() {
|
|||||||
# If offline key broker set then include ssh-demo keys and config from
|
# If offline key broker set then include ssh-demo keys and config from
|
||||||
# https://github.com/confidential-containers/documentation/tree/main/demos/ssh-demo
|
# https://github.com/confidential-containers/documentation/tree/main/demos/ssh-demo
|
||||||
if [ "${AA_KBC:-}" == "offline_fs_kbc" ]; then
|
if [ "${AA_KBC:-}" == "offline_fs_kbc" ]; then
|
||||||
curl -Lo "${HOME}/aa-offline_fs_kbc-keys.json" https://raw.githubusercontent.com/confidential-containers/documentation/main/demos/ssh-demo/aa-offline_fs_kbc-keys.json
|
|
||||||
sudo mv "${HOME}/aa-offline_fs_kbc-keys.json" "${ROOTFS_DIR}/etc/aa-offline_fs_kbc-keys.json"
|
|
||||||
local rootfs_agent_config="${ROOTFS_DIR}/etc/agent-config.toml"
|
local rootfs_agent_config="${ROOTFS_DIR}/etc/agent-config.toml"
|
||||||
sudo -E AA_KBC_PARAMS="offline_fs_kbc::null" envsubst < ${katacontainers_repo_dir}/docs/how-to/data/confidential-agent-config.toml.in | sudo tee ${rootfs_agent_config}
|
sudo -E AA_KBC_PARAMS="offline_fs_kbc::null" envsubst < ${katacontainers_repo_dir}/docs/how-to/data/confidential-agent-config.toml.in | sudo tee ${rootfs_agent_config}
|
||||||
fi
|
fi
|
||||||
@ -392,41 +390,18 @@ call_kubernetes_delete_cc_pod() {
|
|||||||
kubernetes_delete_cc_pod $pod_name
|
kubernetes_delete_cc_pod $pod_name
|
||||||
}
|
}
|
||||||
|
|
||||||
# Check out the doc repo if required and pushd
|
call_kubernetes_create_ssh_demo_pod() {
|
||||||
pushd_ssh_demo() {
|
setup_decryption_files_in_guest
|
||||||
local doc_repo=github.com/confidential-containers/documentation
|
kubernetes_create_ssh_demo_pod
|
||||||
local doc_repo_dir="${GOPATH}/src/${doc_repo}"
|
|
||||||
mkdir -p $(dirname ${doc_repo_dir}) && sudo chown -R ${USER}:${USER} $(dirname ${doc_repo_dir})
|
|
||||||
if [ ! -d "${doc_repo_dir}" ]; then
|
|
||||||
git clone https://${doc_repo} "${doc_repo_dir}"
|
|
||||||
pushd "${doc_repo_dir}/demos/ssh-demo"
|
|
||||||
# Update runtimeClassName from kata-cc to kata
|
|
||||||
sudo sed -i -e 's/\([[:blank:]]*runtimeClassName: \).*/\1kata/g' "${doc_repo_dir}/demos/ssh-demo/k8s-cc-ssh.yaml"
|
|
||||||
chmod 600 ccv0-ssh
|
|
||||||
else
|
|
||||||
pushd "${doc_repo_dir}/demos/ssh-demo"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
kubernetes_create_ssh_demo_pod() {
|
call_connect_to_ssh_demo_pod() {
|
||||||
pushd_ssh_demo
|
connect_to_ssh_demo_pod
|
||||||
kubectl apply -f k8s-cc-ssh.yaml && pod=$(kubectl get pods -o jsonpath='{.items..metadata.name}') && kubectl wait --for=condition=ready pods/$pod
|
|
||||||
kubectl get pod $pod
|
|
||||||
popd
|
|
||||||
}
|
}
|
||||||
|
|
||||||
connect_to_ssh_demo_pod() {
|
call_kubernetes_delete_ssh_demo_pod() {
|
||||||
local doc_repo=github.com/confidential-containers/documentation
|
pod=$(kubectl get pods -o jsonpath='{.items..metadata.name}')
|
||||||
local doc_repo_dir="${GOPATH}/src/${doc_repo}"
|
kubernetes_delete_ssh_demo_pod $pod
|
||||||
local ssh_command="ssh -i ${doc_repo_dir}/demos/ssh-demo/ccv0-ssh root@$(kubectl get service ccv0-ssh -o jsonpath="{.spec.clusterIP}")"
|
|
||||||
echo "Issuing command '${ssh_command}'"
|
|
||||||
${ssh_command}
|
|
||||||
}
|
|
||||||
|
|
||||||
kubernetes_delete_ssh_demo_pod() {
|
|
||||||
pushd_ssh_demo
|
|
||||||
kubectl delete -f k8s-cc-ssh.yaml
|
|
||||||
popd
|
|
||||||
}
|
}
|
||||||
|
|
||||||
crictl_sandbox_name=kata-cc-busybox-sandbox
|
crictl_sandbox_name=kata-cc-busybox-sandbox
|
||||||
@ -622,13 +597,13 @@ main() {
|
|||||||
call_kubernetes_delete_cc_pod
|
call_kubernetes_delete_cc_pod
|
||||||
;;
|
;;
|
||||||
kubernetes_create_ssh_demo_pod)
|
kubernetes_create_ssh_demo_pod)
|
||||||
kubernetes_create_ssh_demo_pod
|
call_kubernetes_create_ssh_demo_pod
|
||||||
;;
|
;;
|
||||||
connect_to_ssh_demo_pod)
|
connect_to_ssh_demo_pod)
|
||||||
connect_to_ssh_demo_pod
|
call_connect_to_ssh_demo_pod
|
||||||
;;
|
;;
|
||||||
kubernetes_delete_ssh_demo_pod)
|
kubernetes_delete_ssh_demo_pod)
|
||||||
kubernetes_delete_ssh_demo_pod
|
call_kubernetes_delete_ssh_demo_pod
|
||||||
;;
|
;;
|
||||||
test)
|
test)
|
||||||
test_kata_runtime
|
test_kata_runtime
|
||||||
|
Loading…
Reference in New Issue
Block a user