Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ccruntime: Adapt to the kata payload using /opt/kata #235

Merged
merged 2 commits into from
Jul 28, 2023
Merged

ccruntime: Adapt to the kata payload using /opt/kata #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a40a99b
ccruntime: Adapt to the kata payload using `/opt/kata`
fidencio Jul 24, 2023
3e26c7e
config: Use latest payload generate by the CI
fidencio Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundle/manifests/cc-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ metadata:
"name": "containerd-conf"
},
{
"mountPath": "/opt/confidential-containers/",
"mountPath": "/opt/kata/",
"name": "kata-artifacts"
},
{
Expand All @@ -77,7 +77,7 @@ metadata:
},
{
"hostPath": {
"path": "/opt/confidential-containers/",
"path": "/opt/kata/",
"type": "DirectoryOrCreate"
},
"name": "kata-artifacts"
Expand Down
4 changes: 2 additions & 2 deletions config/samples/ccruntime/base/ccruntime.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
name: crio-conf
- mountPath: /etc/containerd/
name: containerd-conf
- mountPath: /opt/confidential-containers/
- mountPath: /opt/kata/
name: kata-artifacts
- mountPath: /var/run/dbus/system_bus_socket
name: dbus
Expand All @@ -38,7 +38,7 @@ spec:
type: ""
name: containerd-conf
- hostPath:
path: /opt/confidential-containers/
path: /opt/kata/
type: DirectoryOrCreate
name: kata-artifacts
- hostPath:
Expand Down
4 changes: 2 additions & 2 deletions config/samples/ccruntime/default/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ images:
- name: quay.io/confidential-containers/container-engine-for-cc-payload
newTag: c80c3e7392c1562841e75072d227e07f98cab2bd
- name: quay.io/confidential-containers/runtime-payload
newName: quay.io/confidential-containers/runtime-payload
newTag: kata-containers-16d6e37196cb5c18ca5e718549f7a747658105a2
newName: quay.io/confidential-containers/runtime-payload-ci
newTag: kata-containers-latest

patches:
- patch: |-
Expand Down
4 changes: 2 additions & 2 deletions config/samples/ccruntime/peer-pods/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ images:
- name: quay.io/confidential-containers/container-engine-for-cc-payload
newTag: c80c3e7392c1562841e75072d227e07f98cab2bd
- name: quay.io/confidential-containers/runtime-payload
newName: quay.io/confidential-containers/runtime-payload
newTag: kata-containers-16d6e37196cb5c18ca5e718549f7a747658105a2
newName: quay.io/confidential-containers/runtime-payload-ci
newTag: kata-containers-latest

patches:
- patch: |-
Expand Down
2 changes: 1 addition & 1 deletion config/samples/ccruntime/s390x/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ resources:
images:
- name: quay.io/confidential-containers/runtime-payload
newName: quay.io/confidential-containers/runtime-payload-ci
newTag: kata-containers-128f0282e11fb33f648c0ecf1d75a40f13985e01
newTag: kata-containers-latest

patches:
- patch: |-
Expand Down
2 changes: 1 addition & 1 deletion config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
node.kubernetes.io/worker: ""
config:
installType: bundle
payloadImage: quay.io/confidential-containers/runtime-payload:enclave-cc-HW-cc-kbc-v0.7.0
payloadImage: quay.io/confidential-containers/runtime-payload-ci:enclave-cc-HW-cc-kbc-latest
installDoneLabel:
confidentialcontainers.org/enclave-cc: "true"
uninstallDoneLabel:
Expand Down
4 changes: 2 additions & 2 deletions config/samples/enclave-cc/sim/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ resources:
nameSuffix: -sgx-mode-sim

images:
- name: quay.io/confidential-containers/runtime-payload
newTag: enclave-cc-SIM-sample-kbc-v0.7.0
- name: quay.io/confidential-containers/runtime-payload-ci
newTag: enclave-cc-SIM-sample-kbc-latest
4 changes: 2 additions & 2 deletions tests/e2e/tests_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ run_non_tee_tests() {
# to get the path to kata's configuration.toml and image files. Without this
# they will change the default configuration.toml, which doesn't correspond to
# the one used by the runtimeclass, therefore, performing bogus changes.
local runtime_config_file="/opt/confidential-containers/share/defaults/kata-containers/"
local runtime_config_file="/opt/kata/share/defaults/kata-containers/"
runtime_config_file+="configuration-${runtimeclass/kata-/}.toml"
sed -i "s#kata-runtime kata-env#kata-runtime --config $runtime_config_file kata-env#g" \
../../../lib/common.bash
Expand Down Expand Up @@ -118,7 +118,7 @@ main() {
# Test scripts rely on kata-runtime so it should be reacheable on PATH.
# Re-export PATH is error prone as some calls to kata-runtime use sudo,
# so let's create a symlink.
ln -sf /opt/confidential-containers/bin/kata-runtime \
ln -sf /opt/kata/bin/kata-runtime \
/usr/local/bin/kata-runtime

# Run tests.
Expand Down