diff --git a/bundle/manifests/cc-operator.clusterserviceversion.yaml b/bundle/manifests/cc-operator.clusterserviceversion.yaml index caa00a9b..c9649c12 100644 --- a/bundle/manifests/cc-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cc-operator.clusterserviceversion.yaml @@ -85,9 +85,9 @@ metadata: "name": "local-bin" } ], - "payloadImage": "quay.io/confidential-containers/runtime-payload-ci:kata-containers-8de1f8e19f858134ba455a7c04edcb21d8bcf6b1", + "payloadImage": "quay.io/kata-containers/kata-deploy-ci:kata-containers-latest", "postUninstall": { - "image": "quay.io/confidential-containers/reqs-payload:e92cb67ea8956128a31950a0c3fa79a086dbaf1a", + "image": "quay.io/confidential-containers/reqs-payload:latest", "volumeMounts": [ { "mountPath": "/opt/confidential-containers/", @@ -149,7 +149,7 @@ metadata: ] }, "preInstall": { - "image": "quay.io/confidential-containers/reqs-payload:e92cb67ea8956128a31950a0c3fa79a086dbaf1a", + "image": "quay.io/confidential-containers/reqs-payload:latest", "volumeMounts": [ { "mountPath": "/opt/confidential-containers/", @@ -215,10 +215,6 @@ metadata: "name": "kata-clh", "snapshotter": "nydus" }, - { - "name": "kata-clh-tdx", - "snapshotter": "nydus" - }, { "name": "kata-qemu", "snapshotter": "nydus" @@ -250,8 +246,8 @@ metadata: ] capabilities: Basic Install categories: Security - containerImage: quay.io/confidential-containers/operator:v0.8.0 - createdAt: "2023-11-15T15:02:03Z" + containerImage: quay.io/confidential-containers/operator:latest + createdAt: "2023-11-30T13:53:32Z" operators.operatorframework.io/builder: operator-sdk-v1.30.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 name: cc-operator.v0.8.0 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index b247c45b..1c64f811 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: quay.io/confidential-containers/operator - newTag: v0.8.0 + newTag: latest diff --git a/config/manifests/bases/cc-operator.clusterserviceversion.yaml b/config/manifests/bases/cc-operator.clusterserviceversion.yaml index 93c77f6f..23926f66 100644 --- a/config/manifests/bases/cc-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/cc-operator.clusterserviceversion.yaml @@ -5,7 +5,7 @@ metadata: alm-examples: '[]' capabilities: Basic Install categories: Security - containerImage: quay.io/confidential-containers/operator:v0.8.0 + containerImage: quay.io/confidential-containers/operator:latest name: cc-operator.v0.0.1 namespace: placeholder spec: diff --git a/config/samples/ccruntime/base/ccruntime.yaml b/config/samples/ccruntime/base/ccruntime.yaml index 12e757eb..2bf14cd6 100644 --- a/config/samples/ccruntime/base/ccruntime.yaml +++ b/config/samples/ccruntime/base/ccruntime.yaml @@ -10,7 +10,7 @@ spec: node.kubernetes.io/worker: "" config: installType: bundle - payloadImage: quay.io/confidential-containers/runtime-payload:kata-containers + payloadImage: quay.io/kata-containers/kata-deploy:stable installDoneLabel: katacontainers.io/kata-runtime: "true" uninstallDoneLabel: @@ -146,4 +146,3 @@ spec: # default: false - name: "INSTALL_NYDUS_SNAPSHOTTER" value: "true" - diff --git a/config/samples/ccruntime/default/kustomization.yaml b/config/samples/ccruntime/default/kustomization.yaml index b8fde82e..b22bc16c 100644 --- a/config/samples/ccruntime/default/kustomization.yaml +++ b/config/samples/ccruntime/default/kustomization.yaml @@ -8,10 +8,10 @@ resources: images: - name: quay.io/confidential-containers/reqs-payload - newTag: e92cb67ea8956128a31950a0c3fa79a086dbaf1a -- name: quay.io/confidential-containers/runtime-payload - newName: quay.io/confidential-containers/runtime-payload-ci - newTag: kata-containers-8de1f8e19f858134ba455a7c04edcb21d8bcf6b1 + newTag: latest +- name: quay.io/kata-containers/kata-deploy + newName: quay.io/kata-containers/kata-deploy-ci + newTag: kata-containers-latest patches: - patch: |- @@ -20,8 +20,6 @@ patches: value: - name: "kata-clh" snapshotter: "nydus" - - name: "kata-clh-tdx" - snapshotter: "nydus" - name: "kata-qemu" snapshotter: "nydus" - name: "kata-qemu-tdx" diff --git a/config/samples/ccruntime/peer-pods/kustomization.yaml b/config/samples/ccruntime/peer-pods/kustomization.yaml index 3a0b4122..1a46af1d 100644 --- a/config/samples/ccruntime/peer-pods/kustomization.yaml +++ b/config/samples/ccruntime/peer-pods/kustomization.yaml @@ -8,10 +8,11 @@ resources: images: - name: quay.io/confidential-containers/reqs-payload - newTag: e92cb67ea8956128a31950a0c3fa79a086dbaf1a -- name: quay.io/confidential-containers/runtime-payload - newName: quay.io/confidential-containers/runtime-payload-ci - newTag: kata-containers-8de1f8e19f858134ba455a7c04edcb21d8bcf6b1 + newTag: latest +- name: quay.io/kata-containers/kata-deploy + newName: quay.io/kata-containers/kata-deploy-ci + newTag: kata-containers-latest + patches: - patch: |- diff --git a/config/samples/ccruntime/s390x/kustomization.yaml b/config/samples/ccruntime/s390x/kustomization.yaml index e8d530b0..c2c1257b 100644 --- a/config/samples/ccruntime/s390x/kustomization.yaml +++ b/config/samples/ccruntime/s390x/kustomization.yaml @@ -7,9 +7,9 @@ resources: - ../default images: -- name: quay.io/confidential-containers/runtime-payload - newName: quay.io/confidential-containers/runtime-payload-ci - newTag: kata-containers-8de1f8e19f858134ba455a7c04edcb21d8bcf6b1 +- name: quay.io/kata-containers/kata-deploy + newName: quay.io/kata-containers/kata-deploy-ci + newTag: kata-containers-latest patches: - patch: |- @@ -18,8 +18,6 @@ patches: value: - name: "kata-qemu" snapshotter: "nydus" - - name: "kata-qemu-se" - snapshotter: "nydus" - op: add path: /spec/config/defaultRuntimeClassName value: "kata-qemu" diff --git a/config/samples/enclave-cc/hw/kustomization.yaml b/config/samples/enclave-cc/hw/kustomization.yaml index f1ff7c01..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: e92cb67ea8956128a31950a0c3fa79a086dbaf1a + newTag: latest diff --git a/config/samples/enclave-cc/sim/kustomization.yaml b/config/samples/enclave-cc/sim/kustomization.yaml index fde599d7..932528cc 100644 --- a/config/samples/enclave-cc/sim/kustomization.yaml +++ b/config/samples/enclave-cc/sim/kustomization.yaml @@ -7,4 +7,4 @@ images: - name: quay.io/confidential-containers/runtime-payload newTag: enclave-cc-SIM-sample-kbc-v0.8.0 - name: quay.io/confidential-containers/reqs-payload - newTag: e92cb67ea8956128a31950a0c3fa79a086dbaf1a + newTag: latest diff --git a/docs/INSTALL.md b/docs/INSTALL.md index e176dcfc..0edd2ccb 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -131,7 +131,6 @@ A successful install should show the following `RuntimeClasses`. NAME HANDLER AGE kata kata 9m55s kata-clh kata-clh 9m55s -kata-clh-tdx kata-clh-tdx 9m55s kata-qemu kata-qemu 9m55s kata-qemu-tdx kata-qemu-tdx 9m55s kata-qemu-sev kata-qemu-sev 9m55s @@ -147,7 +146,7 @@ as shown below, where ``, ``, and `` needs to be make kustomize cp -r config/samples/ccruntime/default config/samples/ccruntime/ cd config/samples/ccruntime/ -../../../../bin/kustomize edit set image quay.io/confidential-containers/runtime-payload=: +../../../../bin/kustomize edit set image quay.io/kata-containers/kata-deploy=: ``` Then install the new CR as: diff --git a/tests/e2e/tests_runner.sh b/tests/e2e/tests_runner.sh index d71c8b2d..74612f17 100755 --- a/tests/e2e/tests_runner.sh +++ b/tests/e2e/tests_runner.sh @@ -44,7 +44,7 @@ main() { # Run tests. case $runtimeclass in - kata-qemu|kata-clh|kata-clh-tdx|kata-qemu-se|kata-qemu-tdx|kata-qemu-sev|kata-qemu-snp) + kata-qemu|kata-clh|kata-qemu-tdx|kata-qemu-sev|kata-qemu-snp) echo "INFO: Running operator tests for $runtimeclass" bats "${script_dir}/operator_tests.bats" ;;