Merge pull request #7998 from fidencio/topic/CC-add-forked-vanilla-entries-for-containerd

CC | version: Specify forked / vanilla entries of containerd
This commit is contained in:
Fabiano Fidêncio
2023-09-20 10:06:04 +02:00
committed by GitHub

View File

@@ -221,6 +221,7 @@ externals:
containerd: containerd:
description: | description: |
Containerd for Kubernetes Container Runtime Interface. Containerd for Kubernetes Container Runtime Interface.
forked:
# CCv0 is using our fork of containerd as the changes can't be merged yet # CCv0 is using our fork of containerd as the changes can't be merged yet
# DO NOT TOUCH DURING MERGES FROM MAIN TO CCv0 # DO NOT TOUCH DURING MERGES FROM MAIN TO CCv0
url: "github.com/confidential-containers/containerd" url: "github.com/confidential-containers/containerd"
@@ -229,6 +230,14 @@ externals:
version: "v1.6.8.2" version: "v1.6.8.2"
# CCv0 needs to know about the specific branch for the integration tests # CCv0 needs to know about the specific branch for the integration tests
branch: "CC-main" branch: "CC-main"
upstream:
# DO NOT TOUCH DURING MERGES FROM MAIN TO CCv0
url: "github.com/containerd/containerd"
# yamllint disable-line rule:line-length
tarball_url: "https://github.com/containerd/containerd/releases/download"
version: "v1.6.8"
# CCv0 needs to know about the specific branch for the integration tests
branch: "release/1.6"
critools: critools:
description: "CLI tool for Container Runtime Interface (CRI)" description: "CLI tool for Container Runtime Interface (CRI)"
@@ -291,12 +300,12 @@ externals:
nydus: nydus:
description: "Nydus image acceleration service" description: "Nydus image acceleration service"
url: "https://github.com/dragonflyoss/image-service" url: "https://github.com/dragonflyoss/image-service"
version: "v2.2.1" version: "v2.2.3"
nydus-snapshotter: nydus-snapshotter:
description: "Snapshotter for Nydus image acceleration service" description: "Snapshotter for Nydus image acceleration service"
url: "https://github.com/containerd/nydus-snapshotter" url: "https://github.com/containerd/nydus-snapshotter"
version: "v0.3.3" version: "v0.12.0"
ovmf: ovmf:
description: "Firmware, implementation of UEFI for virtual machines." description: "Firmware, implementation of UEFI for virtual machines."