From 993c611fa0f37893aac63012b5c52904afed14ba Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Tue, 28 Jan 2025 14:14:25 +0000 Subject: [PATCH 1/2] Revert "release: bump enclave-cc runtime payloads for v0.12.0" This reverts commit 34e589a2a9bf3ce88a79de06f970889c822acf16. Signed-off-by: stevenhorsman --- config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml | 2 +- config/samples/enclave-cc/hw/kustomization.yaml | 2 +- config/samples/enclave-cc/sim/kustomization.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml b/config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml index b7225e03..396cace3 100644 --- a/config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml +++ b/config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml @@ -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.11.0 + payloadImage: quay.io/confidential-containers/runtime-payload-ci:enclave-cc-HW-cc-kbc-latest installDoneLabel: confidentialcontainers.org/enclave-cc: "true" uninstallDoneLabel: diff --git a/config/samples/enclave-cc/hw/kustomization.yaml b/config/samples/enclave-cc/hw/kustomization.yaml index 007dac5e..3e0608d5 100644 --- a/config/samples/enclave-cc/hw/kustomization.yaml +++ b/config/samples/enclave-cc/hw/kustomization.yaml @@ -8,4 +8,4 @@ nameSuffix: -sgx-mode-hw images: - name: quay.io/confidential-containers/reqs-payload - newTag: b495f450fbcd5c199b8635a7dfefe1b5d763c378 + newTag: latest diff --git a/config/samples/enclave-cc/sim/kustomization.yaml b/config/samples/enclave-cc/sim/kustomization.yaml index 03c2aad6..4b58e1ad 100644 --- a/config/samples/enclave-cc/sim/kustomization.yaml +++ b/config/samples/enclave-cc/sim/kustomization.yaml @@ -4,7 +4,7 @@ resources: nameSuffix: -sgx-mode-sim images: -- name: quay.io/confidential-containers/runtime-payload - newTag: enclave-cc-SIM-sample-kbc-v0.11.0 +- name: quay.io/confidential-containers/runtime-payload-ci + newTag: enclave-cc-SIM-sample-kbc-latest - name: quay.io/confidential-containers/reqs-payload - newTag: b495f450fbcd5c199b8635a7dfefe1b5d763c378 + newTag: latest From 48f224ab033bae62ea0ee0120a313a6dcedaa29a Mon Sep 17 00:00:00 2001 From: stevenhorsman Date: Tue, 28 Jan 2025 14:15:23 +0000 Subject: [PATCH 2/2] Revert "release: bump kata payloads for v0.12.0" This reverts commit 7636a9ad840f7ff298a809b956c51046d589c518. Signed-off-by: stevenhorsman --- config/samples/ccruntime/default/kustomization.yaml | 5 +++-- config/samples/ccruntime/peer-pods/kustomization.yaml | 5 +++-- config/samples/ccruntime/s390x/kustomization.yaml | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/config/samples/ccruntime/default/kustomization.yaml b/config/samples/ccruntime/default/kustomization.yaml index 84893dde..7cd6e773 100644 --- a/config/samples/ccruntime/default/kustomization.yaml +++ b/config/samples/ccruntime/default/kustomization.yaml @@ -8,9 +8,10 @@ resources: images: - name: quay.io/confidential-containers/reqs-payload - newTag: b495f450fbcd5c199b8635a7dfefe1b5d763c378 + newTag: latest - name: quay.io/kata-containers/kata-deploy - newTag: 3.13.0 + newName: quay.io/kata-containers/kata-deploy-ci + newTag: kata-containers-latest patches: - patch: |- diff --git a/config/samples/ccruntime/peer-pods/kustomization.yaml b/config/samples/ccruntime/peer-pods/kustomization.yaml index b147e395..fc8dc7ae 100644 --- a/config/samples/ccruntime/peer-pods/kustomization.yaml +++ b/config/samples/ccruntime/peer-pods/kustomization.yaml @@ -9,9 +9,10 @@ resources: images: - name: quay.io/confidential-containers/reqs-payload - newTag: b495f450fbcd5c199b8635a7dfefe1b5d763c378 + newTag: latest - name: quay.io/kata-containers/kata-deploy - newTag: 3.13.0 + newName: quay.io/kata-containers/kata-deploy-ci + newTag: kata-containers-latest patches: diff --git a/config/samples/ccruntime/s390x/kustomization.yaml b/config/samples/ccruntime/s390x/kustomization.yaml index 8581bdde..046a8a54 100644 --- a/config/samples/ccruntime/s390x/kustomization.yaml +++ b/config/samples/ccruntime/s390x/kustomization.yaml @@ -8,9 +8,10 @@ resources: images: - name: quay.io/confidential-containers/reqs-payload - newTag: b495f450fbcd5c199b8635a7dfefe1b5d763c378 + newTag: latest - name: quay.io/kata-containers/kata-deploy - newTag: 3.13.0 + newName: quay.io/kata-containers/kata-deploy-ci + newTag: kata-containers-latest patches: - patch: |-