Co-authored-by: CBL-Mariner Servicing Account <cblmargh@microsoft.com>
This commit is contained in:
Saul Paredes 2024-05-04 18:04:57 -07:00 коммит произвёл GitHub
Родитель 1bb3cf6369
Коммит 2fcfafe487
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
6 изменённых файлов: 27 добавлений и 21 удалений

Просмотреть файл

@ -1,7 +1,7 @@
{
"Signatures": {
"mariner-coco-build-uvm.sh": "4f2be6965d8c4d7919fd201a68160fc8ab02a1be50a336abbfea13f16a6ffb89",
"kata-containers-cc-3.2.0.azl0-cargo.tar.gz": "7ff6c5f7f7aa31a99ea5d837876291d886b16c32f21b6d65d044fd398abff1e6",
"kata-containers-cc-3.2.0.azl0.tar.gz": "78f3749c848c77f0d54aa16a4f29209a07f3d4af30664c0d9212300ac364aaec"
"kata-containers-cc-3.2.0.azl1-cargo.tar.gz": "e9225097732f0e9be4da806dac9189c94b43e76dc54b964d1c07beaf8ea65e36",
"kata-containers-cc-3.2.0.azl1.tar.gz": "1c0461a0bcb6920888955ad54c6542b8adfce939e008e6c89f102cf4baeb74a4"
}
}

Просмотреть файл

@ -12,8 +12,8 @@
%global debug_package %{nil}
Name: kata-containers-cc
Version: 3.2.0.azl0
Release: 3%{?dist}
Version: 3.2.0.azl1
Release: 1%{?dist}
Summary: Kata Confidential Containers package developed for Confidential Containers on AKS
License: ASL 2.0
Vendor: Microsoft Corporation
@ -65,7 +65,6 @@ Requires: qemu-img
Requires: parted
Requires: curl
Requires: veritysetup
Requires: opa >= 0.50.2
Requires: kernel-uvm
%description tools
@ -176,7 +175,6 @@ pushd %{_builddir}/%{name}-%{version}/src/agent
mkdir -p %{buildroot}%{osbuilder}/src/kata-opa
cp -a %{_builddir}/%{name}-%{version}/src/kata-opa/allow-all.rego %{buildroot}%{osbuilder}/src/kata-opa/
cp -a %{_builddir}/%{name}-%{version}/src/kata-opa/allow-set-policy.rego %{buildroot}%{osbuilder}/src/kata-opa/
cp -a %{_builddir}/%{name}-%{version}/src/kata-opa/kata-opa.service.in %{buildroot}%{osbuilder}/src/kata-opa/
install -D -m 0755 kata-containers.target %{buildroot}%{osbuilder}/kata-containers.target
install -D -m 0755 kata-agent.service.in %{buildroot}%{osbuilder}/kata-agent.service.in
install -D -m 0755 target/x86_64-unknown-linux-gnu/release/kata-agent %{buildroot}%{osbuilder}/kata-agent
@ -267,7 +265,6 @@ install -D -m 0755 %{_builddir}/%{name}-%{version}/tools/osbuilder/image-builder
%dir %{osbuilder}/src/kata-opa
%{osbuilder}/src/kata-opa/allow-all.rego
%{osbuilder}/src/kata-opa/allow-set-policy.rego
%{osbuilder}/src/kata-opa/kata-opa.service.in
%{osbuilder}/mariner-coco-build-uvm.sh
%{osbuilder}/kata-containers.target
@ -292,6 +289,10 @@ install -D -m 0755 %{_builddir}/%{name}-%{version}/tools/osbuilder/image-builder
%exclude %{osbuilder}/tools/osbuilder/rootfs-builder/ubuntu
%changelog
* Thu May 02 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 3.2.0.azl1-1
- Auto-upgrade to 3.2.0.azl1
- Remove opa
* Wed Mar 13 2024 Aurelien Bombo <abombo@microsoft.com> - 3.2.0.azl0-3
- Specify correct virtiofsd dependency

Просмотреть файл

@ -1,8 +1,8 @@
{
"Signatures": {
"50-kata": "fb108c6337b3d3bf80b43ab04f2bf9a3bdecd29075ebd16320aefe8f81c502a7",
"kata-containers-3.2.0.azl0-cargo.tar.gz": "7ff6c5f7f7aa31a99ea5d837876291d886b16c32f21b6d65d044fd398abff1e6",
"kata-containers-3.2.0.azl0.tar.gz": "6b3cb0067ccc36f4ff80cfc88cb006b30994564a43c23bc54770edeb382bcf72",
"mariner-build-uvm.sh": "a0fbee4def82ee492eab64a8b5a948c2fef125fa1ca5686aafa0a80c64144068"
}
"Signatures": {
"50-kata": "fb108c6337b3d3bf80b43ab04f2bf9a3bdecd29075ebd16320aefe8f81c502a7",
"mariner-build-uvm.sh": "a0fbee4def82ee492eab64a8b5a948c2fef125fa1ca5686aafa0a80c64144068",
"kata-containers-3.2.0.azl1-cargo.tar.gz": "9fb37f5141d09d359f9ddbd6588ddc0f0a58c20e7d8da3e96037f6549b283015",
"kata-containers-3.2.0.azl1.tar.gz": "140118610896fd3ef6c63649e06a9a4d2380dc1fbf2d82ec676245c06ffb6f36"
}
}

Просмотреть файл

@ -38,8 +38,8 @@
Summary: Kata Containers
Name: kata-containers
Version: 3.2.0.azl0
Release: 2%{?dist}
Version: 3.2.0.azl1
Release: 1%{?dist}
License: ASL 2.0
Vendor: Microsoft Corporation
URL: https://github.com/microsoft/kata-containers
@ -215,6 +215,9 @@ ln -sf %{_bindir}/kata-runtime %{buildroot}%{_prefix}/local/bin/kata-runtime
%exclude %{kataosbuilderdir}/rootfs-builder/ubuntu
%changelog
* Thu May 02 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 3.2.0.azl1-1
- Auto-upgrade to 3.2.0.azl1
* Tue Mar 12 2024 Aurelien Bombo <abombo@microsoft.com> - 3.2.0.azl0-2
- Build using system OpenSSL.

Просмотреть файл

@ -1,7 +1,7 @@
Summary: Metapackage for Kata UVM components
Name: kata-packages-uvm
Version: 1.0.0
Release: 3%{?dist}
Release: 4%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
@ -43,7 +43,6 @@ Summary: Metapackage to install the set of packages inside a Kata confide
Requires: %{name} = %{version}-%{release}
Requires: cifs-utils
Requires: device-mapper
Requires: opa
%description coco
@ -96,6 +95,9 @@ Requires: golang
%files coco-sign
%changelog
* Fri May 03 2024 Saul Paredes <saulparedes@microsoft.com> - 1.0.0-4
- Remove opa
* Thu Apr 11 2024 Archana Choudhary <archana1@microsoft.com> - 1.0.0-3
- Add cifs-utils to the list of dependencies

Просмотреть файл

@ -8051,8 +8051,8 @@
"type": "other",
"other": {
"name": "kata-containers",
"version": "3.2.0.azl0",
"downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/3.2.0.azl0.tar.gz"
"version": "3.2.0.azl1",
"downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/3.2.0.azl1.tar.gz"
}
}
},
@ -8061,8 +8061,8 @@
"type": "other",
"other": {
"name": "kata-containers-cc",
"version": "3.2.0.azl0",
"downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/3.2.0.azl0.tar.gz"
"version": "3.2.0.azl1",
"downloadUrl": "https://github.com/microsoft/kata-containers/archive/refs/tags/3.2.0.azl1.tar.gz"
}
}
},