diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 2b0151e9..1780cc4e 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -38,7 +38,7 @@ jobs: make reqs-image registry="${REGISTRY}" extra_docker_manifest_flags="--insecure" popd env: - REGISTRY: localhost:5000/container-engine-for-cc-payload + REGISTRY: localhost:5000/reqs-payload - name: Build custom kind node image uses: docker/build-push-action@v4 @@ -66,7 +66,7 @@ jobs: - name: Install enclave-cc sim run: | cd config/samples/enclave-cc/sim - kustomize edit set image quay.io/confidential-containers/container-engine-for-cc-payload=localhost:5000/container-engine-for-cc-payload:latest + kustomize edit set image quay.io/confidential-containers/reqs-payload=localhost:5000/reqs-payload:latest kubectl apply -k . sleep 1 kubectl wait --for=jsonpath='{.status.runtimeClass}'=enclave-cc ccruntime/ccruntime-enclave-cc-sgx-mode-sim --timeout=90s diff --git a/bundle/manifests/cc-operator.clusterserviceversion.yaml b/bundle/manifests/cc-operator.clusterserviceversion.yaml index 7e37f6b7..adf8ca8c 100644 --- a/bundle/manifests/cc-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cc-operator.clusterserviceversion.yaml @@ -106,7 +106,7 @@ metadata: ], "payloadImage": "quay.io/confidential-containers/runtime-payload:kata-containers-5b7009f2f9cdb39099b97a4f868b53ec9f3c383f", "postUninstall": { - "image": "quay.io/confidential-containers/container-engine-for-cc-payload:1034f9fcf947b22eea080a6f77d8e164e2369849", + "image": "quay.io/confidential-containers/reqs-payload:latest", "volumeMounts": [ { "mountPath": "/opt/confidential-containers/", @@ -157,7 +157,7 @@ metadata: ] }, "preInstall": { - "image": "quay.io/confidential-containers/container-engine-for-cc-payload:1034f9fcf947b22eea080a6f77d8e164e2369849", + "image": "quay.io/confidential-containers/reqs-payload:latest", "volumeMounts": [ { "mountPath": "/opt/confidential-containers/", diff --git a/config/samples/ccruntime/base/ccruntime.yaml b/config/samples/ccruntime/base/ccruntime.yaml index 2a36f218..2e7c5f76 100644 --- a/config/samples/ccruntime/base/ccruntime.yaml +++ b/config/samples/ccruntime/base/ccruntime.yaml @@ -49,7 +49,7 @@ spec: runtimeClasses: [] postUninstall: - image: quay.io/confidential-containers/container-engine-for-cc-payload + image: quay.io/confidential-containers/reqs-payload volumeMounts: - mountPath: /opt/confidential-containers/ name: confidential-containers-artifacts @@ -65,7 +65,7 @@ spec: type: "" name: etc-systemd-system preInstall: - image: quay.io/confidential-containers/container-engine-for-cc-payload + image: quay.io/confidential-containers/reqs-payload volumeMounts: - mountPath: /opt/confidential-containers/ name: confidential-containers-artifacts diff --git a/config/samples/ccruntime/default/kustomization.yaml b/config/samples/ccruntime/default/kustomization.yaml index d468e1a0..2a6bd936 100644 --- a/config/samples/ccruntime/default/kustomization.yaml +++ b/config/samples/ccruntime/default/kustomization.yaml @@ -7,8 +7,8 @@ resources: - ../base images: -- name: quay.io/confidential-containers/container-engine-for-cc-payload - newTag: c80c3e7392c1562841e75072d227e07f98cab2bd +- name: quay.io/confidential-containers/reqs-payload + newTag: 4ad0978b8e9f1acb857fe2c76f1494c55bf28e05 - name: quay.io/confidential-containers/runtime-payload newName: quay.io/confidential-containers/runtime-payload-ci newTag: kata-containers-latest diff --git a/config/samples/ccruntime/peer-pods/kustomization.yaml b/config/samples/ccruntime/peer-pods/kustomization.yaml index 86004865..03292a5d 100644 --- a/config/samples/ccruntime/peer-pods/kustomization.yaml +++ b/config/samples/ccruntime/peer-pods/kustomization.yaml @@ -7,8 +7,8 @@ resources: - ../base images: -- name: quay.io/confidential-containers/container-engine-for-cc-payload - newTag: c80c3e7392c1562841e75072d227e07f98cab2bd +- name: quay.io/confidential-containers/reqs-payload + newTag: 4ad0978b8e9f1acb857fe2c76f1494c55bf28e05 - name: quay.io/confidential-containers/runtime-payload newName: quay.io/confidential-containers/runtime-payload-ci newTag: kata-containers-latest diff --git a/config/samples/ccruntime/ssh-demo/kustomization.yaml b/config/samples/ccruntime/ssh-demo/kustomization.yaml index b06b548c..ad465e8d 100644 --- a/config/samples/ccruntime/ssh-demo/kustomization.yaml +++ b/config/samples/ccruntime/ssh-demo/kustomization.yaml @@ -9,7 +9,7 @@ resources: images: - name: quay.io/confidential-containers/runtime-payload newTag: kata-containers-ssh-demo-v0.2.0 -- name: quay.io/confidential-containers/container-engine-for-cc-payload +- name: quay.io/confidential-containers/reqs-payload newTag: 1def978fdf6b0cb2383d43970c3dc484df3cad54 patches: diff --git a/config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml b/config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml index 0c56e29d..2d6475ed 100644 --- a/config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml +++ b/config/samples/enclave-cc/base/ccruntime-enclave-cc.yaml @@ -47,7 +47,7 @@ spec: - name: "enclave-cc" snapshotter: "overlayfs" postUninstall: - image: quay.io/confidential-containers/container-engine-for-cc-payload + image: quay.io/confidential-containers/reqs-payload volumeMounts: - mountPath: /opt/confidential-containers/ name: confidential-containers-artifacts @@ -75,7 +75,7 @@ spec: type: "" name: systemd preInstall: - image: quay.io/confidential-containers/container-engine-for-cc-payload + image: quay.io/confidential-containers/reqs-payload volumeMounts: - mountPath: /opt/confidential-containers/ name: confidential-containers-artifacts diff --git a/config/samples/enclave-cc/hw/kustomization.yaml b/config/samples/enclave-cc/hw/kustomization.yaml index 28dd7ce3..97b6691a 100644 --- a/config/samples/enclave-cc/hw/kustomization.yaml +++ b/config/samples/enclave-cc/hw/kustomization.yaml @@ -6,5 +6,5 @@ resources: nameSuffix: -sgx-mode-hw -- name: quay.io/confidential-containers/container-engine-for-cc-payload - newTag: 98a790e8abdcc06c4b629b290ebaa217bf82e305 +- name: quay.io/confidential-containers/reqs-payload + newTag: 4ad0978b8e9f1acb857fe2c76f1494c55bf28e05 diff --git a/config/samples/enclave-cc/sim/kustomization.yaml b/config/samples/enclave-cc/sim/kustomization.yaml index 573e8673..d786c2aa 100644 --- a/config/samples/enclave-cc/sim/kustomization.yaml +++ b/config/samples/enclave-cc/sim/kustomization.yaml @@ -6,5 +6,5 @@ nameSuffix: -sgx-mode-sim images: - name: quay.io/confidential-containers/runtime-payload-ci newTag: enclave-cc-SIM-sample-kbc-latest -- name: quay.io/confidential-containers/container-engine-for-cc-payload - newTag: 98a790e8abdcc06c4b629b290ebaa217bf82e305 +- name: quay.io/confidential-containers/reqs-payload + newTag: 4ad0978b8e9f1acb857fe2c76f1494c55bf28e05 diff --git a/tests/e2e/operator.sh b/tests/e2e/operator.sh index 95c4f46c..4c45b7f2 100755 --- a/tests/e2e/operator.sh +++ b/tests/e2e/operator.sh @@ -18,7 +18,7 @@ source "${script_dir}/lib.sh" readonly op_ns="confidential-containers-system" # There should be a registry running locally on port 5000. export IMG=localhost:5000/cc-operator -export PRE_INSTALL_IMG=localhost:5000/container-engine-for-cc-payload +export PRE_INSTALL_IMG=localhost:5000/reqs-payload # Build the operator and push images to a local registry. # @@ -43,7 +43,7 @@ build_operator () { popd >/dev/null } -# Build the container-engine-for-cc-payload and push images to a local registry. +# Build the reqs-payload and push images to a local registry. # build_pre_install_img() { start_local_registry @@ -96,7 +96,7 @@ install_ccruntime() { # Use the built pre-install image kustomization_set_image "${ccruntime_overlay_dir}/default" \ - "quay.io/confidential-containers/container-engine-for-cc-payload" \ + "quay.io/confidential-containers/reqs-payload" \ "${PRE_INSTALL_IMG}" pushd "$overlay_dir" >/dev/null