diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index 5a5554c4db..056af2dfc3 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -1836,7 +1836,7 @@ dependencies = [ [[package]] name = "image-rs" version = "0.1.0" -source = "git+https://github.com/confidential-containers/guest-components?rev=43f6832#43f68320ed78cef438c838c10a6f462c06bad83f" +source = "git+https://github.com/confidential-containers/guest-components?rev=88dcc14#88dcc147ba8ddf34e8425c98d5931df8a995f04a" dependencies = [ "anyhow", "async-compression", @@ -2693,7 +2693,7 @@ dependencies = [ [[package]] name = "ocicrypt-rs" version = "0.1.0" -source = "git+https://github.com/confidential-containers/guest-components?rev=43f6832#43f68320ed78cef438c838c10a6f462c06bad83f" +source = "git+https://github.com/confidential-containers/guest-components?rev=88dcc14#88dcc147ba8ddf34e8425c98d5931df8a995f04a" dependencies = [ "aes 0.8.2", "anyhow", diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index baf1ab1fd3..249bb942db 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -71,7 +71,7 @@ clap = { version = "3.0.1", features = ["derive"] } openssl = { version = "0.10.38", features = ["vendored"] } # Image pull/decrypt -image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "43f6832", default-features = false, features = ["kata-cc-native-tls"] } +image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "88dcc14", default-features = false, features = ["kata-cc-native-tls"] } [patch.crates-io] oci-distribution = { git = "https://github.com/krustlet/oci-distribution.git", rev = "f44124c" } diff --git a/tests/integration/kubernetes/tests_common.sh b/tests/integration/kubernetes/tests_common.sh index 481cf4a570..660a429c8f 100644 --- a/tests/integration/kubernetes/tests_common.sh +++ b/tests/integration/kubernetes/tests_common.sh @@ -11,7 +11,7 @@ # Variables used by the kubernetes tests export docker_images_nginx_version="1.15-alpine" -export container_images_agnhost_name="k8s.gcr.io/e2e-test-images/agnhost" +export container_images_agnhost_name="registry.k8s.io/e2e-test-images/agnhost" export container_images_agnhost_version="2.21" # Timeout options, mainly for use with waitForProcess(). Use them unless the diff --git a/tools/packaging/kata-deploy/examples/test-deploy-kata-clh.yaml b/tools/packaging/kata-deploy/examples/test-deploy-kata-clh.yaml index 665b032275..e942fa90d9 100644 --- a/tools/packaging/kata-deploy/examples/test-deploy-kata-clh.yaml +++ b/tools/packaging/kata-deploy/examples/test-deploy-kata-clh.yaml @@ -16,7 +16,7 @@ spec: spec: runtimeClassName: kata-clh containers: - - image: k8s.gcr.io/hpa-example + - image: registry.k8s.io/hpa-example imagePullPolicy: Always name: php-apache ports: diff --git a/tools/packaging/kata-deploy/examples/test-deploy-kata-dragonball.yaml b/tools/packaging/kata-deploy/examples/test-deploy-kata-dragonball.yaml index 14ad93a855..64ab68c52b 100644 --- a/tools/packaging/kata-deploy/examples/test-deploy-kata-dragonball.yaml +++ b/tools/packaging/kata-deploy/examples/test-deploy-kata-dragonball.yaml @@ -16,7 +16,7 @@ spec: spec: runtimeClassName: kata-dragonball containers: - - image: k8s.gcr.io/hpa-example + - image: registry.k8s.io/hpa-example imagePullPolicy: Always name: php-apache ports: diff --git a/tools/packaging/kata-deploy/examples/test-deploy-kata-fc.yaml b/tools/packaging/kata-deploy/examples/test-deploy-kata-fc.yaml index 498de27ae9..0386bf2adb 100644 --- a/tools/packaging/kata-deploy/examples/test-deploy-kata-fc.yaml +++ b/tools/packaging/kata-deploy/examples/test-deploy-kata-fc.yaml @@ -16,7 +16,7 @@ spec: spec: runtimeClassName: kata-fc containers: - - image: k8s.gcr.io/hpa-example + - image: registry.k8s.io/hpa-example imagePullPolicy: Always name: php-apache ports: diff --git a/tools/packaging/kata-deploy/examples/test-deploy-kata-qemu.yaml b/tools/packaging/kata-deploy/examples/test-deploy-kata-qemu.yaml index 3abdbdd6e3..75c9108c99 100644 --- a/tools/packaging/kata-deploy/examples/test-deploy-kata-qemu.yaml +++ b/tools/packaging/kata-deploy/examples/test-deploy-kata-qemu.yaml @@ -16,7 +16,7 @@ spec: spec: runtimeClassName: kata-qemu containers: - - image: k8s.gcr.io/hpa-example + - image: registry.k8s.io/hpa-example imagePullPolicy: Always name: php-apache ports: diff --git a/tools/packaging/kata-deploy/examples/test-deploy-runc.yaml b/tools/packaging/kata-deploy/examples/test-deploy-runc.yaml index c7702bc0f5..d347c08309 100644 --- a/tools/packaging/kata-deploy/examples/test-deploy-runc.yaml +++ b/tools/packaging/kata-deploy/examples/test-deploy-runc.yaml @@ -15,7 +15,7 @@ spec: run: php-apache-runc spec: containers: - - image: k8s.gcr.io/hpa-example + - image: registry.k8s.io/hpa-example imagePullPolicy: Always name: php-apache ports: diff --git a/versions.yaml b/versions.yaml index 6a2bdaaf14..d4ee86bb37 100644 --- a/versions.yaml +++ b/versions.yaml @@ -194,7 +194,7 @@ externals: attestation-agent: description: "Provide attested key unwrapping for image decryption" url: "https://github.com/confidential-containers/guest-components/" - version: "43f68320ed78cef438c838c10a6f462c06bad83f" + version: "88dcc147ba8ddf34e8425c98d5931df8a995f04a" cni-plugins: description: "CNI network plugins" @@ -260,7 +260,7 @@ externals: pause: description: "Kubernetes pause container image" - repo: "docker://k8s.gcr.io/pause" + repo: "docker://registry.k8s.io/pause" version: "3.6" runc: @@ -311,7 +311,7 @@ externals: td-shim: description: "Confidential Containers Shim Firmware" url: "https://github.com/confidential-containers/td-shim" - version: "v0.6.0" + version: "4ecf76ab8bc57c2e857937487d1923961c2b6769" toolchain: "nightly-2022-11-15" virtiofsd: