From 10dc3844306fb0d37b5bd320df43325595a92e5b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Jul 2018 14:25:35 -0400 Subject: [PATCH 01/93] cri-o-2:1.11.0-1.rhaos3.11.git441bd3d - bump to v1.11.0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 391 +++++++++++++++++++++++++++++++++++++++++ crio-network.sysconfig | 3 + crio-storage.sysconfig | 2 + sources | 1 + 5 files changed, 398 insertions(+) create mode 100644 cri-o.spec create mode 100644 crio-network.sysconfig create mode 100644 crio-storage.sysconfig diff --git a/.gitignore b/.gitignore index e69de29..a64c873 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/cri-o-441bd3d.tar.gz diff --git a/cri-o.spec b/cri-o.spec new file mode 100644 index 0000000..d42c0e2 --- /dev/null +++ b/cri-o.spec @@ -0,0 +1,391 @@ +%global with_debug 0 +%global with_check 0 + +%if 0%{?with_debug} +%global _find_debuginfo_dwz_opts %{nil} +%global _dwz_low_mem_die_limit 0 +%else +%global debug_package %{nil} +%endif + +%if ! 0%{?gobuild:1} +%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -tags "$BUILDTAGS" -a -v -x %{?**}; +%endif + +%global provider github +%global provider_tld com +%global project kubernetes-incubator +%global repo cri-o +# https://github.com/kubernetes-incubator/cri-o +%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} +%global import_path %{provider_prefix} +%global commit0 441bd3d759787684672a7153f7f5a21b604b458b +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global git0 https://%{provider_prefix} + +%global service_name crio + +Name: %{repo} +Version: 1.11.0 +Release: 1.rhaos3.11.git%{shortcommit0}%{?dist} +Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers +License: ASL 2.0 +URL: %{git0} +Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Source3: %{service_name}-network.sysconfig +Source4: %{service_name}-storage.sysconfig + +# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: btrfs-progs-devel +BuildRequires: git +BuildRequires: glib2-devel +BuildRequires: glibc-static +BuildRequires: go-md2man +BuildRequires: gpgme-devel +BuildRequires: libassuan-devel +BuildRequires: libseccomp-devel +BuildRequires: pkgconfig(systemd) +BuildRequires: device-mapper-devel +Requires(pre): container-selinux +Requires: skopeo-containers >= 1:0.1.24-3 +Requires: runc >= 1.0.0-16 +Obsoletes: ocid <= 0.3 +Provides: ocid = %{version}-%{release} +Provides: %{service_name} = %{version}-%{release} +Requires: containernetworking-plugins >= 0.7.0-101 + +%description +%{summary} + +%prep +%autosetup -Sgit -n %{name}-%{commit0} +sed -i '/strip/d' pause/Makefile + +%build +mkdir _output +pushd _output +mkdir -p src/%{provider}.%{provider_tld}/{%{project},opencontainers} +ln -s $(dirs +1 -l) src/%{import_path} +popd + +ln -s vendor src +export GOPATH=$(pwd)/_output:$(pwd):$(pwd):%{gopath} +export BUILDTAGS="selinux seccomp $(./hack/btrfs_tag.sh) $(./hack/libdm_tag.sh) containers_image_ostree_stub" +GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} +BUILDTAGS=$BUILDTAGS make bin/conmon bin/pause docs + +./bin/%{service_name} \ + --selinux=true \ + --storage-driver=overlay \ + --conmon /usr/libexec/%{service_name}/conmon \ + --cni-plugin-dir /usr/libexec/cni \ + --default-mounts /usr/share/rhel/secrets:/run/secrets \ + --storage-opt overlay.override_kernel_check=1 \ + --cgroup-manager=systemd config > %{service_name}.conf + +%install +sed -i 's/\/local//' contrib/systemd/%{service_name}.service +make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd install.completions + +# install binaries +install -dp %{buildroot}{%{_bindir},%{_libexecdir}/%{service_name}} +install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir} +install -p -m 755 bin/conmon %{buildroot}%{_libexecdir}/%{service_name} +install -p -m 755 bin/pause %{buildroot}%{_libexecdir}/%{service_name} + +install -dp %{buildroot}%{_sysconfdir}/cni/net.d +install -p -m 644 contrib/cni/10-crio-bridge.conf %{buildroot}%{_sysconfdir}/cni/net.d/100-crio-bridge.conf +install -p -m 644 contrib/cni/99-loopback.conf %{buildroot}%{_sysconfdir}/cni/net.d/200-loopback.conf + +install -dp %{buildroot}%{_sysconfdir}/sysconfig +install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-network +install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-storage + +install -dp %{buildroot}%{_mandir}/man{1,5,8} +install -m 644 docs/*.5 %{buildroot}%{_mandir}/man5 +install -m 644 docs/*.8 %{buildroot}%{_mandir}/man8 + +mkdir -p %{buildroot}%{_sharedstatedir}/containers + +%check +%if 0%{?with_check} +export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} +%endif + +%post +%systemd_post %{service_name} + +%preun +%systemd_preun %{service_name} + +%postun +%systemd_postun_with_restart %{service_name} + +#define license tag if not already defined +%{!?_licensedir:%global license %doc} + +%files +%license LICENSE +%doc README.md +%{_bindir}/%{service_name} +%{_mandir}/man5/%{service_name}.conf.5* +%{_mandir}/man8/%{service_name}.8* +%dir %{_sysconfdir}/%{service_name} +%config(noreplace) %{_sysconfdir}/%{service_name}/%{service_name}.conf +%config(noreplace) %{_sysconfdir}/%{service_name}/seccomp.json +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-storage +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-network +%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conf +%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf +%config(noreplace) %{_sysconfdir}/crictl.yaml +%dir %{_libexecdir}/%{service_name} +%{_libexecdir}/%{service_name}/conmon +%{_libexecdir}/%{service_name}/pause +%{_unitdir}/%{service_name}.service +%{_unitdir}/%{name}.service +%{_unitdir}/%{service_name}-shutdown.service +%dir %{_sharedstatedir}/containers +%dir %{_datadir}/oci-umount +%dir %{_datadir}/oci-umount/oci-umount.d +%{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf + +%changelog +* Mon Jul 2 2018 Dan Walsh - 2:1.11.0-1.rhaos3.11.git441bd3d +- bump to v1.11.0 + +* Mon Jul 2 2018 Dan Walsh - 2:1.10.5-1.rhaos3.10.git +- bump to v1.10.5 + +* Wed Jun 27 2018 Lokesh Mandvekar - 2:1.10.4-1.rhaos3.10.gitebaa77a +- bump to v1.10.4 +- remove devel and unittest subpackages - unused +- debuginfo disabled for now, complains about %%files being empty + +* Mon Jun 18 2018 Dan Walsh - 2:1.10.3-1.rhaos3.10.gite558bd +- bump to v1.10.3 + +* Tue Jun 12 2018 Dan Walsh - 2:1.10.2-2.rhaos3.10.git1ffcbb +- Released version of v1.10.2 + +* Tue May 15 2018 Lokesh Mandvekar - 2:1.10.2-1.rhaos3.10.git095e88c +- bump to v1.10.2 +- built commit 095e88c +- include rhaos3.10 in release tag +- do not compress debuginfo with dwz to support delve debugger + +* Tue May 8 2018 Dan Walsh - 2:1.10.1-2.git728df92 +- bump to v1.10.1 + +* Wed Mar 28 2018 Lokesh Mandvekar - 2:1.10.0-1.beta.1gitc956614 +- bump to v1.10.0-beta.1 +- built commit c956614 + +* Tue Mar 13 2018 Dan Walsh - 2:1.9.10-1.git8723732 +- bump to v1.9.10 + +* Fri Mar 09 2018 Dan Walsh - 2:1.9.9-1.git4d7e7dc +- bump to v1.9.9 + +* Fri Feb 23 2018 Lokesh Mandvekar - 2:1.9.8-1.git7d9d2aa +- bump to v1.9.8 + +* Fri Feb 23 2018 Lokesh Mandvekar - 2:1.9.7-2.gita98f9c9 +- correct version in previous changelog entry + +* Fri Feb 23 2018 Dan Walsh - 2:1.9.7-1.gita98f9c9 +- Merge pull request #1357 from runcom/netns-fixes +- sandbox_stop: close/remove the netns _after_ stopping the containers +- sandbox net: set netns closed after actaully closing it + +* Wed Feb 21 2018 Dan Walsh - 2:1.9.6-1.git5e48c92 +- vendor: update c/image to handle text/plain from registries + +* Fri Feb 16 2018 Dan Walsh - 2:1.9.5-1.git125ec8a +- image: Add lock around image cache access + +* Thu Feb 15 2018 Dan Walsh - 2:1.9.4-1.git28c7dee +- imageService: cache information about images +- container_create: correctly set user +- system container: add /var/tmp as RW + +* Sun Feb 11 2018 Dan Walsh - 2:1.9.3-1.git63ea1dd +- Update containers/image and containers/storage +- Pick up lots of fixes in image and storage library + +* Thu Feb 8 2018 Dan Walsh - 2:1.9.2-1.gitb066a83 +- sandbox: fix sandbox logPath when crio restarts +- syscontainers, rhel: add ADDTL_MOUNTS +- Adapt to recent containers/image API updates +- container_create: only bind mount /etc/hosts if not provided by k8s + +* Wed Jan 24 2018 Dan Walsh - 2:1.9.1-1.gitb066a8 +- Final Release 1.9.1 + +* Wed Jan 03 2018 Frantisek Kluknavsky - 2:1.8.4-4.gitdffb5c2 +- epoch not needed, 1.9 was never shipped, 1.8 with epoch also never shipped + +* Wed Jan 03 2018 Frantisek Kluknavsky - 2:1.8.4-3.gitdffb5c2 +- reversed to 1.8, epoch + +* Mon Dec 18 2017 Lokesh Mandvekar - 1.9.0-1.git814c6ab +- bump to v1.9.0 + +* Fri Dec 15 2017 Dan Walsh - 1.8.4-1.gitdffb5c2 +- bump to v1.8.4 + +* Wed Nov 29 2017 Lokesh Mandvekar - 1.8.2-1.git3de7ab4 +- bump to v1.8.2 + +* Mon Nov 20 2017 Lokesh Mandvekar - 1.8.0-1.git80f54bc +- bump to v1.8.0 + +* Wed Nov 15 2017 Dan Walsh - 1.0.4-2.git4aceedee +- Fix script error in kpod completions. + +* Mon Nov 13 2017 Dan Walsh - 1.0.4-1.git4aceedee +- bump to v1.0.4 +- Add crictl.yaml +- Add prometheous end points +- Several bug fixes + +* Fri Nov 10 2017 Lokesh Mandvekar - 1.0.3-1.git17bcfb4 +- bump to v1.0.3 + +* Fri Nov 03 2017 Lokesh Mandvekar - 1.0.2-3.git748bc46 +- enable debuginfo for C binaries + +* Fri Nov 03 2017 Lokesh Mandvekar - 1.0.2-2.git748bc46 +- enable debuginfo + +* Mon Oct 30 2017 Dan Walsh - 1.0.2-1.git748bc46 +- Lots of bug fixes +- Fixes to pass cri-tools tests + +* Wed Oct 25 2017 Dan Walsh - 1.0.1-1.git64a30e1 +- Lots of bug fixes +- Fixes to pass cri-tools tests + +* Thu Oct 19 2017 Lokesh Mandvekar - 1.0.0-7.gita636972 +- update dep NVRs +- update release tag + +* Mon Oct 16 2017 Dan Walsh - 1.0.0-6.gita636972 +- Get the correct checksum +- Setup storage-opt to override kernel check + +* Fri Oct 13 2017 Lokesh Mandvekar - 1.0.0-2.gitcd1bac5 +- bump to v1.0.0 +- require containernetworking-plugins >= 0.5.2-3 + +* Wed Oct 11 2017 Lokesh Mandvekar - 1.0.0-1.rc3.gitd2c6f64 +- bump to v1.0.0-rc3 + +* Wed Sep 20 2017 Lokesh Mandvekar - 1.0.0-1.rc2.git6784a66 +- bump to v1.0.0-rc2 + +* Mon Sep 18 2017 Lokesh Mandvekar - 1.0.0-2.rc1.gitbb1da97 +- bump release tag and build for extras + +* Mon Sep 18 2017 Lokesh Mandvekar - 1.0.0-1.rc1.gitbb1da97 +- bump to v1.0.0-rc1 tag +- built commit bb1da97 +- use bundled deps +- disable devel package +- remove redundant meta-provides + +* Thu Aug 3 2017 Dan Walsh - 1.0.0.beta.0-1.git66d96e7 +- Beta Release +- Additional registry support +- Daemon pids-limit support +- cri-o daemon now supports a default pid-limit on all containers to prevent fork-bombs. This is configurable by admins through a flag or /etc/crio/crio.conf +- Configurable image volume support +- Bugs and Stability fixes +- OCI 1.0 runtime support +- Dropped internal runc, and now use systems runc + +* Fri Jun 30 2017 Lokesh Mandvekar - 1.0.0.alpha.0-1.git91977d3 +- built commit 91977d3 +- remove cri-o-cni subpackage +- require containernetworking-plugins >= 0.5.2-2 (same as containernetworking-cni) + +* Fri Jun 23 2017 Antonio Murdaca - 1.0.0.alpha.0-0.git5dcbdc0.3 +- rebuilt to include cri-o-cni sub package + +* Wed Jun 21 2017 Antonio Murdaca - 1.0.0.alpha.0-0.git5dcbdc0.2 +- rebuilt for s390x + +* Wed Jun 21 2017 Antonio Murdaca - 1.0.0.alpha.0-0.git5dcbdc0.1 +- built first alpha release + +* Fri May 5 2017 Dan Walsh 0.3-0.gitf648cd6e +- Bump up version to 0.3 + +* Tue Mar 21 2017 Dan Walsh 0.2-1.git7d7570e +- Bump up version to 0.2 + +* Tue Mar 21 2017 Dan Walsh 0.1-1.git9bf26b5 +- Bump up version to 0.1 + +* Mon Feb 13 2017 Lokesh Mandvekar - 0-0.15.git0639f06 +- built commit 0639f06 +- packaging workarounds for 'go install' + +* Wed Feb 8 2017 Dan Walsh 0-0.14.git6bd7c53 +- Use newer versions of runc +- Applying k8s kubelet v3 api to cri-o server +- Applying k8s.io v3 API for ocic and ocid +- doc: Add instruction to run cri-o with kubernetes +- Lots of updates of container/storage and containers/image + +* Mon Jan 23 2017 Peter Robinson 0-0.13.git7cc8492 +- Build on all kubernetes arches + +* Fri Jan 20 2017 Lokesh Mandvekar - 0-0.12.git7cc8492 +- add bash completion +- From: Daniel J Walsh + +* Thu Jan 19 2017 Lokesh Mandvekar - 0-0.11.git7cc8492 +- remove trailing whitespace from unitfile + +* Thu Jan 19 2017 Lokesh Mandvekar - 0-0.10.git7cc8492 +- built commit 7cc8492 +- packaging fixes from Nalin Dahyabhai + +* Thu Jan 19 2017 Dan Walsh - 0-0.9.gitb9dc097 +- Change to require skopeo-containers +- Merge Nalind/storage patch +- Now uses Storage for Image Management + +* Mon Jan 16 2017 Lokesh Manvekar - 0-0.8.git2e6070f +- packaging changes from Nalin Dahyabhai +- Don't make the ExecReload setting part of the ExecStart setting. +- Create ocid.conf in install, not in check. +- Own /etc/ocid. +- Install an "anything goes" pulling policy for a default. + +* Thu Dec 22 2016 Dan Walsh - 0-0.7.git2e6070f +- Switch locate to /var/lib/containers for images + +* Thu Dec 22 2016 Lokesh Mandvekar - 0-0.6.git2e6070f +- built commit 2e6070f + +* Wed Dec 21 2016 Lokesh Mandvekar - 0-0.5.git36dfef5 +- install plugins into /usr/libexec/ocid/cni/ +- require runc >= 1.0.0 rc2 + +* Wed Dec 21 2016 Lokesh Mandvekar - 0-0.4.git36dfef5 +- built runcom/alpha commit 36dfef5 +- cni bundled for now + +* Thu Dec 15 2016 Lokesh Mandvekar - 0-0.3.gitc57530e +- Resolves: #1392977 - first upload to Fedora +- add build deps, enable only for x86_64 (doesn't build on i686) + +* Thu Dec 15 2016 Lokesh Mandvekar - 0-0.2.gitc57530e +- add Godeps.json + +* Tue Nov 08 2016 Lokesh Mandvekar - 0-0.1.gitc57530e +- First package for Fedora + + diff --git a/crio-network.sysconfig b/crio-network.sysconfig new file mode 100644 index 0000000..7c47f86 --- /dev/null +++ b/crio-network.sysconfig @@ -0,0 +1,3 @@ +# /etc/sysconfig/crio-network + +CRIO_NETWORK_OPTIONS= diff --git a/crio-storage.sysconfig b/crio-storage.sysconfig new file mode 100644 index 0000000..fbc68c5 --- /dev/null +++ b/crio-storage.sysconfig @@ -0,0 +1,2 @@ +# /etc/sysconfig/crio-storage +CRIO_STORAGE_OPTIONS= diff --git a/sources b/sources index e69de29..b9e3246 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +SHA512 (cri-o-441bd3d.tar.gz) = 1e770491cd7eb44e6d225833f7a428675468a971706808a54a38fb2a8ad731e5eea28276bbe374ffaf63f584d13a6914aaaafade90506a02ca279d34f82ad781 From da6ef02fb7d8628cad167e47b9a82bca8aeb677c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Jul 2018 14:36:09 -0400 Subject: [PATCH 02/93] Add Epoch for Fedora Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cri-o.spec b/cri-o.spec index d42c0e2..d325bf5 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -26,6 +26,9 @@ %global service_name crio Name: %{repo} +%if 0%{?fedora} +Epoch: 2 +%endif Version: 1.11.0 Release: 1.rhaos3.11.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers From b306f25d9e4a16a9637d3970b9d83ee9511d68bc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 27 Aug 2018 15:38:56 -0400 Subject: [PATCH 03/93] cri-o-2:1.11.2-1.git3eac3b2 - bump to v1.11.2 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 83 ++++++++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index a64c873..e216382 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /cri-o-441bd3d.tar.gz +/cri-o-3eac3b2.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d325bf5..28bf04f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -8,55 +8,49 @@ %global debug_package %{nil} %endif -%if ! 0%{?gobuild:1} -%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -tags "$BUILDTAGS" -a -v -x %{?**}; -%endif - -%global provider github -%global provider_tld com -%global project kubernetes-incubator -%global repo cri-o +%global provider github +%global provider_tld com +%global project kubernetes-incubator +%global repo cri-o # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit0 441bd3d759787684672a7153f7f5a21b604b458b -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global git0 https://%{provider_prefix} +%global import_path %{provider_prefix} +%global commit0 3eac3b2389f7c949bc84e73cf9169d9efdc7d491 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global git0 https://%{provider_prefix} %global service_name crio -Name: %{repo} -%if 0%{?fedora} +Name: %{repo} Epoch: 2 -%endif -Version: 1.11.0 -Release: 1.rhaos3.11.git%{shortcommit0}%{?dist} -Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers -License: ASL 2.0 -URL: %{git0} -Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz -Source3: %{service_name}-network.sysconfig -Source4: %{service_name}-storage.sysconfig +Version: 1.11.2 +Release: 1.git%{shortcommit0}%{?dist} +Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers +License: ASL 2.0 +URL: %{git0} +Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Source3: %{service_name}-network.sysconfig +Source4: %{service_name}-storage.sysconfig # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -BuildRequires: btrfs-progs-devel -BuildRequires: git -BuildRequires: glib2-devel -BuildRequires: glibc-static -BuildRequires: go-md2man -BuildRequires: gpgme-devel -BuildRequires: libassuan-devel -BuildRequires: libseccomp-devel -BuildRequires: pkgconfig(systemd) -BuildRequires: device-mapper-devel -Requires(pre): container-selinux -Requires: skopeo-containers >= 1:0.1.24-3 -Requires: runc >= 1.0.0-16 -Obsoletes: ocid <= 0.3 -Provides: ocid = %{version}-%{release} -Provides: %{service_name} = %{version}-%{release} -Requires: containernetworking-plugins >= 0.7.0-101 +BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: btrfs-progs-devel +BuildRequires: git +BuildRequires: glib2-devel +BuildRequires: glibc-static +BuildRequires: go-md2man +BuildRequires: gpgme-devel +BuildRequires: libassuan-devel +BuildRequires: libseccomp-devel +BuildRequires: pkgconfig(systemd) +BuildRequires: device-mapper-devel +Requires(pre): container-selinux +Requires: containers-common >= 1:0.1.31-14 +Requires: runc >= 1.0.0-16 +Obsoletes: ocid <= 0.3 +Provides: ocid = %{version}-%{release} +Provides: %{service_name} = %{version}-%{release} +Requires: containernetworking-plugins >= 0.7.3-1 %description %{summary} @@ -75,8 +69,8 @@ popd ln -s vendor src export GOPATH=$(pwd)/_output:$(pwd):$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(./hack/btrfs_tag.sh) $(./hack/libdm_tag.sh) containers_image_ostree_stub" -GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} -BUILDTAGS=$BUILDTAGS make bin/conmon bin/pause docs +%gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} +BUILDTAGS=$BUILDTAGS %{__make} bin/conmon bin/pause docs ./bin/%{service_name} \ --selinux=true \ @@ -154,6 +148,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Mon Aug 27 2018 Lokesh Mandvekar - 2:1.11.2-1.git3eac3b2 +- bump to v1.11.2 + * Mon Jul 2 2018 Dan Walsh - 2:1.11.0-1.rhaos3.11.git441bd3d - bump to v1.11.0 diff --git a/sources b/sources index b9e3246..94a1f16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-441bd3d.tar.gz) = 1e770491cd7eb44e6d225833f7a428675468a971706808a54a38fb2a8ad731e5eea28276bbe374ffaf63f584d13a6914aaaafade90506a02ca279d34f82ad781 +SHA512 (cri-o-3eac3b2.tar.gz) = a951113f1cc8ab8cc9189a5f1ef0db2658f6dd38bee3b645898ae26bfd8b4a7dc39d84deceb060f28fb6df0fa60c20f06c868ce87217b87bae827f42e978766a From 54813a70976953458b3f20eb0dd9c2e572120d3f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 27 Aug 2018 16:00:35 -0400 Subject: [PATCH 04/93] conmon is a separate subpackage Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 28bf04f..624ecdc 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,6 @@ URL: %{git0} Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig - # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel @@ -55,6 +54,12 @@ Requires: containernetworking-plugins >= 0.7.3-1 %description %{summary} +%package -n conmon +Summary: OCI container runtime monitor + +%description -n conmon +conmon is an OCI container runtime monitor. + %prep %autosetup -Sgit -n %{name}-%{commit0} sed -i '/strip/d' pause/Makefile @@ -147,9 +152,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %dir %{_datadir}/oci-umount/oci-umount.d %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf +%files -n conmon +%license LICENSE +%doc README.md +%{_libexecdir}/%{service_name}/conmon + %changelog * Mon Aug 27 2018 Lokesh Mandvekar - 2:1.11.2-1.git3eac3b2 - bump to v1.11.2 +- conmon is a separate subpackage * Mon Jul 2 2018 Dan Walsh - 2:1.11.0-1.rhaos3.11.git441bd3d - bump to v1.11.0 From c759c453e3c9c3d33fa9bb740ab15d49a3ee987e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 27 Aug 2018 19:31:21 -0400 Subject: [PATCH 05/93] cri-o-2:1.11.2-2.git3eac3b2 - no go-md2man or go compiler for ppc64 Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 624ecdc..d8868fa 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -24,7 +24,8 @@ Name: %{repo} Epoch: 2 Version: 1.11.2 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} +ExcludeArch: ppc64 Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: %{git0} @@ -158,6 +159,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Aug 27 2018 Lokesh Mandvekar - 2:1.11.2-2.git3eac3b2 +- no go-md2man or go compiler for ppc64 + * Mon Aug 27 2018 Lokesh Mandvekar - 2:1.11.2-1.git3eac3b2 - bump to v1.11.2 - conmon is a separate subpackage From 1ac0d4b5493f3cada5412c617ae01307ff393325 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 11 Sep 2018 14:11:14 -0400 Subject: [PATCH 06/93] cri-o-2:1.11.3-1.git4fbb022 - bump to v1.11.3 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e216382..80c75a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /cri-o-441bd3d.tar.gz /cri-o-3eac3b2.tar.gz +/cri-o-4fbb022.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d8868fa..3428528 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -5,7 +5,7 @@ %global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 %else -%global debug_package %{nil} +%global debug_package %{nil} %endif %global provider github @@ -15,7 +15,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 3eac3b2389f7c949bc84e73cf9169d9efdc7d491 +%global commit0 4fbb0226dd4114aabc5ed13e292179f00e0f8690 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -23,8 +23,8 @@ Name: %{repo} Epoch: 2 -Version: 1.11.2 -Release: 2.git%{shortcommit0}%{?dist} +Version: 1.11.3 +Release: 1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -159,6 +159,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Sep 11 2018 Lokesh Mandvekar - 2:1.11.3-1.git4fbb022 +- bump to v1.11.3 + * Mon Aug 27 2018 Lokesh Mandvekar - 2:1.11.2-2.git3eac3b2 - no go-md2man or go compiler for ppc64 diff --git a/sources b/sources index 94a1f16..8ebcae9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-3eac3b2.tar.gz) = a951113f1cc8ab8cc9189a5f1ef0db2658f6dd38bee3b645898ae26bfd8b4a7dc39d84deceb060f28fb6df0fa60c20f06c868ce87217b87bae827f42e978766a +SHA512 (cri-o-4fbb022.tar.gz) = b8f023b130da385250b36d3571a52f7463408b90257c011ac2c8095fad5bd735286e101929999f6beb7cf84a517eea1921a6751a788bf23c93f57c5e7d85f2f9 From 252a04b0b733212433660a8b69b54e2c28afd9c3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 17 Sep 2018 10:04:27 -0400 Subject: [PATCH 07/93] cri-o-2:1.11.4-1.gite0c89d8 - bump to v1.11.4 - built commit e0c89d8 - crio.conf changes: cgroup_manager=systemd, file_locking=false Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 31 +++++++++++++++++++------------ sources | 2 +- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 80c75a6..6d68fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cri-o-441bd3d.tar.gz /cri-o-3eac3b2.tar.gz /cri-o-4fbb022.tar.gz +/cri-o-e0c89d8.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 3428528..9567915 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -10,12 +10,12 @@ %global provider github %global provider_tld com -%global project kubernetes-incubator +%global project kubernetes-sigs %global repo cri-o # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 4fbb0226dd4114aabc5ed13e292179f00e0f8690 +%global commit0 e0c89d8df1a23b3ff586e5baaa36a396ff4ca571 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -23,7 +23,7 @@ Name: %{repo} Epoch: 2 -Version: 1.11.3 +Version: 1.11.4 Release: 1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers @@ -64,6 +64,7 @@ conmon is an OCI container runtime monitor. %prep %autosetup -Sgit -n %{name}-%{commit0} sed -i '/strip/d' pause/Makefile +sed -i 's/install.config: crio.conf/install.config:/' Makefile %build mkdir _output @@ -78,17 +79,18 @@ export BUILDTAGS="selinux seccomp $(./hack/btrfs_tag.sh) $(./hack/libdm_tag.sh) %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} BUILDTAGS=$BUILDTAGS %{__make} bin/conmon bin/pause docs -./bin/%{service_name} \ - --selinux=true \ - --storage-driver=overlay \ - --conmon /usr/libexec/%{service_name}/conmon \ - --cni-plugin-dir /usr/libexec/cni \ - --default-mounts /usr/share/rhel/secrets:/run/secrets \ - --storage-opt overlay.override_kernel_check=1 \ - --cgroup-manager=systemd config > %{service_name}.conf - %install sed -i 's/\/local//' contrib/systemd/%{service_name}.service +./bin/%{service_name} \ + --selinux \ + --cgroup-manager "systemd" \ + --storage-driver "overlay" \ + --conmon "%{_libexecdir}/%{service_name}/conmon" \ + --cni-plugin-dir "%{_libexecdir}/cni" \ + --default-mounts "%{_datadir}/rhel/secrets:/run/secrets" \ + --storage-opt "overlay.override_kernel_check=1" \ + --file-locking=false config > %{service_name}.conf + make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd install.completions # install binaries @@ -159,6 +161,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Sep 17 2018 Lokesh Mandvekar - 2:1.11.4-1.gite0c89d8 +- bump to v1.11.4 +- built commit e0c89d8 +- crio.conf changes: cgroup_manager=systemd, file_locking=false + * Tue Sep 11 2018 Lokesh Mandvekar - 2:1.11.3-1.git4fbb022 - bump to v1.11.3 diff --git a/sources b/sources index 8ebcae9..e85df13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-4fbb022.tar.gz) = b8f023b130da385250b36d3571a52f7463408b90257c011ac2c8095fad5bd735286e101929999f6beb7cf84a517eea1921a6751a788bf23c93f57c5e7d85f2f9 +SHA512 (cri-o-e0c89d8.tar.gz) = 496e33fe457ce6aaf8cc554271d3e895fca7c96958c7f3c0b1da127bafc7bd8d93a7283ceebfee76da13342b26a62077c7053f790f2e551935e2daa81605c9b5 From 33bfb78dc7a3b95057ecfa8a5792634026bd10ff Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 30 Oct 2018 14:25:16 -0400 Subject: [PATCH 08/93] cri-o-2:1.11.8-1.git71cc465 - bump to v1.11.8 - built commit 71cc465 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 59 ++++++++++++++++++++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 44 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 6d68fc1..edd5e9a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /cri-o-3eac3b2.tar.gz /cri-o-4fbb022.tar.gz /cri-o-e0c89d8.tar.gz +/cri-o-71cc465.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 9567915..d266cad 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,4 +1,4 @@ -%global with_debug 0 +%global with_debug 1 %global with_check 0 %if 0%{?with_debug} @@ -15,7 +15,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 e0c89d8df1a23b3ff586e5baaa36a396ff4ca571 +%global commit0 71cc46544a8d31229c4ef2b88b42485f4d997c03 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -23,10 +23,10 @@ Name: %{repo} Epoch: 2 -Version: 1.11.4 +Version: 1.11.8 Release: 1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 -Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers +Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: %{git0} Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz @@ -43,7 +43,6 @@ BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libseccomp-devel BuildRequires: pkgconfig(systemd) -BuildRequires: device-mapper-devel Requires(pre): container-selinux Requires: containers-common >= 1:0.1.31-14 Requires: runc >= 1.0.0-16 @@ -74,48 +73,70 @@ ln -s $(dirs +1 -l) src/%{import_path} popd ln -s vendor src -export GOPATH=$(pwd)/_output:$(pwd):$(pwd):%{gopath} -export BUILDTAGS="selinux seccomp $(./hack/btrfs_tag.sh) $(./hack/libdm_tag.sh) containers_image_ostree_stub" +export GOPATH=$(pwd)/_output:$(pwd) +export BUILDTAGS="$(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) $(hack/libdm_no_deferred_remove_tag.sh) $(hack/ostree_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)" %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} -BUILDTAGS=$BUILDTAGS %{__make} bin/conmon bin/pause docs + +# build conmon +%gobuild -o bin/crio-config %{import_path}/cmd/crio-config +pushd conmon && ../bin/crio-config +%{__make} all +popd + +%{__make} bin/pause docs %install sed -i 's/\/local//' contrib/systemd/%{service_name}.service ./bin/%{service_name} \ --selinux \ --cgroup-manager "systemd" \ - --storage-driver "overlay" \ --conmon "%{_libexecdir}/%{service_name}/conmon" \ --cni-plugin-dir "%{_libexecdir}/cni" \ --default-mounts "%{_datadir}/rhel/secrets:/run/secrets" \ - --storage-opt "overlay.override_kernel_check=1" \ --file-locking=false config > %{service_name}.conf -make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd install.completions - # install binaries install -dp %{buildroot}{%{_bindir},%{_libexecdir}/%{service_name}} install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir} install -p -m 755 bin/conmon %{buildroot}%{_libexecdir}/%{service_name} install -p -m 755 bin/pause %{buildroot}%{_libexecdir}/%{service_name} +# install conf files install -dp %{buildroot}%{_sysconfdir}/cni/net.d install -p -m 644 contrib/cni/10-crio-bridge.conf %{buildroot}%{_sysconfdir}/cni/net.d/100-crio-bridge.conf install -p -m 644 contrib/cni/99-loopback.conf %{buildroot}%{_sysconfdir}/cni/net.d/200-loopback.conf +install -dp %{buildroot}%{_sysconfdir}/%{service_name} +install -dp %{buildroot}%{_datadir}/containers/oci/hooks.d +install -dp %{buildroot}%{_datadir}/oci-umount/oci-umount.d +install -p -m 644 crio.conf %{buildroot}%{_sysconfdir}/%{service_name} +install -p -m 644 seccomp.json %{buildroot}%{_sysconfdir}/%{service_name} +install -p -m 644 crio-umount.conf %{buildroot}%{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf +install -p -m 644 crictl.yaml %{buildroot}%{_sysconfdir} + install -dp %{buildroot}%{_sysconfdir}/sysconfig install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-network install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-storage -install -dp %{buildroot}%{_mandir}/man{1,5,8} -install -m 644 docs/*.5 %{buildroot}%{_mandir}/man5 -install -m 644 docs/*.8 %{buildroot}%{_mandir}/man8 +# install manpages +install -dp %{buildroot}%{_mandir}/man{5,8} +install -p -m 644 docs/*.5 %{buildroot}%{_mandir}/man5 +install -p -m 644 docs/*.8 %{buildroot}%{_mandir}/man8 -mkdir -p %{buildroot}%{_sharedstatedir}/containers +# install bash completion +install -dp %{buildroot}%{_datadir}/bash-completion/completions + +# install unitfiles +install -dp %{buildroot}%{_unitdir} +install contrib/systemd/%{service_name}.service %{buildroot}%{_unitdir} +ln -sf %{_unitdir}/%{service_name}.service %{buildroot}%{_unitdir}/%{name}.service +install contrib/systemd/%{service_name}-shutdown.service %{buildroot}%{_unitdir} + +install -dp %{buildroot}%{_sharedstatedir}/containers %check %if 0%{?with_check} -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} +export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %endif %post @@ -161,6 +182,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Oct 30 2018 Lokesh Mandvekar - 2:1.11.8-1.git71cc465 +- bump to v1.11.8 +- built commit 71cc465 + * Mon Sep 17 2018 Lokesh Mandvekar - 2:1.11.4-1.gite0c89d8 - bump to v1.11.4 - built commit e0c89d8 diff --git a/sources b/sources index e85df13..bcca622 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-e0c89d8.tar.gz) = 496e33fe457ce6aaf8cc554271d3e895fca7c96958c7f3c0b1da127bafc7bd8d93a7283ceebfee76da13342b26a62077c7053f790f2e551935e2daa81605c9b5 +SHA512 (cri-o-71cc465.tar.gz) = 2c0cb0809a4d71691993a03a05efa0c4fd100572e6fd19df7fe09aef8c762819aedbd475c20a39c46f4dd61ef62d90edee0ee29825b6ab75ca85c53ea0bf909b From bfe40962d109bc97b66ea93f27b2df0ae8dd375f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 30 Oct 2018 14:29:33 -0400 Subject: [PATCH 09/93] cri-o-2:1.12.0-1.git774a29e - bump to v1.12.0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index edd5e9a..898d2fa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /cri-o-4fbb022.tar.gz /cri-o-e0c89d8.tar.gz /cri-o-71cc465.tar.gz +/cri-o-774a29e.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d266cad..b91bb0a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -15,7 +15,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 71cc46544a8d31229c4ef2b88b42485f4d997c03 +%global commit0 774a29ecf6855f2dff266dc2aa2fe81d7d964465 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -23,7 +23,7 @@ Name: %{repo} Epoch: 2 -Version: 1.11.8 +Version: 1.12.0 Release: 1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers @@ -182,6 +182,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Oct 30 2018 Lokesh Mandvekar - 2:1.12.0-1.git774a29e +- bump to v1.12.0 + * Tue Oct 30 2018 Lokesh Mandvekar - 2:1.11.8-1.git71cc465 - bump to v1.11.8 - built commit 71cc465 diff --git a/sources b/sources index bcca622..84206e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-71cc465.tar.gz) = 2c0cb0809a4d71691993a03a05efa0c4fd100572e6fd19df7fe09aef8c762819aedbd475c20a39c46f4dd61ef62d90edee0ee29825b6ab75ca85c53ea0bf909b +SHA512 (cri-o-774a29e.tar.gz) = edd3dfab5e521bc997d4bb1a46a0643a9409ea67ffb7408b690ab5c6e6e7879c4c99c8f08b3bae6487092016817859d5fe3ce508368d113ce1ad7dccd320739b From a7b724723dede28630369fc94c1aa8946720d652 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 31 Oct 2018 08:33:15 -0400 Subject: [PATCH 10/93] re-include BR: device-mapper-devel Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cri-o.spec b/cri-o.spec index b91bb0a..84b767a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -35,6 +35,7 @@ Source4: %{service_name}-storage.sysconfig # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel +BuildRequires: device-mapper-devel BuildRequires: git BuildRequires: glib2-devel BuildRequires: glibc-static From 082abacf3676506cc7c9da1e8d682719333df293 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 24 Nov 2018 23:41:17 -0500 Subject: [PATCH 11/93] cri-o-2:1.12.0-1.git18bc811 - bump to v1.12.1 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 898d2fa..6576693 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /cri-o-e0c89d8.tar.gz /cri-o-71cc465.tar.gz /cri-o-774a29e.tar.gz +/cri-o-18bc811.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 84b767a..ccf02a7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -15,7 +15,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 774a29ecf6855f2dff266dc2aa2fe81d7d964465 +%global commit0 18bc81132aed7290436ed82b24442e00a80afdeb %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -23,7 +23,7 @@ Name: %{repo} Epoch: 2 -Version: 1.12.0 +Version: 1.12.1 Release: 1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers @@ -183,6 +183,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_libexecdir}/%{service_name}/conmon %changelog +* Sat Nov 24 2018 Lokesh Mandvekar - 2:1.12.0-1.git18bc811 +- bump to v1.12.1 + * Tue Oct 30 2018 Lokesh Mandvekar - 2:1.12.0-1.git774a29e - bump to v1.12.0 diff --git a/sources b/sources index 84206e3..fbd3c74 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-774a29e.tar.gz) = edd3dfab5e521bc997d4bb1a46a0643a9409ea67ffb7408b690ab5c6e6e7879c4c99c8f08b3bae6487092016817859d5fe3ce508368d113ce1ad7dccd320739b +SHA512 (cri-o-18bc811.tar.gz) = 4250e546d7ee5c5ddf7901229625da446563ebe2cee239dcaa189a78be2c7b451d5b6e4163b956e08a2583a13ed362a2034df5c9a799bb9e93700fdeed0e1936 From ff2f8df0de69b42affa86a69ebbe468a6a3bb6f5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 21 Feb 2019 19:30:47 +0530 Subject: [PATCH 12/93] cri-o-2:1.13.0-1.gite8a2525 - bump to v1.13.0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6576693..2be118c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /cri-o-71cc465.tar.gz /cri-o-774a29e.tar.gz /cri-o-18bc811.tar.gz +/cri-o-e8a2525.tar.gz diff --git a/cri-o.spec b/cri-o.spec index ccf02a7..8a813f9 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -15,7 +15,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 18bc81132aed7290436ed82b24442e00a80afdeb +%global commit0 e8a2525c2e7f5ab057d5a2b5f1950be5643d8053 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -23,7 +23,7 @@ Name: %{repo} Epoch: 2 -Version: 1.12.1 +Version: 1.13.0 Release: 1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers @@ -183,6 +183,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Feb 21 2019 Lokesh Mandvekar - 2:1.13.0-1.gite8a2525 +- bump to v1.13.0 + * Sat Nov 24 2018 Lokesh Mandvekar - 2:1.12.0-1.git18bc811 - bump to v1.12.1 diff --git a/sources b/sources index fbd3c74..75f921c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-18bc811.tar.gz) = 4250e546d7ee5c5ddf7901229625da446563ebe2cee239dcaa189a78be2c7b451d5b6e4163b956e08a2583a13ed362a2034df5c9a799bb9e93700fdeed0e1936 +SHA512 (cri-o-e8a2525.tar.gz) = ed0d060457dbb72cb9574b5f29d7ad8a216284ec4de9699652ae72e5f42a2747aeedcb52a31476c44e7b0017fe1c3198627888afa14120a23a2e0ee61a81dd19 From c9f86bb0d9e0e3c844cd1dfbcca72d834f7473d5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 22 Feb 2019 15:12:09 +0530 Subject: [PATCH 13/93] add tests Signed-off-by: Lokesh Mandvekar --- tests/test_crio.sh | 53 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_crio.yml | 36 ++++++++++++++++++++++++++++++ tests/tests.yml | 1 + 3 files changed, 90 insertions(+) create mode 100755 tests/test_crio.sh create mode 100644 tests/test_crio.yml create mode 100644 tests/tests.yml diff --git a/tests/test_crio.sh b/tests/test_crio.sh new file mode 100755 index 0000000..fd1a9ae --- /dev/null +++ b/tests/test_crio.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# +# Simple wrapper for cri-o tests +# + +set -x + +exec >/tmp/test.debug.log 2>&1 + +echo "************************************************************************" +echo "* This log contains the output from test_crio.sh." +echo "*" +echo "* It is almost certainly not what you want. What you want is" +echo "* probably test.full.log , which is the output of test_runner.sh ," +echo "* the actual cri-o tests." +echo "************************************************************************" + +rm -f /tmp/test.log /tmp/test.full.log + +cd /usr/share/cri-o/test + +# Gah +cp --force redhat_sigstore.yaml \ + /etc/containers/registries.d/registry.access.redhat.com.yaml + +export CRIO_CNI_PLUGIN=/usr/libexec/cni +export PAUSE_BINARY=/usr/libexec/crio/pause +export CRIO_BINARY=/usr/bin/crio +export CONMON_BINARY=/usr/libexec/crio/conmon +export SECCOMP_PROFILE=/etc/crio/seccomp.json + +./test_runner.sh &> /tmp/test.full.log + +status=$? + +# Sample output from cri-tests: +# +# not ok 35 ctr update resources +# ok 84 pod stop idempotent with ctrs already stopped +# ok 86 # skip (need systemd cgroup manager) invalid systemd cgroup_parent +# +# convert those to: +# +# FAIL 35 ctr ... +# PASS 84 pod stop ... +# +sed -n \ + -e 's/^ok /PASS /p' \ + -e 's/^not ok /FAIL /p' \ + /tmp/test.log + +exit $status diff --git a/tests/test_crio.yml b/tests/test_crio.yml new file mode 100644 index 0000000..42a7f3a --- /dev/null +++ b/tests/test_crio.yml @@ -0,0 +1,36 @@ +--- +- hosts: localhost + vars: + - artifacts: ./artifacts + tags: + - classic + - container +# - atomic + + tasks: + - name: install integration tests + dnf: name={{ item }} state=present enablerepo=updates-testing + with_items: + - cri-o + - cri-o-integration-tests + - cri-tools + - nmap-ncat + - socat + - containernetworking-cni + - conntrack-tools + - python2 + - bats + + - block: + - name: Run test + script: ./test_crio.sh + always: + - name: Pull out logs + fetch: + src: "/tmp/{{ item }}" + dest: "{{ artifacts }}/{{ item }}" + flat: yes + with_items: + - test.log + - test.debug.log + - test.full.log diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..7c259f4 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1 @@ +- import_playbook: test_crio.yml From 57f6ca4aa59db8bff02568ef76063d765b6eca83 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 23 May 2019 07:02:39 +0000 Subject: [PATCH 14/93] cri-o-2:1.13.9-1.gitd70609a - bump to v1.13.9 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2be118c..86b36f3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /cri-o-774a29e.tar.gz /cri-o-18bc811.tar.gz /cri-o-e8a2525.tar.gz +/cri-o-d70609a.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 8a813f9..855d25a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -10,12 +10,12 @@ %global provider github %global provider_tld com -%global project kubernetes-sigs +%global project cri-o %global repo cri-o # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 e8a2525c2e7f5ab057d5a2b5f1950be5643d8053 +%global commit0 d70609afd5e933948284aebf15966bdc098d28b3 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -23,7 +23,7 @@ Name: %{repo} Epoch: 2 -Version: 1.13.0 +Version: 1.13.9 Release: 1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers @@ -183,6 +183,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_libexecdir}/%{service_name}/conmon %changelog +* Thu May 23 2019 Lokesh Mandvekar - 2:1.13.9-1.gitd70609a +- bump to v1.13.9 + * Thu Feb 21 2019 Lokesh Mandvekar - 2:1.13.0-1.gite8a2525 - bump to v1.13.0 diff --git a/sources b/sources index 75f921c..17b0b27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-e8a2525.tar.gz) = ed0d060457dbb72cb9574b5f29d7ad8a216284ec4de9699652ae72e5f42a2747aeedcb52a31476c44e7b0017fe1c3198627888afa14120a23a2e0ee61a81dd19 +SHA512 (cri-o-d70609a.tar.gz) = dc9c0bd5a0681c8aff04b649b541cacd063de2acb0e5b2d63f72e5411d91c4ae200102f5b64819fd6acce3ad1394101c54753f749318a3eca7cb0b67f56f635f From 50d22f4bd5305a9a0c9c45277541db3609dc2e00 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 23 May 2019 07:09:03 +0000 Subject: [PATCH 15/93] cri-o-2:1.14.1-1.gitb7644f6 - bump to v1.14.1 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 86b36f3..97b95b7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /cri-o-18bc811.tar.gz /cri-o-e8a2525.tar.gz /cri-o-d70609a.tar.gz +/cri-o-b7644f6.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 855d25a..f694807 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -15,7 +15,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 d70609afd5e933948284aebf15966bdc098d28b3 +%global commit0 b7644f67e6383cc862b3e37fb74fba334b0b2721 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -23,7 +23,7 @@ Name: %{repo} Epoch: 2 -Version: 1.13.9 +Version: 1.14.1 Release: 1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers @@ -183,6 +183,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_libexecdir}/%{service_name}/conmon %changelog +* Thu May 23 2019 Lokesh Mandvekar - 2:1.14.1-1.gitb7644f6 +- bump to v1.14.1 + * Thu May 23 2019 Lokesh Mandvekar - 2:1.13.9-1.gitd70609a - bump to v1.13.9 diff --git a/sources b/sources index 17b0b27..7590fab 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (cri-o-b7644f6.tar.gz) = 483a5fbee0eb84b52dd33a2808f318fe7b1c2adb238961bda666e1fbf31285a5d9484b3edc91a8160b1b928c95de7f7b2698e46599444578c365acaaf769ed66 SHA512 (cri-o-d70609a.tar.gz) = dc9c0bd5a0681c8aff04b649b541cacd063de2acb0e5b2d63f72e5411d91c4ae200102f5b64819fd6acce3ad1394101c54753f749318a3eca7cb0b67f56f635f From 26c6377132e9c4d8c8f2f837f44bc8364a701169 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 27 May 2019 08:38:49 +0000 Subject: [PATCH 16/93] cri-o-2:1.14.1-2.gitb7644f6 - add a patch to build on 32-bit systems (upstream PR: 2409) Signed-off-by: Lokesh Mandvekar --- ...x-build-issues-on-x86-and-32-bit-arm.patch | 95 +++++++++++++++++++ cri-o.spec | 6 +- sources | 1 - 3 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 0001-fix-build-issues-on-x86-and-32-bit-arm.patch diff --git a/0001-fix-build-issues-on-x86-and-32-bit-arm.patch b/0001-fix-build-issues-on-x86-and-32-bit-arm.patch new file mode 100644 index 0000000..2ef98a9 --- /dev/null +++ b/0001-fix-build-issues-on-x86-and-32-bit-arm.patch @@ -0,0 +1,95 @@ +From 975f491ad9e2a1749fe9b8cc011e1cd48e521f70 Mon Sep 17 00:00:00 2001 +From: Lokesh Mandvekar +Date: Mon, 27 May 2019 08:06:15 +0000 +Subject: [PATCH] fix build issues on x86 and 32-bit arm + +Signed-off-by: Lokesh Mandvekar +--- + oci/stats.go | 2 ++ + oci/stats_32.go | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 66 insertions(+) + create mode 100644 oci/stats_32.go + +diff --git a/oci/stats.go b/oci/stats.go +index b4981456a..cff7466f9 100644 +--- a/oci/stats.go ++++ b/oci/stats.go +@@ -1,3 +1,5 @@ ++// +build linux,!arm,!386 ++ + package oci + + import ( +diff --git a/oci/stats_32.go b/oci/stats_32.go +new file mode 100644 +index 000000000..4afb4c270 +--- /dev/null ++++ b/oci/stats_32.go +@@ -0,0 +1,64 @@ ++// +build linux,arm linux,386 ++ ++package oci ++ ++import ( ++ "strings" ++ "syscall" ++ ++ "github.com/opencontainers/runc/libcontainer" ++) ++ ++// ContainerStats contains the statistics information for a running container ++type ContainerStats struct { ++ Container string ++ CPU float64 ++ CPUNano uint64 ++ SystemNano int64 ++ MemUsage uint64 ++ MemLimit uint64 ++ MemPerc float64 ++ NetInput uint64 ++ NetOutput uint64 ++ BlockInput uint64 ++ BlockOutput uint64 ++ PIDs uint64 ++} ++ ++// Returns the total number of bytes transmitted and received for the given container stats ++func getContainerNetIO(stats *libcontainer.Stats) (received uint64, transmitted uint64) { ++ for _, iface := range stats.Interfaces { ++ received += iface.RxBytes ++ transmitted += iface.TxBytes ++ } ++ return ++} ++ ++func calculateBlockIO(stats *libcontainer.Stats) (read uint64, write uint64) { ++ for _, blkIOEntry := range stats.CgroupStats.BlkioStats.IoServiceBytesRecursive { ++ switch strings.ToLower(blkIOEntry.Op) { ++ case "read": ++ read += blkIOEntry.Value ++ case "write": ++ write += blkIOEntry.Value ++ } ++ } ++ return ++} ++ ++// getMemory limit returns the memory limit for a given cgroup ++// If the configured memory limit is larger than the total memory on the sys, the ++// physical system memory size is returned ++func getMemLimit(cgroupLimit uint64) uint64 { ++ si := &syscall.Sysinfo_t{} ++ err := syscall.Sysinfo(si) ++ if err != nil { ++ return cgroupLimit ++ } ++ ++ physicalLimit := uint64(si.Totalram) ++ if cgroupLimit > physicalLimit { ++ return physicalLimit ++ } ++ return cgroupLimit ++} +-- +2.21.0 + diff --git a/cri-o.spec b/cri-o.spec index f694807..6385892 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -24,7 +24,7 @@ Name: %{repo} Epoch: 2 Version: 1.14.1 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -32,6 +32,7 @@ URL: %{git0} Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig +Patch0: 0001-fix-build-issues-on-x86-and-32-bit-arm.patch # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel @@ -183,6 +184,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_libexecdir}/%{service_name}/conmon %changelog +* Mon May 27 2019 Lokesh Mandvekar - 2:1.14.1-2.gitb7644f6 +- add a patch to build on 32-bit systems (upstream PR: 2409) + * Thu May 23 2019 Lokesh Mandvekar - 2:1.14.1-1.gitb7644f6 - bump to v1.14.1 diff --git a/sources b/sources index 7590fab..7d15b50 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (cri-o-b7644f6.tar.gz) = 483a5fbee0eb84b52dd33a2808f318fe7b1c2adb238961bda666e1fbf31285a5d9484b3edc91a8160b1b928c95de7f7b2698e46599444578c365acaaf769ed66 -SHA512 (cri-o-d70609a.tar.gz) = dc9c0bd5a0681c8aff04b649b541cacd063de2acb0e5b2d63f72e5411d91c4ae200102f5b64819fd6acce3ad1394101c54753f749318a3eca7cb0b67f56f635f From e19e3d00bec07938510ffe570e0c0866baf36e7c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 18 Jul 2019 00:31:13 +0530 Subject: [PATCH 17/93] update release tag Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 6385892..6737b1f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -12,7 +12,7 @@ %global provider_tld com %global project cri-o %global repo cri-o -# https://github.com/kubernetes-incubator/cri-o +# https://github.com/cri-o/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} %global commit0 b7644f67e6383cc862b3e37fb74fba334b0b2721 @@ -24,7 +24,7 @@ Name: %{repo} Epoch: 2 Version: 1.14.1 -Release: 2.git%{shortcommit0}%{?dist} +Release: 2.dev.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 From b717dfb7037c8adb974b84991f2803f4ac3c4931 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 18 Jul 2019 00:39:38 +0530 Subject: [PATCH 18/93] 32-bit build patch merged upstream Signed-off-by: Lokesh Mandvekar --- ...x-build-issues-on-x86-and-32-bit-arm.patch | 95 ------------------- cri-o.spec | 1 - 2 files changed, 96 deletions(-) delete mode 100644 0001-fix-build-issues-on-x86-and-32-bit-arm.patch diff --git a/0001-fix-build-issues-on-x86-and-32-bit-arm.patch b/0001-fix-build-issues-on-x86-and-32-bit-arm.patch deleted file mode 100644 index 2ef98a9..0000000 --- a/0001-fix-build-issues-on-x86-and-32-bit-arm.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 975f491ad9e2a1749fe9b8cc011e1cd48e521f70 Mon Sep 17 00:00:00 2001 -From: Lokesh Mandvekar -Date: Mon, 27 May 2019 08:06:15 +0000 -Subject: [PATCH] fix build issues on x86 and 32-bit arm - -Signed-off-by: Lokesh Mandvekar ---- - oci/stats.go | 2 ++ - oci/stats_32.go | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 66 insertions(+) - create mode 100644 oci/stats_32.go - -diff --git a/oci/stats.go b/oci/stats.go -index b4981456a..cff7466f9 100644 ---- a/oci/stats.go -+++ b/oci/stats.go -@@ -1,3 +1,5 @@ -+// +build linux,!arm,!386 -+ - package oci - - import ( -diff --git a/oci/stats_32.go b/oci/stats_32.go -new file mode 100644 -index 000000000..4afb4c270 ---- /dev/null -+++ b/oci/stats_32.go -@@ -0,0 +1,64 @@ -+// +build linux,arm linux,386 -+ -+package oci -+ -+import ( -+ "strings" -+ "syscall" -+ -+ "github.com/opencontainers/runc/libcontainer" -+) -+ -+// ContainerStats contains the statistics information for a running container -+type ContainerStats struct { -+ Container string -+ CPU float64 -+ CPUNano uint64 -+ SystemNano int64 -+ MemUsage uint64 -+ MemLimit uint64 -+ MemPerc float64 -+ NetInput uint64 -+ NetOutput uint64 -+ BlockInput uint64 -+ BlockOutput uint64 -+ PIDs uint64 -+} -+ -+// Returns the total number of bytes transmitted and received for the given container stats -+func getContainerNetIO(stats *libcontainer.Stats) (received uint64, transmitted uint64) { -+ for _, iface := range stats.Interfaces { -+ received += iface.RxBytes -+ transmitted += iface.TxBytes -+ } -+ return -+} -+ -+func calculateBlockIO(stats *libcontainer.Stats) (read uint64, write uint64) { -+ for _, blkIOEntry := range stats.CgroupStats.BlkioStats.IoServiceBytesRecursive { -+ switch strings.ToLower(blkIOEntry.Op) { -+ case "read": -+ read += blkIOEntry.Value -+ case "write": -+ write += blkIOEntry.Value -+ } -+ } -+ return -+} -+ -+// getMemory limit returns the memory limit for a given cgroup -+// If the configured memory limit is larger than the total memory on the sys, the -+// physical system memory size is returned -+func getMemLimit(cgroupLimit uint64) uint64 { -+ si := &syscall.Sysinfo_t{} -+ err := syscall.Sysinfo(si) -+ if err != nil { -+ return cgroupLimit -+ } -+ -+ physicalLimit := uint64(si.Totalram) -+ if cgroupLimit > physicalLimit { -+ return physicalLimit -+ } -+ return cgroupLimit -+} --- -2.21.0 - diff --git a/cri-o.spec b/cri-o.spec index 6737b1f..27636b4 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -32,7 +32,6 @@ URL: %{git0} Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig -Patch0: 0001-fix-build-issues-on-x86-and-32-bit-arm.patch # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel From 719bda730727a4d328f2d0de192579385c9df44e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 20 Jul 2019 22:11:15 +0530 Subject: [PATCH 19/93] packaging changes, no conmon subpackage Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 54 +++++++++++++++++++++--------------------- crio-metrics.sysconfig | 2 ++ 2 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 crio-metrics.sysconfig diff --git a/cri-o.spec b/cri-o.spec index 27636b4..d673b29 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -22,9 +22,12 @@ %global service_name crio Name: %{repo} +# No Epoch for CentOS +%if 0%{?fedora} Epoch: 2 +%endif Version: 1.14.1 -Release: 2.dev.git%{shortcommit0}%{?dist} +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -32,6 +35,7 @@ URL: %{git0} Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig +Source5: %{service_name}-metrics.sysconfig # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: btrfs-progs-devel @@ -55,16 +59,15 @@ Requires: containernetworking-plugins >= 0.7.3-1 %description %{summary} -%package -n conmon -Summary: OCI container runtime monitor - -%description -n conmon -conmon is an OCI container runtime monitor. - %prep %autosetup -Sgit -n %{name}-%{commit0} sed -i '/strip/d' pause/Makefile sed -i 's/install.config: crio.conf/install.config:/' Makefile +sed -i 's/install.bin: binaries/install.bin:/' Makefile +sed -i 's/\.gopathok //' Makefile +sed -i 's/%{version}/%{version}-%{release}/' version/version.go +sed -i 's/\/local//' contrib/systemd/%{service_name}.service +#sed -i 's/\/local//' contrib/systemd/%%{service_name}-wipe.service %build mkdir _output @@ -111,29 +114,26 @@ install -dp %{buildroot}%{_sysconfdir}/%{service_name} install -dp %{buildroot}%{_datadir}/containers/oci/hooks.d install -dp %{buildroot}%{_datadir}/oci-umount/oci-umount.d install -p -m 644 crio.conf %{buildroot}%{_sysconfdir}/%{service_name} -install -p -m 644 seccomp.json %{buildroot}%{_sysconfdir}/%{service_name} +#install -p -m 644 seccomp.json %%{buildroot}%%{_sysconfdir}/%%{service_name} install -p -m 644 crio-umount.conf %{buildroot}%{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf install -p -m 644 crictl.yaml %{buildroot}%{_sysconfdir} install -dp %{buildroot}%{_sysconfdir}/sysconfig +install -p -m 644 contrib/sysconfig/%{service_name} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name} install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-network install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-storage +install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-metrics -# install manpages -install -dp %{buildroot}%{_mandir}/man{5,8} -install -p -m 644 docs/*.5 %{buildroot}%{_mandir}/man5 -install -p -m 644 docs/*.8 %{buildroot}%{_mandir}/man8 - -# install bash completion -install -dp %{buildroot}%{_datadir}/bash-completion/completions - -# install unitfiles -install -dp %{buildroot}%{_unitdir} -install contrib/systemd/%{service_name}.service %{buildroot}%{_unitdir} -ln -sf %{_unitdir}/%{service_name}.service %{buildroot}%{_unitdir}/%{name}.service -install contrib/systemd/%{service_name}-shutdown.service %{buildroot}%{_unitdir} +make PREFIX=%{buildroot}%{_usr} DESTDIR=%{buildroot} \ + install.bin \ + install.completions \ + install.config \ + install.man \ + install.systemd install -dp %{buildroot}%{_sharedstatedir}/containers +#install -dp %%{buildroot}%%{_libexecdir}/%%{service_name}/%%{service_name}-wipe +#install -dp %%{buildroot}%%{_usr}/lib/systemd/system-preset %check %if 0%{?with_check} @@ -160,9 +160,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_mandir}/man8/%{service_name}.8* %dir %{_sysconfdir}/%{service_name} %config(noreplace) %{_sysconfdir}/%{service_name}/%{service_name}.conf -%config(noreplace) %{_sysconfdir}/%{service_name}/seccomp.json +#%%config(noreplace) %%{_sysconfdir}/%%{service_name}/seccomp.json +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name} %config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-storage %config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-network +%config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-metrics %config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conf %config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf %config(noreplace) %{_sysconfdir}/crictl.yaml @@ -172,15 +174,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_unitdir}/%{service_name}.service %{_unitdir}/%{name}.service %{_unitdir}/%{service_name}-shutdown.service +#%%{_unitdir}/%%{service_name}-wipe.service %dir %{_sharedstatedir}/containers %dir %{_datadir}/oci-umount %dir %{_datadir}/oci-umount/oci-umount.d %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf - -%files -n conmon -%license LICENSE -%doc README.md -%{_libexecdir}/%{service_name}/conmon +#%%dir %%{_libexecdir}/%%{service_name}/%%{service_name}-wipe +#%%{_libexecdir}/%%{service_name}/%%{service_name}-wipe/* %changelog * Mon May 27 2019 Lokesh Mandvekar - 2:1.14.1-2.gitb7644f6 diff --git a/crio-metrics.sysconfig b/crio-metrics.sysconfig new file mode 100644 index 0000000..c4bbe6e --- /dev/null +++ b/crio-metrics.sysconfig @@ -0,0 +1,2 @@ +# /etc/sysconfig/crio-metrics +CRIO_METRICS_OPTIONS="--enable-metrics=true --metrics-port=9537" From 86fe1caa8279ef3b27079a1f7dccc6d98a48936d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 20 Jul 2019 21:50:04 -0400 Subject: [PATCH 20/93] cri-o-2:1.15.0-1 - bump to 1.15.0 - autobuilt 485227d Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 97b95b7..96cfcd2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /cri-o-e8a2525.tar.gz /cri-o-d70609a.tar.gz /cri-o-b7644f6.tar.gz +/cri-o-485227d.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d673b29..9e2afc1 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -15,7 +15,7 @@ # https://github.com/cri-o/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 b7644f67e6383cc862b3e37fb74fba334b0b2721 +%global commit0 485227d727401fa0472a449b5df3b0537e314ebb %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -26,8 +26,8 @@ Name: %{repo} %if 0%{?fedora} Epoch: 2 %endif -Version: 1.14.1 -Release: 2%{?dist} +Version: 1.15.0 +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -183,6 +183,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace #%%{_libexecdir}/%%{service_name}/%%{service_name}-wipe/* %changelog +* Sun Jul 21 2019 Lokesh Mandvekar - 2:1.15.0-1 +- bump to 1.15.0 +- autobuilt 485227d + * Mon May 27 2019 Lokesh Mandvekar - 2:1.14.1-2.gitb7644f6 - add a patch to build on 32-bit systems (upstream PR: 2409) diff --git a/sources b/sources index 7d15b50..34a78ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-b7644f6.tar.gz) = 483a5fbee0eb84b52dd33a2808f318fe7b1c2adb238961bda666e1fbf31285a5d9484b3edc91a8160b1b928c95de7f7b2698e46599444578c365acaaf769ed66 +SHA512 (cri-o-485227d.tar.gz) = 99c3ed75c1ff8abeea730a5d66d3f1b227d6e8c8e9afe95b5a1c8801be44e287ec8327ca3ebe307cebf978dd2ba1fc61c531531ef03d6d15dc28b1a3874dfdf1 From d1a7b5547665de4b13edaa0071e047f6d2f91bba Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 20 Jul 2019 23:15:46 -0400 Subject: [PATCH 21/93] define %gobuild if not already, epoch for centos as well Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 9e2afc1..bc8a118 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -8,6 +8,10 @@ %global debug_package %{nil} %endif +%if ! 0%{?gobuild:1} +%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; +%endif + %global provider github %global provider_tld com %global project cri-o @@ -22,10 +26,7 @@ %global service_name crio Name: %{repo} -# No Epoch for CentOS -%if 0%{?fedora} Epoch: 2 -%endif Version: 1.15.0 Release: 1%{?dist} ExcludeArch: ppc64 From 30f19410f091c7562095166680d9516829871c3f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 21 Jul 2019 14:27:30 -0400 Subject: [PATCH 22/93] no hack/ostree_tag.sh in 1.15.0 Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index bc8a118..b9c573f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -79,7 +79,7 @@ popd ln -s vendor src export GOPATH=$(pwd)/_output:$(pwd) -export BUILDTAGS="$(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) $(hack/libdm_no_deferred_remove_tag.sh) $(hack/ostree_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)" +export BUILDTAGS="$(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) $(hack/libdm_no_deferred_remove_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)" %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} # build conmon From 4e8ec92aebec50f2d566dddfcdba08f9d7b139bc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 21 Jul 2019 15:35:03 -0400 Subject: [PATCH 23/93] ensure GO111MODULE=off Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cri-o.spec b/cri-o.spec index b9c573f..d61b7c7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -80,6 +80,7 @@ popd ln -s vendor src export GOPATH=$(pwd)/_output:$(pwd) export BUILDTAGS="$(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) $(hack/libdm_no_deferred_remove_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)" +export GO111MODULE=off %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} # build conmon From 20958cb6d8a7bff499745f2138d274e593671ca9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 4 Sep 2019 04:48:30 +0530 Subject: [PATCH 24/93] include built_tag macro Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cri-o.spec b/cri-o.spec index d61b7c7..a268a16 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,6 +25,10 @@ %global service_name crio +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%global built_tag v1.15.0 + Name: %{repo} Epoch: 2 Version: 1.15.0 From 3800df9b5e8f3b7759f2ef659adf47f4091e6ee8 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 4 Sep 2019 18:49:37 +0530 Subject: [PATCH 25/93] cri-o-2:1.15.1-1 - bump to v1.15.1 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 96cfcd2..5de71d1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /cri-o-d70609a.tar.gz /cri-o-b7644f6.tar.gz /cri-o-485227d.tar.gz +/cri-o-f0827bb.tar.gz diff --git a/cri-o.spec b/cri-o.spec index a268a16..d4e03b8 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -19,7 +19,7 @@ # https://github.com/cri-o/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 485227d727401fa0472a449b5df3b0537e314ebb +%global commit0 f0827bb332854ffcff2f4d9f64d68b8139970b3d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -27,11 +27,11 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.15.0 +%global built_tag v1.15.1 Name: %{repo} Epoch: 2 -Version: 1.15.0 +Version: 1.15.1 Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers @@ -189,6 +189,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace #%%{_libexecdir}/%%{service_name}/%%{service_name}-wipe/* %changelog +* Wed Sep 04 2019 Lokesh Mandvekar - 2:1.15.1-1 +- bump to v1.15.1 + * Sun Jul 21 2019 Lokesh Mandvekar - 2:1.15.0-1 - bump to 1.15.0 - autobuilt 485227d diff --git a/sources b/sources index 34a78ba..20c276f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-485227d.tar.gz) = 99c3ed75c1ff8abeea730a5d66d3f1b227d6e8c8e9afe95b5a1c8801be44e287ec8327ca3ebe307cebf978dd2ba1fc61c531531ef03d6d15dc28b1a3874dfdf1 +SHA512 (cri-o-f0827bb.tar.gz) = 539a89e4721e4104b16c90221502f9a894496286bd0d9fcd4493932883e4985c35bfdc3424a02c6c6d7999b5ea537de2c15644e9c36ba04e38b8be35d68ff5ea From aab3493d969c864f5fe4bda215cfb91bbb07fb1f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 4 Sep 2019 09:51:56 -0400 Subject: [PATCH 26/93] correctly list installed files Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index d4e03b8..1ccfe37 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -180,13 +180,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_unitdir}/%{service_name}.service %{_unitdir}/%{name}.service %{_unitdir}/%{service_name}-shutdown.service -#%%{_unitdir}/%%{service_name}-wipe.service +%{_unitdir}/%{service_name}-wipe.service %dir %{_sharedstatedir}/containers %dir %{_datadir}/oci-umount %dir %{_datadir}/oci-umount/oci-umount.d %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf -#%%dir %%{_libexecdir}/%%{service_name}/%%{service_name}-wipe -#%%{_libexecdir}/%%{service_name}/%%{service_name}-wipe/* +%dir %{_libexecdir}/%{service_name}/%{service_name}-wipe +%{_libexecdir}/%{service_name}/%{service_name}-wipe/* %changelog * Wed Sep 04 2019 Lokesh Mandvekar - 2:1.15.1-1 From 2a1d8fc9ccd3f6c71e6975daf5fba09a37188bfa Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 9 Sep 2019 19:14:02 +0530 Subject: [PATCH 27/93] cri-o-2:1.15.1-2 - correct path in crio-wipe unitfile Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 1ccfe37..079c024 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -32,7 +32,7 @@ Name: %{repo} Epoch: 2 Version: 1.15.1 -Release: 1%{?dist} +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -59,7 +59,7 @@ Requires: runc >= 1.0.0-16 Obsoletes: ocid <= 0.3 Provides: ocid = %{version}-%{release} Provides: %{service_name} = %{version}-%{release} -Requires: containernetworking-plugins >= 0.7.3-1 +Requires: containernetworking-plugins >= 0.7.5-1 %description %{summary} @@ -72,7 +72,7 @@ sed -i 's/install.bin: binaries/install.bin:/' Makefile sed -i 's/\.gopathok //' Makefile sed -i 's/%{version}/%{version}-%{release}/' version/version.go sed -i 's/\/local//' contrib/systemd/%{service_name}.service -#sed -i 's/\/local//' contrib/systemd/%%{service_name}-wipe.service +sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service %build mkdir _output @@ -189,6 +189,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_libexecdir}/%{service_name}/%{service_name}-wipe/* %changelog +* Mon Sep 09 2019 Lokesh Mandvekar - 2:1.15.1-2 +- correct path in crio-wipe unitfile + * Wed Sep 04 2019 Lokesh Mandvekar - 2:1.15.1-1 - bump to v1.15.1 From 47f61f5e3a6cdaa1f074ffb9d67afadc577054d1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 3 Oct 2019 15:43:09 -0400 Subject: [PATCH 28/93] cri-o-2:1.15.2-1 - bump to v1.15.2 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5de71d1..e5d51dd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /cri-o-b7644f6.tar.gz /cri-o-485227d.tar.gz /cri-o-f0827bb.tar.gz +/cri-o-b731670.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 079c024..84cb060 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -19,7 +19,7 @@ # https://github.com/cri-o/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 f0827bb332854ffcff2f4d9f64d68b8139970b3d +%global commit0 b7316701c17ebc7901d10a716f15e66008c52525 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -31,8 +31,8 @@ Name: %{repo} Epoch: 2 -Version: 1.15.1 -Release: 2%{?dist} +Version: 1.15.2 +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -189,6 +189,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_libexecdir}/%{service_name}/%{service_name}-wipe/* %changelog +* Thu Oct 03 2019 Lokesh Mandvekar - 2:1.15.2-1 +- bump to v1.15.2 + * Mon Sep 09 2019 Lokesh Mandvekar - 2:1.15.1-2 - correct path in crio-wipe unitfile diff --git a/sources b/sources index 20c276f..c3f19ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-f0827bb.tar.gz) = 539a89e4721e4104b16c90221502f9a894496286bd0d9fcd4493932883e4985c35bfdc3424a02c6c6d7999b5ea537de2c15644e9c36ba04e38b8be35d68ff5ea +SHA512 (cri-o-b731670.tar.gz) = d1cd67d623ce6398b5aa89949fbb64484b28b87a9acb4925537c793fcf50557e59be15d0b0c4c4d31f0502700052a33a87abb79fe4898fd396a2d90ba68aafbe From 87d53cec7bdfa609abd36b6225cf7736281ba128 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 10 Oct 2019 18:50:56 +0000 Subject: [PATCH 29/93] BR: make for centos Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cri-o.spec b/cri-o.spec index 84cb060..ecfdf4e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -53,6 +53,7 @@ BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libseccomp-devel BuildRequires: pkgconfig(systemd) +BuildRequires: make Requires(pre): container-selinux Requires: containers-common >= 1:0.1.31-14 Requires: runc >= 1.0.0-16 From 88421f7012ebadbaab1db032f851902d0316fb4c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 21 Oct 2019 22:10:34 -0400 Subject: [PATCH 30/93] cri-o-2:1.16.0-1.rc1.git6a4b481 - built release-1.16 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 34 ++++++++++++++++------------------ sources | 2 +- 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index e5d51dd..66835e6 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /cri-o-485227d.tar.gz /cri-o-f0827bb.tar.gz /cri-o-b731670.tar.gz +/cri-o-6a4b481.tar.gz diff --git a/cri-o.spec b/cri-o.spec index ecfdf4e..15e6d32 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,4 +1,4 @@ -%global with_debug 1 +%global with_debug 0 %global with_check 0 %if 0%{?with_debug} @@ -19,7 +19,7 @@ # https://github.com/cri-o/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 b7316701c17ebc7901d10a716f15e66008c52525 +%global commit0 6a4b481e35f2b11e5b3ae9b930991cfcac3d687d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{provider_prefix} @@ -31,8 +31,8 @@ Name: %{repo} Epoch: 2 -Version: 1.15.2 -Release: 1%{?dist} +Version: 1.16.0 +Release: 0.1.rc1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -61,6 +61,7 @@ Obsoletes: ocid <= 0.3 Provides: ocid = %{version}-%{release} Provides: %{service_name} = %{version}-%{release} Requires: containernetworking-plugins >= 0.7.5-1 +Requires: conmon >= 2.0.2-1 %description %{summary} @@ -71,7 +72,7 @@ sed -i '/strip/d' pause/Makefile sed -i 's/install.config: crio.conf/install.config:/' Makefile sed -i 's/install.bin: binaries/install.bin:/' Makefile sed -i 's/\.gopathok //' Makefile -sed -i 's/%{version}/%{version}-%{release}/' version/version.go +sed -i 's/%{version}/%{version}-%{release}/' internal/version/version.go sed -i 's/\/local//' contrib/systemd/%{service_name}.service sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service @@ -87,12 +88,7 @@ export GOPATH=$(pwd)/_output:$(pwd) export BUILDTAGS="$(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) $(hack/libdm_no_deferred_remove_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)" export GO111MODULE=off %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} - -# build conmon -%gobuild -o bin/crio-config %{import_path}/cmd/crio-config -pushd conmon && ../bin/crio-config -%{__make} all -popd +%gobuild -o bin/%{service_name}-status %%{import_path}/cmd/%{service_name}-status %{__make} bin/pause docs @@ -104,12 +100,11 @@ sed -i 's/\/local//' contrib/systemd/%{service_name}.service --conmon "%{_libexecdir}/%{service_name}/conmon" \ --cni-plugin-dir "%{_libexecdir}/cni" \ --default-mounts "%{_datadir}/rhel/secrets:/run/secrets" \ - --file-locking=false config > %{service_name}.conf + config > %{service_name}.conf # install binaries install -dp %{buildroot}{%{_bindir},%{_libexecdir}/%{service_name}} install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir} -install -p -m 755 bin/conmon %{buildroot}%{_libexecdir}/%{service_name} install -p -m 755 bin/pause %{buildroot}%{_libexecdir}/%{service_name} # install conf files @@ -163,11 +158,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %license LICENSE %doc README.md %{_bindir}/%{service_name} +%{_bindir}/%{service_name}-status %{_mandir}/man5/%{service_name}.conf.5* -%{_mandir}/man8/%{service_name}.8* +%{_mandir}/man8/%{service_name}*.8* %dir %{_sysconfdir}/%{service_name} %config(noreplace) %{_sysconfdir}/%{service_name}/%{service_name}.conf -#%%config(noreplace) %%{_sysconfdir}/%%{service_name}/seccomp.json %config(noreplace) %{_sysconfdir}/sysconfig/%{service_name} %config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-storage %config(noreplace) %{_sysconfdir}/sysconfig/%{service_name}-network @@ -176,7 +171,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf %config(noreplace) %{_sysconfdir}/crictl.yaml %dir %{_libexecdir}/%{service_name} -%{_libexecdir}/%{service_name}/conmon %{_libexecdir}/%{service_name}/pause %{_unitdir}/%{service_name}.service %{_unitdir}/%{name}.service @@ -186,10 +180,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %dir %{_datadir}/oci-umount %dir %{_datadir}/oci-umount/oci-umount.d %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf -%dir %{_libexecdir}/%{service_name}/%{service_name}-wipe -%{_libexecdir}/%{service_name}/%{service_name}-wipe/* +%{_datadir}/bash-completion/completions/%{service_name}* +%{_datadir}/fish/completions/%{service_name}*.fish +%{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Mon Oct 21 2019 Lokesh Mandvekar - 2:1.16.0-1.rc1.git6a4b481 +- built release-1.16 + * Thu Oct 03 2019 Lokesh Mandvekar - 2:1.15.2-1 - bump to v1.15.2 diff --git a/sources b/sources index c3f19ad..699b0c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-b731670.tar.gz) = d1cd67d623ce6398b5aa89949fbb64484b28b87a9acb4925537c793fcf50557e59be15d0b0c4c4d31f0502700052a33a87abb79fe4898fd396a2d90ba68aafbe +SHA512 (cri-o-6a4b481.tar.gz) = 797186ecb448c878e19eff8f0b005b6d777458e9928a39b42ef3c4b289edc2383839f2acebb49e2aede5843753311dccd3b73b8dd50afebb2556a3f764ef2e0c From 37dfcd16e8ee125ca41866b4274b14ef79a8d371 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 28 Oct 2019 09:47:53 -0400 Subject: [PATCH 31/93] update built_tag Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 15e6d32..7d9b224 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.15.1 +%global built_tag v1.16.0-rc1 Name: %{repo} Epoch: 2 From 5cee43f2fa948c12907ba20a620901aa96168228 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 28 Oct 2019 10:02:28 -0400 Subject: [PATCH 32/93] update release tag format Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 7d9b224..fbea094 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -32,7 +32,7 @@ Name: %{repo} Epoch: 2 Version: 1.16.0 -Release: 0.1.rc1.git%{shortcommit0}%{?dist} +Release: 0.1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 From d662c77ece114ac3754d0c8ee7fd3e260ec39830 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 28 Oct 2019 11:12:43 -0400 Subject: [PATCH 33/93] update release tag format Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index fbea094..016b4f6 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -32,7 +32,7 @@ Name: %{repo} Epoch: 2 Version: 1.16.0 -Release: 0.1.git%{shortcommit0}%{?dist} +Release: 0.1.rc1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 From 3a4b54a97510037f6abafcf016c329cf3d89275a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 4 Nov 2019 09:15:24 -0500 Subject: [PATCH 34/93] provider_prefix not needed Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 016b4f6..d513b6a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -17,11 +17,10 @@ %global project cri-o %global repo cri-o # https://github.com/cri-o/cri-o -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} +%global import_path %{provider}.%{provider_tld}/%{project}/%{repo} %global commit0 6a4b481e35f2b11e5b3ae9b930991cfcac3d687d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global git0 https://%{provider_prefix} +%global git0 https://%{import_path} %global service_name crio From 085a0b01199e4b7c11117b211546016075857b1e Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 4 Nov 2019 15:06:07 +0000 Subject: [PATCH 35/93] cri-o-2:1.16.0-0.2.rc2 - bump to v1.16.0-rc2 - autobuilt a783f23 Signed-off-by: RH Container Bot --- .gitignore | 1 + cri-o.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 66835e6..7b0a2af 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /cri-o-f0827bb.tar.gz /cri-o-b731670.tar.gz /cri-o-6a4b481.tar.gz +/cri-o-a783f23.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d513b6a..608edb7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -18,7 +18,7 @@ %global repo cri-o # https://github.com/cri-o/cri-o %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 6a4b481e35f2b11e5b3ae9b930991cfcac3d687d +%global commit0 a783f2374ebcdc4c487c7dd6ca4329b72f2749cf %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -26,12 +26,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.16.0-rc1 +%global built_tag v1.16.0-rc2 Name: %{repo} Epoch: 2 Version: 1.16.0 -Release: 0.1.rc1%{?dist} +Release: 0.2.rc2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -184,6 +184,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Mon Nov 04 2019 RH Container Bot - 2:1.16.0-0.2.rc2 +- bump to v1.16.0-rc2 +- autobuilt a783f23 + * Mon Oct 21 2019 Lokesh Mandvekar - 2:1.16.0-1.rc1.git6a4b481 - built release-1.16 diff --git a/sources b/sources index 699b0c5..780a1c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-6a4b481.tar.gz) = 797186ecb448c878e19eff8f0b005b6d777458e9928a39b42ef3c4b289edc2383839f2acebb49e2aede5843753311dccd3b73b8dd50afebb2556a3f764ef2e0c +SHA512 (cri-o-a783f23.tar.gz) = c1700b040b4c887b6addc61790d59f2f6773e16a7733ef7d686bcc12f2e6fb132c87ad61f4301609c9b5abc269ad705264f4a6325bb18c13c99158725607848b From 33abd92aa0aeb8a9920a4b7d348c7e7e640ae7b7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 5 Nov 2019 10:55:02 -0500 Subject: [PATCH 36/93] cri-o-2:1.16.0-0.3.rc2 - Requires: socat Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 608edb7..3df26fd 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ Name: %{repo} Epoch: 2 Version: 1.16.0 -Release: 0.2.rc2%{?dist} +Release: 0.3.rc2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -61,6 +61,7 @@ Provides: ocid = %{version}-%{release} Provides: %{service_name} = %{version}-%{release} Requires: containernetworking-plugins >= 0.7.5-1 Requires: conmon >= 2.0.2-1 +Requires: socat %description %{summary} @@ -184,6 +185,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Tue Nov 05 2019 Lokesh Mandvekar - 2:1.16.0-0.3.rc2 +- Requires: socat + * Mon Nov 04 2019 RH Container Bot - 2:1.16.0-0.2.rc2 - bump to v1.16.0-rc2 - autobuilt a783f23 From a2d1a6afc518fef0cb4bab7eaedec8b9fe5b09f6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 15 Nov 2019 14:55:03 -0500 Subject: [PATCH 37/93] underscore char invalid in crio binary Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cri-o.spec b/cri-o.spec index 3df26fd..9dfc620 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -73,6 +73,7 @@ sed -i 's/install.config: crio.conf/install.config:/' Makefile sed -i 's/install.bin: binaries/install.bin:/' Makefile sed -i 's/\.gopathok //' Makefile sed -i 's/%{version}/%{version}-%{release}/' internal/version/version.go +sed -i 's/module_/module-/' internal/version/version.go sed -i 's/\/local//' contrib/systemd/%{service_name}.service sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service From 537aea4c4be2159a31e7d8f9c50e6bb14a019e38 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 15 Nov 2019 15:35:23 -0500 Subject: [PATCH 38/93] cri-o-2:1.16.0-0.4.rc2 - Resolves: #1740730, #1743017, #1754170 - no underscore in crio --version Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 9dfc620..5290f7e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ Name: %{repo} Epoch: 2 Version: 1.16.0 -Release: 0.3.rc2%{?dist} +Release: 0.4.rc2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -186,6 +186,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Fri Nov 15 2019 Lokesh Mandvekar - 2:1.16.0-0.4.rc2 +- Resolves: #1740730, #1743017, #1754170 - no underscore in crio --version + * Tue Nov 05 2019 Lokesh Mandvekar - 2:1.16.0-0.3.rc2 - Requires: socat From b8a1bcf2fbfb695c6ecd70b69432c7b916e6d36e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 4 Dec 2019 09:45:10 -0500 Subject: [PATCH 39/93] cri-o-2:1.16.1-1 - Resolves: #1740730, #1743017, #1754170 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7b0a2af..f446be1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /cri-o-b731670.tar.gz /cri-o-6a4b481.tar.gz /cri-o-a783f23.tar.gz +/cri-o-bf8fcf3.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 5290f7e..7b0adbe 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -18,7 +18,7 @@ %global repo cri-o # https://github.com/cri-o/cri-o %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 a783f2374ebcdc4c487c7dd6ca4329b72f2749cf +%global commit0 bf8fcf34c942ba973a4f694094b46f914c779c0a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -26,12 +26,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.16.0-rc2 +%global built_tag v1.16.1 Name: %{repo} Epoch: 2 -Version: 1.16.0 -Release: 0.4.rc2%{?dist} +Version: 1.16.1 +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -72,7 +72,6 @@ sed -i '/strip/d' pause/Makefile sed -i 's/install.config: crio.conf/install.config:/' Makefile sed -i 's/install.bin: binaries/install.bin:/' Makefile sed -i 's/\.gopathok //' Makefile -sed -i 's/%{version}/%{version}-%{release}/' internal/version/version.go sed -i 's/module_/module-/' internal/version/version.go sed -i 's/\/local//' contrib/systemd/%{service_name}.service sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service @@ -186,6 +185,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Wed Dec 04 2019 Lokesh Mandvekar - 2:1.16.1-1 +- Resolves: #1740730, #1743017, #1754170 + * Fri Nov 15 2019 Lokesh Mandvekar - 2:1.16.0-0.4.rc2 - Resolves: #1740730, #1743017, #1754170 - no underscore in crio --version diff --git a/sources b/sources index 780a1c9..cd97ce3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-a783f23.tar.gz) = c1700b040b4c887b6addc61790d59f2f6773e16a7733ef7d686bcc12f2e6fb132c87ad61f4301609c9b5abc269ad705264f4a6325bb18c13c99158725607848b +SHA512 (cri-o-bf8fcf3.tar.gz) = e8872d7f36f5ee57c7bfc9f95c7d21fcc15bb5989f0b9d31d13fa869049c815a83f28d2607f88ea374cb4c94daafd5160f0bb3b824ff3b4dcbfb2c44ff8c0999 From f464b7c6a1a8a6af156b4da3b8fc74e6e4119fbf Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Wed, 8 Jan 2020 16:25:23 +0000 Subject: [PATCH 40/93] cri-o-2:1.16.2-1 Signed-off-by: RH Container Bot --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f446be1..8805bee 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cri-o-6a4b481.tar.gz /cri-o-a783f23.tar.gz /cri-o-bf8fcf3.tar.gz +/cri-o-cd4b6ae.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 7b0adbe..c074aca 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -18,7 +18,7 @@ %global repo cri-o # https://github.com/cri-o/cri-o %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 bf8fcf34c942ba973a4f694094b46f914c779c0a +%global commit0 cd4b6ae84b438ad8ef622e1e5407bbd2bf78b29c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -26,11 +26,11 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.16.1 +%global built_tag v1.16.2 Name: %{repo} Epoch: 2 -Version: 1.16.1 +Version: 1.16.2 Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers @@ -185,6 +185,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Wed Jan 08 2020 RH Container Bot - 2:1.16.2-1 +- autobuilt $LATEST_TAG + * Wed Dec 04 2019 Lokesh Mandvekar - 2:1.16.1-1 - Resolves: #1740730, #1743017, #1754170 diff --git a/sources b/sources index cd97ce3..dfc0615 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-bf8fcf3.tar.gz) = e8872d7f36f5ee57c7bfc9f95c7d21fcc15bb5989f0b9d31d13fa869049c815a83f28d2607f88ea374cb4c94daafd5160f0bb3b824ff3b4dcbfb2c44ff8c0999 +SHA512 (cri-o-cd4b6ae.tar.gz) = ef298174cf74d61a3c77a390349c40fbe94af136432a659ea90cde3140c84812c43937051d2a66da923839f2ee6c9efc6f139ba7f4a72aba882a8a41ce77685d From 23e4cebac8acda25b8bd4ba7eeb25b20387027fa Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 14 Jan 2020 17:46:47 +0530 Subject: [PATCH 41/93] cri-o-2:1.17.0-0.1.gitb89a5fc - built v1.17.0-rc1 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 8805bee..7b0dbb7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /cri-o-a783f23.tar.gz /cri-o-bf8fcf3.tar.gz /cri-o-cd4b6ae.tar.gz +/cri-o-b89a5fc.tar.gz diff --git a/cri-o.spec b/cri-o.spec index c074aca..fc1bfd8 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -18,7 +18,7 @@ %global repo cri-o # https://github.com/cri-o/cri-o %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 cd4b6ae84b438ad8ef622e1e5407bbd2bf78b29c +%global commit0 b89a5fce474e53785bb0adad4a29e44ef424a2f9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -26,12 +26,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.16.2 +%global built_tag v1.17.0-rc1 Name: %{repo} Epoch: 2 -Version: 1.16.2 -Release: 1%{?dist} +Version: 1.17.0 +Release: 0.1.git%{shortcommit0}%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -68,7 +68,6 @@ Requires: socat %prep %autosetup -Sgit -n %{name}-%{commit0} -sed -i '/strip/d' pause/Makefile sed -i 's/install.config: crio.conf/install.config:/' Makefile sed -i 's/install.bin: binaries/install.bin:/' Makefile sed -i 's/\.gopathok //' Makefile @@ -90,7 +89,7 @@ export GO111MODULE=off %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} %gobuild -o bin/%{service_name}-status %%{import_path}/cmd/%{service_name}-status -%{__make} bin/pause docs +%{__make} bin/pinns docs %install sed -i 's/\/local//' contrib/systemd/%{service_name}.service @@ -105,7 +104,6 @@ sed -i 's/\/local//' contrib/systemd/%{service_name}.service # install binaries install -dp %{buildroot}{%{_bindir},%{_libexecdir}/%{service_name}} install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir} -install -p -m 755 bin/pause %{buildroot}%{_libexecdir}/%{service_name} # install conf files install -dp %{buildroot}%{_sysconfdir}/cni/net.d @@ -159,6 +157,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %doc README.md %{_bindir}/%{service_name} %{_bindir}/%{service_name}-status +%{_bindir}/pinns %{_mandir}/man5/%{service_name}.conf.5* %{_mandir}/man8/%{service_name}*.8* %dir %{_sysconfdir}/%{service_name} @@ -171,7 +170,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf %config(noreplace) %{_sysconfdir}/crictl.yaml %dir %{_libexecdir}/%{service_name} -%{_libexecdir}/%{service_name}/pause %{_unitdir}/%{service_name}.service %{_unitdir}/%{name}.service %{_unitdir}/%{service_name}-shutdown.service @@ -185,6 +183,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Tue Jan 14 2020 Lokesh Mandvekar - 2:1.17.0-0.1.gitb89a5fc +- built v1.17.0-rc1 + * Wed Jan 08 2020 RH Container Bot - 2:1.16.2-1 - autobuilt $LATEST_TAG diff --git a/sources b/sources index dfc0615..d6a63ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-cd4b6ae.tar.gz) = ef298174cf74d61a3c77a390349c40fbe94af136432a659ea90cde3140c84812c43937051d2a66da923839f2ee6c9efc6f139ba7f4a72aba882a8a41ce77685d +SHA512 (cri-o-b89a5fc.tar.gz) = ce67aec5a759ea643d9c2082c5f57009c0c5a4c6f3d65cf36e7b88c07def1ace3f335524c538b2e8559b459a63feea9e4ed00a149a26447f1c950bdd68ef6441 From 73db24e940773b115abf6db2935e3f035388eb29 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 10 Feb 2020 19:29:31 +0000 Subject: [PATCH 42/93] cri-o-2:1.17.0-1 Signed-off-by: RH Container Bot --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7b0dbb7..24b530d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /cri-o-bf8fcf3.tar.gz /cri-o-cd4b6ae.tar.gz /cri-o-b89a5fc.tar.gz +/cri-o-6d0ffae.tar.gz diff --git a/cri-o.spec b/cri-o.spec index fc1bfd8..0af7463 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -18,7 +18,7 @@ %global repo cri-o # https://github.com/cri-o/cri-o %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 b89a5fce474e53785bb0adad4a29e44ef424a2f9 +%global commit0 6d0ffae63b9b7d8f07e7f9cf50736a67fb31faf3 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -26,12 +26,12 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.17.0-rc1 +%global built_tag v1.17.0 Name: %{repo} Epoch: 2 Version: 1.17.0 -Release: 0.1.git%{shortcommit0}%{?dist} +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -183,6 +183,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Mon Feb 10 2020 RH Container Bot - 2:1.17.0-1 +- autobuilt $LATEST_TAG + * Tue Jan 14 2020 Lokesh Mandvekar - 2:1.17.0-0.1.gitb89a5fc - built v1.17.0-rc1 diff --git a/sources b/sources index d6a63ff..d16d0f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-b89a5fc.tar.gz) = ce67aec5a759ea643d9c2082c5f57009c0c5a4c6f3d65cf36e7b88c07def1ace3f335524c538b2e8559b459a63feea9e4ed00a149a26447f1c950bdd68ef6441 +SHA512 (cri-o-6d0ffae.tar.gz) = c6fefe402aa500dd8b2f92cc7cb277b17e1e66f4edec8ad7f98687da09befb1889ca8a9a25244b6dbe2ab86e229423a86b1600b878820eebb5499e7e44a1dd1b From 88d1db036bbe148875bd1e4ddebcb5e091c18bbf Mon Sep 17 00:00:00 2001 From: Aivaras Laimikis Date: Wed, 11 Mar 2020 09:07:19 +0000 Subject: [PATCH 43/93] Remove redundant % symbol in gobuild --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 0af7463..d968d83 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -87,7 +87,7 @@ export GOPATH=$(pwd)/_output:$(pwd) export BUILDTAGS="$(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) $(hack/libdm_no_deferred_remove_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)" export GO111MODULE=off %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} -%gobuild -o bin/%{service_name}-status %%{import_path}/cmd/%{service_name}-status +%gobuild -o bin/%{service_name}-status %{import_path}/cmd/%{service_name}-status %{__make} bin/pinns docs From 76d709e2c5c051379d7499e81488343c98a03134 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Mon, 16 Mar 2020 14:12:32 +0000 Subject: [PATCH 44/93] cri-o-2:1.17.1-1 Signed-off-by: RH Container Bot --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 24b530d..7c47ee6 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /cri-o-cd4b6ae.tar.gz /cri-o-b89a5fc.tar.gz /cri-o-6d0ffae.tar.gz +/cri-o-ee2de87.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d968d83..a98ce9c 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -18,7 +18,7 @@ %global repo cri-o # https://github.com/cri-o/cri-o %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 6d0ffae63b9b7d8f07e7f9cf50736a67fb31faf3 +%global commit0 ee2de87bd8e2a7a84799476cb4fc4ce8a78fdf6d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -26,11 +26,11 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.17.0 +%global built_tag v1.17.1 Name: %{repo} Epoch: 2 -Version: 1.17.0 +Version: 1.17.1 Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers @@ -183,6 +183,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Mon Mar 16 2020 RH Container Bot - 2:1.17.1-1 +- autobuilt v1.17.1 + * Mon Feb 10 2020 RH Container Bot - 2:1.17.0-1 - autobuilt $LATEST_TAG diff --git a/sources b/sources index d16d0f8..6c4e91a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-6d0ffae.tar.gz) = c6fefe402aa500dd8b2f92cc7cb277b17e1e66f4edec8ad7f98687da09befb1889ca8a9a25244b6dbe2ab86e229423a86b1600b878820eebb5499e7e44a1dd1b +SHA512 (cri-o-ee2de87.tar.gz) = a362427ebc7f4a676722a4d16ffaf51273ad9ea93425d6ffd399b9b1837d8f872c1ec81fea49fb6dad148a7b7fff039f9064d1ff9dcb363667e7f4c5e750b9eb From 6ac26d66170bf1e7f568984db7571227d6b5658d Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 20 Mar 2020 14:47:29 -0400 Subject: [PATCH 45/93] cri-o-2:1.17.1-2 - Resolves: #1795858 - list /usr/share/containers/oci/hooks.d - enable debuginfo - spec changes for autobuilder Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 20 +++++++++++++++----- sources | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7c47ee6..2f96e24 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /cri-o-b89a5fc.tar.gz /cri-o-6d0ffae.tar.gz /cri-o-ee2de87.tar.gz +/v1.17.1.tar.gz diff --git a/cri-o.spec b/cri-o.spec index a98ce9c..82cfed5 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,4 +1,4 @@ -%global with_debug 0 +%global with_debug 1 %global with_check 0 %if 0%{?with_debug} @@ -26,17 +26,19 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%global built_tag v1.17.1 +%define built_tag v1.17.1 +%define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define download_url %{git0}/archive/%{built_tag}.tar.gz Name: %{repo} Epoch: 2 Version: 1.17.1 -Release: 1%{?dist} +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: %{git0} -Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Source0: %{download_url} Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig Source5: %{service_name}-metrics.sysconfig @@ -67,7 +69,7 @@ Requires: socat %{summary} %prep -%autosetup -Sgit -n %{name}-%{commit0} +%autosetup -Sgit -n %{name}-%{built_tag_strip} sed -i 's/install.config: crio.conf/install.config:/' Makefile sed -i 's/install.bin: binaries/install.bin:/' Makefile sed -i 's/\.gopathok //' Makefile @@ -175,6 +177,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_unitdir}/%{service_name}-shutdown.service %{_unitdir}/%{service_name}-wipe.service %dir %{_sharedstatedir}/containers +%dir %{_datadir}/containers +%dir %{_datadir}/containers/oci +%dir %{_datadir}/containers/oci/hooks.d %dir %{_datadir}/oci-umount %dir %{_datadir}/oci-umount/oci-umount.d %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf @@ -183,6 +188,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Fri Mar 20 2020 Lokesh Mandvekar - 2:1.17.1-2 +- Resolves: #1795858 - list /usr/share/containers/oci/hooks.d +- enable debuginfo +- spec changes for autobuilder + * Mon Mar 16 2020 RH Container Bot - 2:1.17.1-1 - autobuilt v1.17.1 diff --git a/sources b/sources index 6c4e91a..ad1035c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-ee2de87.tar.gz) = a362427ebc7f4a676722a4d16ffaf51273ad9ea93425d6ffd399b9b1837d8f872c1ec81fea49fb6dad148a7b7fff039f9064d1ff9dcb363667e7f4c5e750b9eb +SHA512 (v1.17.1.tar.gz) = 1548c4b20081e8f1af772b0b0fadd0f1b63af641283bef8b8cd8478bd626699c23b30b39fe460660776bc7e6509e85db73d1d7e0d030dd7bd3dbfe319c82e332 From e81712fa98b9cf8cb612b0820ab2f5e51d3bf793 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 27 Mar 2020 13:53:50 -0400 Subject: [PATCH 46/93] btrfs and devmapper only for fedora Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cri-o.spec b/cri-o.spec index 82cfed5..33a86f7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -44,8 +44,10 @@ Source4: %{service_name}-storage.sysconfig Source5: %{service_name}-metrics.sysconfig # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +%if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: device-mapper-devel +%endif BuildRequires: git BuildRequires: glib2-devel BuildRequires: glibc-static From 85b574f2007cdedf1fd0d0a1785c5fff85910264 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 27 Mar 2020 14:59:04 -0400 Subject: [PATCH 47/93] adjust container-selinux dep for fedora v/s centos Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 33a86f7..0fcba59 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -57,7 +57,11 @@ BuildRequires: libassuan-devel BuildRequires: libseccomp-devel BuildRequires: pkgconfig(systemd) BuildRequires: make -Requires(pre): container-selinux +%if 0%{?fedora} +Requires(pre): (container-selinux if selinux-policy) +%else +Requires: container-selinux +%endif Requires: containers-common >= 1:0.1.31-14 Requires: runc >= 1.0.0-16 Obsoletes: ocid <= 0.3 From c9240ac3e2d3521c6869003bdfaa8395600b3665 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 27 Mar 2020 15:20:12 -0400 Subject: [PATCH 48/93] use BR: golang instead of go-compiler blahblah Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 0fcba59..c1767a8 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -43,7 +43,7 @@ Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig Source5: %{service_name}-metrics.sysconfig # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +BuildRequires: golang %if 0%{?fedora} BuildRequires: btrfs-progs-devel BuildRequires: device-mapper-devel From 6c199bc1bd49fd64fbf990c19f8a206fa133c202 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 28 Mar 2020 07:36:58 -0400 Subject: [PATCH 49/93] disable debug for centos aarch64 Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cri-o.spec b/cri-o.spec index c1767a8..296c6ee 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,4 +1,8 @@ +%ifnarch aarch64 && 0%{?centos} +%global with_debug 0 +%else %global with_debug 1 +%endif %global with_check 0 %if 0%{?with_debug} From cc633e797ccf7afacc78420d84196c3c51ac5aa0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 31 Mar 2020 08:03:29 -0400 Subject: [PATCH 50/93] correct conditional for aarch64 Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 296c6ee..2862b3b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,4 +1,4 @@ -%ifnarch aarch64 && 0%{?centos} +%ifarch aarch64 && 0%{?centos} %global with_debug 0 %else %global with_debug 1 From b429ba00b2a187a24d829cca9458bb4cb25b5b13 Mon Sep 17 00:00:00 2001 From: RH Container Bot Date: Tue, 31 Mar 2020 12:27:36 +0000 Subject: [PATCH 51/93] cri-o-2:1.17.2-1 Signed-off-by: RH Container Bot --- cri-o.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 2862b3b..a4e6c97 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -22,7 +22,7 @@ %global repo cri-o # https://github.com/cri-o/cri-o %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 ee2de87bd8e2a7a84799476cb4fc4ce8a78fdf6d +%global commit0 705ae1b743513fdaf47d18f190c670b634589f28 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -36,8 +36,8 @@ Name: %{repo} Epoch: 2 -Version: 1.17.1 -Release: 2%{?dist} +Version: 1.17.2 +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -198,6 +198,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Tue Mar 31 2020 RH Container Bot - 2:1.17.2-1 +- autobuilt v1.17.2 + * Fri Mar 20 2020 Lokesh Mandvekar - 2:1.17.1-2 - Resolves: #1795858 - list /usr/share/containers/oci/hooks.d - enable debuginfo From 2774eacae4457f0504d978b3528ab8640303f4a1 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 31 Mar 2020 09:25:28 -0400 Subject: [PATCH 52/93] cri-o-2:1.17.2-2 - use correct tag Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2f96e24..48b2e8a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /cri-o-6d0ffae.tar.gz /cri-o-ee2de87.tar.gz /v1.17.1.tar.gz +/v1.17.2.tar.gz diff --git a/cri-o.spec b/cri-o.spec index a4e6c97..50a2cdf 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,14 +30,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.17.1 +%define built_tag v1.17.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define download_url %{git0}/archive/%{built_tag}.tar.gz Name: %{repo} Epoch: 2 Version: 1.17.2 -Release: 1%{?dist} +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -198,6 +198,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Tue Mar 31 2020 Lokesh Mandvekar - 2:1.17.2-2 +- use correct tag + * Tue Mar 31 2020 RH Container Bot - 2:1.17.2-1 - autobuilt v1.17.2 diff --git a/sources b/sources index ad1035c..15b70b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.17.1.tar.gz) = 1548c4b20081e8f1af772b0b0fadd0f1b63af641283bef8b8cd8478bd626699c23b30b39fe460660776bc7e6509e85db73d1d7e0d030dd7bd3dbfe319c82e332 +SHA512 (v1.17.2.tar.gz) = 166be594206e27033a9d3248dbf15ca09811eb18d07e70c5965a680a4812eb82d447702c6d1d200247b3856a5a61ca57b0f5265000a58d00980fc47de38c86db From 3416e04673d3b41be7e6b876092ae9849713d534 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 31 Mar 2020 14:19:59 -0400 Subject: [PATCH 53/93] no debuginfo for centos Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 50a2cdf..1d70914 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,4 +1,4 @@ -%ifarch aarch64 && 0%{?centos} +%if 0%{?centos} %global with_debug 0 %else %global with_debug 1 @@ -82,6 +82,7 @@ Requires: socat %autosetup -Sgit -n %{name}-%{built_tag_strip} sed -i 's/install.config: crio.conf/install.config:/' Makefile sed -i 's/install.bin: binaries/install.bin:/' Makefile +sed -i 's/install.man: $(MANPAGES)/install.man:/' Makefile sed -i 's/\.gopathok //' Makefile sed -i 's/module_/module-/' internal/version/version.go sed -i 's/\/local//' contrib/systemd/%{service_name}.service @@ -101,7 +102,7 @@ export GO111MODULE=off %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} %gobuild -o bin/%{service_name}-status %{import_path}/cmd/%{service_name}-status -%{__make} bin/pinns docs +GO_MD2MAN=go-md2man %{__make} bin/pinns docs %install sed -i 's/\/local//' contrib/systemd/%{service_name}.service From b1032402a069b425ac8b7aba931f5048c39d1dab Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 1 Apr 2020 15:54:28 -0400 Subject: [PATCH 54/93] change package name format for centos Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 1d70914..ae7d829 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -32,9 +32,14 @@ # to decide whether to autobuild (non-rawhide only) %define built_tag v1.17.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz +%if 0%{?fedora} Name: %{repo} +%else +Name: %{repo}-%{crio_release_tag} +%endif Epoch: 2 Version: 1.17.2 Release: 2%{?dist} @@ -79,7 +84,7 @@ Requires: socat %{summary} %prep -%autosetup -Sgit -n %{name}-%{built_tag_strip} +%autosetup -Sgit -n %{repo}-%{built_tag_strip} sed -i 's/install.config: crio.conf/install.config:/' Makefile sed -i 's/install.bin: binaries/install.bin:/' Makefile sed -i 's/install.man: $(MANPAGES)/install.man:/' Makefile @@ -184,7 +189,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %config(noreplace) %{_sysconfdir}/crictl.yaml %dir %{_libexecdir}/%{service_name} %{_unitdir}/%{service_name}.service -%{_unitdir}/%{name}.service +%{_unitdir}/%{repo}.service %{_unitdir}/%{service_name}-shutdown.service %{_unitdir}/%{service_name}-wipe.service %dir %{_sharedstatedir}/containers From e10013455c2d1272ca6637b34c31b1b8f1b5d2db Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 9 Apr 2020 11:10:57 -0400 Subject: [PATCH 55/93] cri-o OBS update problems Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cri-o.spec b/cri-o.spec index ae7d829..9ff653a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -79,6 +79,12 @@ Provides: %{service_name} = %{version}-%{release} Requires: containernetworking-plugins >= 0.7.5-1 Requires: conmon >= 2.0.2-1 Requires: socat +%if 0%{?centos} +Provides: cri-o = %{version}-%{release} +Obsoletes: cri-o-1.14 +Obsoletes: cri-o-1.15 +Obsoletes: cri-o-1.16 +%endif %description %{summary} From a5ed0e34cffa6b4bb57f319aee3e9886359d6501 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 9 Apr 2020 13:55:53 -0400 Subject: [PATCH 56/93] Remove Obsoletes: older versions Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 9ff653a..e63b419 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -81,9 +81,6 @@ Requires: conmon >= 2.0.2-1 Requires: socat %if 0%{?centos} Provides: cri-o = %{version}-%{release} -Obsoletes: cri-o-1.14 -Obsoletes: cri-o-1.15 -Obsoletes: cri-o-1.16 %endif %description From 5fd069db302478fe91ef9e2dc560ba67e5d32db0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 10 Apr 2020 14:56:14 -0400 Subject: [PATCH 57/93] package name cri-o for centos Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index e63b419..a9dd74d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -36,11 +36,9 @@ %define download_url %{git0}/archive/%{built_tag}.tar.gz %if 0%{?fedora} -Name: %{repo} -%else -Name: %{repo}-%{crio_release_tag} -%endif Epoch: 2 +%endif +Name: %{repo} Version: 1.17.2 Release: 2%{?dist} ExcludeArch: ppc64 @@ -80,7 +78,7 @@ Requires: containernetworking-plugins >= 0.7.5-1 Requires: conmon >= 2.0.2-1 Requires: socat %if 0%{?centos} -Provides: cri-o = %{version}-%{release} +Obsoletes: cri-o < %{version}-%{release} %endif %description From 84a54436cfd27f2e5fb117abff4c5315c8ed0cca Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 10 Apr 2020 15:02:04 -0400 Subject: [PATCH 58/93] obsoletes understood, epoch:2 for everyone Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index a9dd74d..d60e858 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -35,9 +35,7 @@ %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz -%if 0%{?fedora} Epoch: 2 -%endif Name: %{repo} Version: 1.17.2 Release: 2%{?dist} @@ -72,14 +70,11 @@ Requires: container-selinux Requires: containers-common >= 1:0.1.31-14 Requires: runc >= 1.0.0-16 Obsoletes: ocid <= 0.3 -Provides: ocid = %{version}-%{release} -Provides: %{service_name} = %{version}-%{release} +Provides: ocid = %{epoch}:%{version}-%{release} +Provides: %{service_name} = %{epoch}:%{version}-%{release} Requires: containernetworking-plugins >= 0.7.5-1 Requires: conmon >= 2.0.2-1 Requires: socat -%if 0%{?centos} -Obsoletes: cri-o < %{version}-%{release} -%endif %description %{summary} From f4110fba3a33cb2e04eeb1a9b6a17fc2f773a7b3 Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Wed, 15 Apr 2020 11:53:07 -0400 Subject: [PATCH 59/93] v1.18.0-rc1 build Signed-off-by: Douglas Schilling Landgraf --- .gitignore | 1 + cri-o.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 48b2e8a..0e6e4de 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /cri-o-ee2de87.tar.gz /v1.17.1.tar.gz /v1.17.2.tar.gz +/v1.18.0-rc1.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d60e858..3b808a9 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -22,7 +22,7 @@ %global repo cri-o # https://github.com/cri-o/cri-o %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 705ae1b743513fdaf47d18f190c670b634589f28 +%global commit0 f0aef34b8dc8924175b2d7461004089ec6ea43f8 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -30,15 +30,15 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.17.2 +%define built_tag v1.18.0-rc1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz Epoch: 2 Name: %{repo} -Version: 1.17.2 -Release: 2%{?dist} +Version: 1.18.0 +Release: 0.1.rc1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -112,7 +112,6 @@ sed -i 's/\/local//' contrib/systemd/%{service_name}.service --cgroup-manager "systemd" \ --conmon "%{_libexecdir}/%{service_name}/conmon" \ --cni-plugin-dir "%{_libexecdir}/cni" \ - --default-mounts "%{_datadir}/rhel/secrets:/run/secrets" \ config > %{service_name}.conf # install binaries @@ -172,7 +171,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_bindir}/%{service_name} %{_bindir}/%{service_name}-status %{_bindir}/pinns -%{_mandir}/man5/%{service_name}.conf.5* +%{_mandir}/man5/%{service_name}.conf*5* %{_mandir}/man8/%{service_name}*.8* %dir %{_sysconfdir}/%{service_name} %config(noreplace) %{_sysconfdir}/%{service_name}/%{service_name}.conf @@ -200,6 +199,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Wed Apr 15 2020 Douglas Schilling Landgraf - 2:1.18.0-0.1.rc1 +- Bump for 1.18 release candidate + * Tue Mar 31 2020 Lokesh Mandvekar - 2:1.17.2-2 - use correct tag diff --git a/sources b/sources index 15b70b7..14393a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.17.2.tar.gz) = 166be594206e27033a9d3248dbf15ca09811eb18d07e70c5965a680a4812eb82d447702c6d1d200247b3856a5a61ca57b0f5265000a58d00980fc47de38c86db +SHA512 (v1.18.0-rc1.tar.gz) = 7a87e6c6474923712aff6d51f3056f0c634c772291032fdd9ae5db17abd3c48c0e0a067080c76d0bbadb0b1a2aaaa83defd3b7080beb37285017765585c9dfd2 From bc144a2fa93772b6d7d387469df7599ad46412e9 Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Thu, 23 Apr 2020 17:13:49 -0400 Subject: [PATCH 60/93] spec: fix github.com/cri-o/cri-o/issues/3631 metacopy is not recognized by old kernel versions. Signed-off-by: Douglas Schilling Landgraf --- cri-o.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cri-o.spec b/cri-o.spec index 3b808a9..da25b6e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -154,6 +154,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %endif %post +# Old verions of kernel do not reconigze metacopy option. +# Reference: github.com/cri-o/cri-o/issues/3631 +%if 0%{?centos} <= 7 +sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf +%endif %systemd_post %{service_name} %preun From 3d9709cf8895c028cb8c36855dcdef5407232aff Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Thu, 23 Apr 2020 20:39:36 -0400 Subject: [PATCH 61/93] spec: bump v1.18.0 --- cri-o.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index da25b6e..62d5156 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -22,7 +22,7 @@ %global repo cri-o # https://github.com/cri-o/cri-o %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit0 f0aef34b8dc8924175b2d7461004089ec6ea43f8 +%global commit0 7d79f42b28ad00cf2e7d86604a5a4007303ac328 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -30,7 +30,7 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.18.0-rc1 +%define built_tag v1.18.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz @@ -38,7 +38,7 @@ Epoch: 2 Name: %{repo} Version: 1.18.0 -Release: 0.1.rc1%{?dist} +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -204,6 +204,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Thu Apr 23 2020 Douglas Schilling Landgraf - 2:1.18.0-1 +- Bump for 1.18.0 release + * Wed Apr 15 2020 Douglas Schilling Landgraf - 2:1.18.0-0.1.rc1 - Bump for 1.18 release candidate From 54456ac5c696bf06778a308dc53f44124ab3bb95 Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Thu, 23 Apr 2020 20:46:00 -0400 Subject: [PATCH 62/93] source: v.1.18.0.tar.gz --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0e6e4de..6b2001e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /v1.17.1.tar.gz /v1.17.2.tar.gz /v1.18.0-rc1.tar.gz +/v1.18.0.tar.gz diff --git a/sources b/sources index 14393a1..ed81f62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.18.0-rc1.tar.gz) = 7a87e6c6474923712aff6d51f3056f0c634c772291032fdd9ae5db17abd3c48c0e0a067080c76d0bbadb0b1a2aaaa83defd3b7080beb37285017765585c9dfd2 +SHA512 (v1.18.0.tar.gz) = 0b023f570c64a2b7cde0dd672b154a533f68a9c64f50800b36b50f7b7bd9241b285498a52dfee5909a66dfb778f97ec83a48c616256c18f7385cc09cd56e9954 From 6ee7c76731cbb141d9929ac0a0952dd85b7f8bb2 Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Wed, 29 Apr 2020 10:25:22 -0400 Subject: [PATCH 63/93] build: include version data during the build Resolves: github.com/cri-o/cri-o/issues/3684 --- cri-o.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cri-o.spec b/cri-o.spec index 62d5156..eb3372e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -16,16 +16,26 @@ %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; %endif +# Global vars %global provider github %global provider_tld com %global project cri-o %global repo cri-o + +# Related: github.com/cri-o/cri-o/issues/3684 +%global build_timestamp %(date -u +'%Y-%m-%dT%H:%M:%SZ') +%global git_tree_state clean +%global criocli_path "" + # https://github.com/cri-o/cri-o %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} + +# Commit for the builds %global commit0 7d79f42b28ad00cf2e7d86604a5a4007303ac328 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} +# Services %global service_name crio # Used for comparing with latest upstream tag @@ -100,6 +110,15 @@ ln -s vendor src export GOPATH=$(pwd)/_output:$(pwd) export BUILDTAGS="$(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) $(hack/libdm_no_deferred_remove_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)" export GO111MODULE=off + +# FIX-ME we are doing a mimic of Makefile. +# Related: github.com/cri-o/cri-o/issues/3684 +export LDFLAGS="-X %{import_path}/internal/pkg/criocli.DefaultsPath=%{criocli_path} +-X %{import_path}/internal/version.buildDate=%{build_timestamp} +-X %{import_path}/internal/version.gitCommit=%{commit0} +-X %{import_path}/internal/version.version=%{version} +-X %{import_path}/internal/version.gitTreeState=%{git_tree_state}" + %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} %gobuild -o bin/%{service_name}-status %{import_path}/cmd/%{service_name}-status From 06ba6e6eacb9f9be98490168de0516bd0326d7a0 Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Wed, 29 Apr 2020 10:38:31 -0400 Subject: [PATCH 64/93] bump release 1.18.0-2 --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index eb3372e..3ff3c44 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 2 Name: %{repo} Version: 1.18.0 -Release: 1%{?dist} +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -223,6 +223,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Thu Apr 23 2020 Douglas Schilling Landgraf - 2:1.18.0-2 +- Fix crio version - github.com/cri-o/cri-o/issues/3684 + * Thu Apr 23 2020 Douglas Schilling Landgraf - 2:1.18.0-1 - Bump for 1.18.0 release From da8d728b437af5bb4b78dbaca0d141d041abf317 Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Sat, 16 May 2020 10:55:14 -0400 Subject: [PATCH 65/93] v1.18.1 --- .gitignore | 1 + cri-o.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6b2001e..c0754d3 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /v1.17.2.tar.gz /v1.18.0-rc1.tar.gz /v1.18.0.tar.gz +/v1.18.1.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 3ff3c44..d67bbdf 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 7d79f42b28ad00cf2e7d86604a5a4007303ac328 +%global commit0 5cbf694c34f8d1af19eb873e39057663a4830635 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -40,15 +40,15 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.18.0 +%define built_tag v1.18.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz Epoch: 2 Name: %{repo} -Version: 1.18.0 -Release: 2%{?dist} +Version: 1.18.1 +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -223,6 +223,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Thu May 16 2020 Douglas Schilling Landgraf - 2:1.18.1-1 +- Release 1.18.1 + * Thu Apr 23 2020 Douglas Schilling Landgraf - 2:1.18.0-2 - Fix crio version - github.com/cri-o/cri-o/issues/3684 diff --git a/sources b/sources index ed81f62..b0b5e9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.18.0.tar.gz) = 0b023f570c64a2b7cde0dd672b154a533f68a9c64f50800b36b50f7b7bd9241b285498a52dfee5909a66dfb778f97ec83a48c616256c18f7385cc09cd56e9954 +SHA512 (v1.18.1.tar.gz) = 25cbd1b28683833ea86a26f996090d84fce9a03f1b19d81a1a0671128bebf33d3ad3fa3b70e79dc483b223660f61900633d1fdebd93f53b4a126c8bc75ac68ca From 30ddefa8310a58724b9715c6b7d96ef87b6ca8fe Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Fri, 5 Jun 2020 20:07:36 -0400 Subject: [PATCH 66/93] spec: add new dir for --cni-plugin-dir /opt/cni/bin --- cri-o.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index d67bbdf..fc57f45 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 2 Name: %{repo} Version: 1.18.1 -Release: 1%{?dist} +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -130,6 +130,7 @@ sed -i 's/\/local//' contrib/systemd/%{service_name}.service --selinux \ --cgroup-manager "systemd" \ --conmon "%{_libexecdir}/%{service_name}/conmon" \ + --cni-plugin-dir /opt/cni/bin \ --cni-plugin-dir "%{_libexecdir}/cni" \ config > %{service_name}.conf @@ -223,6 +224,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Fri Jun 05 2020 Douglas Schilling Landgraf - 2:1.18.1-2 +- Add --cni-plugin-dir /opt/cni/bin to cri-o conf file + * Thu May 16 2020 Douglas Schilling Landgraf - 2:1.18.1-1 - Release 1.18.1 From daa68da0da612de1b6c33f4a4227bc4702dc77d4 Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Tue, 23 Jun 2020 11:31:19 -0400 Subject: [PATCH 67/93] new spec changes for 1.18.2 --- cri-o.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index fc57f45..927df17 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 5cbf694c34f8d1af19eb873e39057663a4830635 +%global commit0 7f261aeebffed079b4475dde8b9d602b01973d33 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -40,15 +40,15 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.18.1 +%define built_tag v1.18.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz Epoch: 2 Name: %{repo} -Version: 1.18.1 -Release: 2%{?dist} +Version: 1.18.2 +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -224,6 +224,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Tue Jun 23 2020 Douglas Schilling Landgraf - 2:1.18.2-1 +- Build 1.18.2 + * Fri Jun 05 2020 Douglas Schilling Landgraf - 2:1.18.1-2 - Add --cni-plugin-dir /opt/cni/bin to cri-o conf file From 85d5d872880ab97e366bed39e28872b876f483fd Mon Sep 17 00:00:00 2001 From: Douglas Schilling Landgraf Date: Mon, 29 Jun 2020 13:38:21 -0400 Subject: [PATCH 68/93] 1.18.2 Signed-off-by: Douglas Schilling Landgraf --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c0754d3..7757895 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /v1.18.0-rc1.tar.gz /v1.18.0.tar.gz /v1.18.1.tar.gz +/v1.18.2.tar.gz diff --git a/sources b/sources index b0b5e9a..c927032 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.18.1.tar.gz) = 25cbd1b28683833ea86a26f996090d84fce9a03f1b19d81a1a0671128bebf33d3ad3fa3b70e79dc483b223660f61900633d1fdebd93f53b4a126c8bc75ac68ca +SHA512 (v1.18.2.tar.gz) = f582d2efba331ee752dfaf660d57d97b5fb3095da89f315f3c32e859fa1ae52261d083a2d1fbd986a2647f3e6427216d16a10872b2ad110c85c0b94d3e593a92 From 38c00abc4b03596eb2e9cbb6bece0a7da9f4a850 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 28 Jul 2020 22:02:57 -0400 Subject: [PATCH 69/93] remove custom conmon path Signed-off-by: Peter Hunt --- cri-o.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 927df17..f3e05ef 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 2 Name: %{repo} Version: 1.18.2 -Release: 1%{?dist} +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -129,7 +129,6 @@ sed -i 's/\/local//' contrib/systemd/%{service_name}.service ./bin/%{service_name} \ --selinux \ --cgroup-manager "systemd" \ - --conmon "%{_libexecdir}/%{service_name}/conmon" \ --cni-plugin-dir /opt/cni/bin \ --cni-plugin-dir "%{_libexecdir}/cni" \ config > %{service_name}.conf @@ -224,6 +223,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Wed Jul 29 2020 Peter Hunt - 2:1.18.2-2 +- remove custom conmon path + * Tue Jun 23 2020 Douglas Schilling Landgraf - 2:1.18.2-1 - Build 1.18.2 From cbdc64b934e9c41b6db4f59504cec4360b97c735 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 28 Jul 2020 22:22:03 -0400 Subject: [PATCH 70/93] Bump to v1.8.3 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7757895..7fcc400 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /v1.18.0.tar.gz /v1.18.1.tar.gz /v1.18.2.tar.gz +/v1.18.3.tar.gz diff --git a/cri-o.spec b/cri-o.spec index f3e05ef..84d914d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 7f261aeebffed079b4475dde8b9d602b01973d33 +%global commit0 61de18161fb4ccda720768c001713592b5a04e46 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -40,15 +40,15 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.18.2 +%define built_tag v1.18.3 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz Epoch: 2 Name: %{repo} -Version: 1.18.2 -Release: 2%{?dist} +Version: 1.18.3 +Release: 0%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -223,6 +223,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Wed Jul 29 2020 Peter Hunt - 2:1.18.3-0 +- Bump to v1.18.3 + * Wed Jul 29 2020 Peter Hunt - 2:1.18.2-2 - remove custom conmon path diff --git a/sources b/sources index c927032..8b2eb55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.18.2.tar.gz) = f582d2efba331ee752dfaf660d57d97b5fb3095da89f315f3c32e859fa1ae52261d083a2d1fbd986a2647f3e6427216d16a10872b2ad110c85c0b94d3e593a92 +SHA512 (v1.18.3.tar.gz) = 28798d0a46a9fe361fa2e57f350375abe2a66b955447d667a0a51b39034d73f98abf06371ccf5ea27dfcad38dc46907a2fe9583b94c9a0092ad18b2485b12640 From 9940981c18f0e1e989f09a032bbb4a95f8a608ea Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Mon, 3 Aug 2020 21:00:57 -0400 Subject: [PATCH 71/93] Github 3923: Make runc installation recommended Signed-off-by: Peter Hunt --- cri-o.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 84d914d..439d003 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 2 Name: %{repo} Version: 1.18.3 -Release: 0%{?dist} +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -78,7 +78,7 @@ Requires(pre): (container-selinux if selinux-policy) Requires: container-selinux %endif Requires: containers-common >= 1:0.1.31-14 -Requires: runc >= 1.0.0-16 +Recommends: runc >= 1.0.0-16 Obsoletes: ocid <= 0.3 Provides: ocid = %{epoch}:%{version}-%{release} Provides: %{service_name} = %{epoch}:%{version}-%{release} @@ -223,6 +223,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Tue Aug 04 2020 Peter Hunt - 2:1.18.3-1 +- Github 3923: Make runc installation recommended + * Wed Jul 29 2020 Peter Hunt - 2:1.18.3-0 - Bump to v1.18.3 From 2934c3a2a6751c28b1faaff5071ba3808c3403bc Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Mon, 14 Sep 2020 17:15:56 -0400 Subject: [PATCH 72/93] bump to v1.19.0 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7fcc400..f0f1fbf 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /v1.18.1.tar.gz /v1.18.2.tar.gz /v1.18.3.tar.gz +/v1.19.0.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 439d003..300fed8 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 61de18161fb4ccda720768c001713592b5a04e46 +%global commit0 99c925bebdd9e392f2d575e25f2e6a1082e6c232 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -40,15 +40,15 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.18.3 +%define built_tag v1.19.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz Epoch: 2 Name: %{repo} -Version: 1.18.3 -Release: 1%{?dist} +Version: 1.19.0 +Release: 0%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -223,6 +223,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Mon Sep 14 2020 Peter Hunt - 2:1.19.0-0 +- bump to 1.19.0 + * Tue Aug 04 2020 Peter Hunt - 2:1.18.3-1 - Github 3923: Make runc installation recommended diff --git a/sources b/sources index 8b2eb55..df3a686 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.18.3.tar.gz) = 28798d0a46a9fe361fa2e57f350375abe2a66b955447d667a0a51b39034d73f98abf06371ccf5ea27dfcad38dc46907a2fe9583b94c9a0092ad18b2485b12640 +SHA512 (v1.19.0.tar.gz) = 15b506d755be735d7b71e503b02b309693e3090be41f5790bd34cec460238eab56829239caf18849f3656cf8c12f77a10bbb3ae4ad81eb4e18858946e454583d From 82578d3792775b0ff723de8d1989a1f603c3295a Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 17 Sep 2020 16:49:20 -0400 Subject: [PATCH 73/93] fix rpm for centos 7 Signed-off-by: Peter Hunt --- cri-o.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cri-o.spec b/cri-o.spec index 300fed8..a100162 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -78,7 +78,11 @@ Requires(pre): (container-selinux if selinux-policy) Requires: container-selinux %endif Requires: containers-common >= 1:0.1.31-14 +%if 0%{?fedora} || 0%{?centos} >= 8 Recommends: runc >= 1.0.0-16 +%else +Requires: runc >= 1.0.0-16 +%endif Obsoletes: ocid <= 0.3 Provides: ocid = %{epoch}:%{version}-%{release} Provides: %{service_name} = %{epoch}:%{version}-%{release} From ac878a9dee5051ff7bd90771be5b83ea0f8aee5f Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Mon, 5 Oct 2020 12:19:15 -0400 Subject: [PATCH 74/93] update go-md2man dependency to handle OBS Signed-off-by: Peter Hunt --- cri-o.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index a100162..f183b10 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 2 Name: %{repo} Version: 1.19.0 -Release: 0%{?dist} +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -66,7 +66,11 @@ BuildRequires: device-mapper-devel BuildRequires: git BuildRequires: glib2-devel BuildRequires: glibc-static +%if 0%{?fedora} +BuildRequires: golang-github-cpuguy83-md2man +%else BuildRequires: go-md2man +%endif BuildRequires: gpgme-devel BuildRequires: libassuan-devel BuildRequires: libseccomp-devel @@ -227,6 +231,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Mon Oct 05 2020 Peter Hunt - 2:1.19.0-1 +- update go-md2man dependency to handle OBS + * Mon Sep 14 2020 Peter Hunt - 2:1.19.0-0 - bump to 1.19.0 From 614521f1a8ad408689072aba72802e2b6f0c9931 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Fri, 23 Oct 2020 12:19:14 -0400 Subject: [PATCH 75/93] update spec to handle OBS Signed-off-by: Peter Hunt --- cri-o.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index f183b10..9a618a7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 2 Name: %{repo} Version: 1.19.0 -Release: 1%{?dist} +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -77,7 +77,7 @@ BuildRequires: libseccomp-devel BuildRequires: pkgconfig(systemd) BuildRequires: make %if 0%{?fedora} -Requires(pre): (container-selinux if selinux-policy) +Requires(pre): container-selinux %else Requires: container-selinux %endif @@ -231,6 +231,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Mon Oct 05 2020 Peter Hunt - 2:1.19.0-2 +- update selinux dep to handle OBS + * Mon Oct 05 2020 Peter Hunt - 2:1.19.0-1 - update go-md2man dependency to handle OBS From afa6de57070530f1d6afbdddd24d0e40c941eae3 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Mon, 9 Nov 2020 15:05:00 -0500 Subject: [PATCH 76/93] upsream#3879: fix symbolic link Signed-off-by: Peter Hunt --- cri-o.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 9a618a7..45b97ca 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 2 Name: %{repo} Version: 1.19.0 -Release: 2%{?dist} +Release: 3%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -186,12 +186,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %if 0%{?centos} <= 7 sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif +ln -sf %{_unitdir}/%{service_name}.service {_unitdir}/%{repo}.service %systemd_post %{service_name} %preun %systemd_preun %{service_name} %postun +rm -f %{_unitdir}/%{repo}.service %systemd_postun_with_restart %{service_name} #define license tag if not already defined @@ -231,6 +233,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Mon Nov 9 15:04:39 EST 2020 Peter Hunt - 2:1.19.0-3 +- upstream#3879: fix symbolic link + * Mon Oct 05 2020 Peter Hunt - 2:1.19.0-2 - update selinux dep to handle OBS From 8b14baa9add385416e985e51fd25f78640567edd Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 19 Nov 2020 10:17:08 -0500 Subject: [PATCH 77/93] fix timestamp Signed-off-by: Peter Hunt --- cri-o.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 45b97ca..0294743 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 2 Name: %{repo} Version: 1.19.0 -Release: 3%{?dist} +Release: 4%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -233,7 +233,10 @@ rm -f %{_unitdir}/%{repo}.service %{_datadir}/zsh/site-functions/_%{service_name}* %changelog -* Mon Nov 9 15:04:39 EST 2020 Peter Hunt - 2:1.19.0-3 +* Thu Nov 19 2020 Peter Hunt - 2:1.19.0-4 +- fix timestamp for centos 7 + +* Mon Nov 9 2020 Peter Hunt - 2:1.19.0-3 - upstream#3879: fix symbolic link * Mon Oct 05 2020 Peter Hunt - 2:1.19.0-2 From cb937c198d7409f7570757a0dedcc6e847515571 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Fri, 11 Dec 2020 12:25:47 -0500 Subject: [PATCH 78/93] Bump to v1.20.0 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f0f1fbf..7ea13b1 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /v1.18.2.tar.gz /v1.18.3.tar.gz /v1.19.0.tar.gz +/v1.20.0.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 0294743..12db640 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 99c925bebdd9e392f2d575e25f2e6a1082e6c232 +%global commit0 d388528dbed26b93c5bc1c89623607a1e597aa57 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -40,15 +40,15 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.19.0 +%define built_tag v1.20.0 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz -Epoch: 2 +Epoch: 0 Name: %{repo} -Version: 1.19.0 -Release: 4%{?dist} +Version: 1.20.0 +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -233,6 +233,9 @@ rm -f %{_unitdir}/%{repo}.service %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Fri Dec 11 11:47:30 EST 2020 Peter Hunt - 0:1.20.0-1 +- Bump to v1.20.0 + * Thu Nov 19 2020 Peter Hunt - 2:1.19.0-4 - fix timestamp for centos 7 diff --git a/sources b/sources index df3a686..e05c63b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.19.0.tar.gz) = 15b506d755be735d7b71e503b02b309693e3090be41f5790bd34cec460238eab56829239caf18849f3656cf8c12f77a10bbb3ae4ad81eb4e18858946e454583d +SHA512 (v1.20.0.tar.gz) = 9bc718d0f2e082947f592e3a26f75a8a05116defecff7270f058e47ca0d0ba0a2a581ee155df15d5466e6dff8049bd52abc883577d7b917a0342d2133649d46c From 15992629e3fb916910c8add1c8537951419fe64e Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Wed, 16 Dec 2020 11:35:45 -0500 Subject: [PATCH 79/93] update cri-o time stamp Signed-off-by: Peter Hunt --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 12db640..6fe960a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -233,7 +233,7 @@ rm -f %{_unitdir}/%{repo}.service %{_datadir}/zsh/site-functions/_%{service_name}* %changelog -* Fri Dec 11 11:47:30 EST 2020 Peter Hunt - 0:1.20.0-1 +* Fri Dec 11 2020 Peter Hunt - 0:1.20.0-1 - Bump to v1.20.0 * Thu Nov 19 2020 Peter Hunt - 2:1.19.0-4 From 3aef561fcea69a04e313015cb96b307957bb3942 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Wed, 16 Dec 2020 17:17:52 -0500 Subject: [PATCH 80/93] enable PIE mode for cri-o Signed-off-by: Peter Hunt --- cri-o.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 6fe960a..bdec77d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 0 Name: %{repo} Version: 1.20.0 -Release: 1%{?dist} +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -107,7 +107,18 @@ sed -i 's/module_/module-/' internal/version/version.go sed -i 's/\/local//' contrib/systemd/%{service_name}.service sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service + %build +export CGO_CFLAGS='-O2 -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -ffat-lto-objects -fexceptions -fasynchronous-unwind-tables -fstack-protector-strong -fstack-clash-protection -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64' +%ifarch x86_64 +export CGO_CFLAGS="$CGO_CFLAGS -m64 -mtune=generic" +%if 0%{?fedora} || 0%{?centos} >= 8 +export CGO_CFLAGS="$CGO_CFLAGS -fcf-protection" +%endif +%endif +# These extra flags present in %%{optflags} have been skipped for now as they break the build +#export CGO_CFLAGS="$CGO_CFLAGS -flto=auto -Wp,D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1" + mkdir _output pushd _output mkdir -p src/%{provider}.%{provider_tld}/{%{project},opencontainers} @@ -130,7 +141,8 @@ export LDFLAGS="-X %{import_path}/internal/pkg/criocli.DefaultsPath=%{criocli_pa %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} %gobuild -o bin/%{service_name}-status %{import_path}/cmd/%{service_name}-status -GO_MD2MAN=go-md2man %{__make} bin/pinns docs +GO_MD2MAN=go-md2man %{__make} docs +CFLAGS="-std=c99 -Os -Wall -Werror -Wextra -fpic -pie" %{__make} bin/pinns %install sed -i 's/\/local//' contrib/systemd/%{service_name}.service @@ -233,6 +245,9 @@ rm -f %{_unitdir}/%{repo}.service %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Wed Dec 16 2020 Peter Hunt - 0:1.20.0-2 +- enable PIE mode for cri-o + * Fri Dec 11 2020 Peter Hunt - 0:1.20.0-1 - Bump to v1.20.0 From 5f90bf7d96d6adaa8d55c32dce422c7805c76cdd Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 17 Dec 2020 11:16:29 -0500 Subject: [PATCH 81/93] Fix checksec for pinns Signed-off-by: Peter Hunt --- cri-o.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index bdec77d..7f943fa 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 0 Name: %{repo} Version: 1.20.0 -Release: 2%{?dist} +Release: 3%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -142,7 +142,10 @@ export LDFLAGS="-X %{import_path}/internal/pkg/criocli.DefaultsPath=%{criocli_pa %gobuild -o bin/%{service_name}-status %{import_path}/cmd/%{service_name}-status GO_MD2MAN=go-md2man %{__make} docs -CFLAGS="-std=c99 -Os -Wall -Werror -Wextra -fpic -pie" %{__make} bin/pinns +# work around until https://github.com/cri-o/cri-o/pull/4442 is accepted +# we need to drop -static for Stack Canary, Relro, and PIE +sed -i 's/-static//g' pinns/Makefile +CFLAGS="-std=c99 -Os -Wall -Werror -Wextra -fpie -pie -fstack-protector -D_FORTIFY_SOURCE=3 -Wl,-z,relro,-z,now" %{__make} bin/pinns %install sed -i 's/\/local//' contrib/systemd/%{service_name}.service @@ -245,6 +248,9 @@ rm -f %{_unitdir}/%{repo}.service %{_datadir}/zsh/site-functions/_%{service_name}* %changelog +* Thu Dec 17 2020 Peter Hunt - 0:1.20.0-3 +- Fix checksec for pinns + * Wed Dec 16 2020 Peter Hunt - 0:1.20.0-2 - enable PIE mode for cri-o From d6b8dcd41725934a7e82aaf837a75fb8b0ddd5c9 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 12 Jan 2021 09:52:27 -0500 Subject: [PATCH 82/93] add fs.may_detatch_mounts sysctl for centos/rhel 7 Signed-off-by: Peter Hunt --- cri-o.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 7f943fa..af99a83 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 0 Name: %{repo} Version: 1.20.0 -Release: 3%{?dist} +Release: 4%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -186,6 +186,12 @@ make PREFIX=%{buildroot}%{_usr} DESTDIR=%{buildroot} \ install.man \ install.systemd +%if 0%{?centos} <= 7 || 0%{?rhel} <= 7 +# https://bugzilla.redhat.com/show_bug.cgi?id=1823374#c17 +install -d -p %{buildroot}%{_usr}/lib/sysctl.d +echo "fs.may_detach_mounts=1" > %{buildroot}%{_usr}/lib/sysctl.d/99-cri-o.conf +%endif + install -dp %{buildroot}%{_sharedstatedir}/containers #install -dp %%{buildroot}%%{_libexecdir}/%%{service_name}/%%{service_name}-wipe #install -dp %%{buildroot}%%{_usr}/lib/systemd/system-preset @@ -200,6 +206,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace # Reference: github.com/cri-o/cri-o/issues/3631 %if 0%{?centos} <= 7 sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf +%sysctl_apply 99-cri-o.conf + %endif ln -sf %{_unitdir}/%{service_name}.service {_unitdir}/%{repo}.service %systemd_post %{service_name} @@ -246,8 +254,12 @@ rm -f %{_unitdir}/%{repo}.service %{_datadir}/bash-completion/completions/%{service_name}* %{_datadir}/fish/completions/%{service_name}*.fish %{_datadir}/zsh/site-functions/_%{service_name}* +%{_usr}/lib/sysctl.d/99-cri-o.conf %changelog +* Tue Jan 12 2021 Peter Hunt - 0:1.20.0-4 +- add fs.may_detach_mounts sysctl for centos/rhel 7 + * Thu Dec 17 2020 Peter Hunt - 0:1.20.0-3 - Fix checksec for pinns From eefca2327b2d4bd339a89158925509c88a4ee316 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 12 Jan 2021 10:36:53 -0500 Subject: [PATCH 83/93] some small fixes to sysctl Signed-off-by: Peter Hunt --- cri-o.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index af99a83..8de47e8 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -204,10 +204,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %post # Old verions of kernel do not reconigze metacopy option. # Reference: github.com/cri-o/cri-o/issues/3631 -%if 0%{?centos} <= 7 +%if 0%{?centos} <= 7 || 0%{?rhel} <= 7 sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %sysctl_apply 99-cri-o.conf - %endif ln -sf %{_unitdir}/%{service_name}.service {_unitdir}/%{repo}.service %systemd_post %{service_name} @@ -254,7 +253,9 @@ rm -f %{_unitdir}/%{repo}.service %{_datadir}/bash-completion/completions/%{service_name}* %{_datadir}/fish/completions/%{service_name}*.fish %{_datadir}/zsh/site-functions/_%{service_name}* +%if 0%{?centos} <= 7 || 0%{?rhel} <= 7 %{_usr}/lib/sysctl.d/99-cri-o.conf +%endif %changelog * Tue Jan 12 2021 Peter Hunt - 0:1.20.0-4 From 5d65cec858fa9bec488dd5ad95fe7ab76d726079 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Mon, 15 Feb 2021 10:58:42 -0500 Subject: [PATCH 84/93] Keep metacopy for fedora Signed-off-by: Peter Hunt --- cri-o.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 8de47e8..5740fb4 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -48,7 +48,7 @@ Epoch: 0 Name: %{repo} Version: 1.20.0 -Release: 4%{?dist} +Release: 5%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -204,7 +204,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %post # Old verions of kernel do not reconigze metacopy option. # Reference: github.com/cri-o/cri-o/issues/3631 -%if 0%{?centos} <= 7 || 0%{?rhel} <= 7 +%if ! 0%{?fedora} && (0%{?centos} <= 7 || 0%{?rhel} <= 7) sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %sysctl_apply 99-cri-o.conf %endif @@ -258,6 +258,9 @@ rm -f %{_unitdir}/%{repo}.service %endif %changelog +* Mon Feb 15 2021 Peter Hunt - 0:1.20.0-5 +- Keep metacopy for fedora + * Tue Jan 12 2021 Peter Hunt - 0:1.20.0-4 - add fs.may_detach_mounts sysctl for centos/rhel 7 From a12b425c7129c7b0bf18508f1c9f13081bd889e2 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Fri, 12 Mar 2021 14:54:58 -0500 Subject: [PATCH 85/93] Bump to v1.20.1 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7ea13b1..6110b8e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /v1.18.3.tar.gz /v1.19.0.tar.gz /v1.20.0.tar.gz +/v1.20.1.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 5740fb4..d3d46bf 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 d388528dbed26b93c5bc1c89623607a1e597aa57 +%global commit0 0e6266bc8b26e7f8c1b85df3af7af1dcb50ce813 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -40,15 +40,15 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.20.0 +%define built_tag v1.20.1 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz Epoch: 0 Name: %{repo} -Version: 1.20.0 -Release: 5%{?dist} +Version: 1.20.1 +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -258,6 +258,9 @@ rm -f %{_unitdir}/%{repo}.service %endif %changelog +* Fri Mar 12 2021 Peter Hunt - 0:1.20.1-1 +- Bump to v1.20.1 + * Mon Feb 15 2021 Peter Hunt - 0:1.20.0-5 - Keep metacopy for fedora diff --git a/sources b/sources index e05c63b..4dbef8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.20.0.tar.gz) = 9bc718d0f2e082947f592e3a26f75a8a05116defecff7270f058e47ca0d0ba0a2a581ee155df15d5466e6dff8049bd52abc883577d7b917a0342d2133649d46c +SHA512 (v1.20.1.tar.gz) = f232eddc751ebc0ed5574c4ab39ac432170cedd8f5fc45805938f8d043bdad940f39b4e3a8702d5a372e67f0933a5b08a871eb1ed14a29944b236e842181e16b From 812cd9a04c77ed89f70acb1458565b16a8cb0884 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Mon, 22 Mar 2021 15:39:35 -0400 Subject: [PATCH 86/93] update for centos stream Signed-off-by: Peter Hunt --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index d3d46bf..2540fca 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -12,7 +12,7 @@ %global debug_package %{nil} %endif -%if ! 0%{?gobuild:1} +%if ! 0%{?gobuild:1} || 0%{?centos} %define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; %endif From f54ce04bf2fe7e776bf2a1ce4303c09076ddd5f6 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Wed, 24 Mar 2021 09:57:31 -0400 Subject: [PATCH 87/93] Bump to v1.20.2 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6110b8e..f5c5d76 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /v1.19.0.tar.gz /v1.20.0.tar.gz /v1.20.1.tar.gz +/v1.20.2.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 2540fca..c6fc4ea 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 0e6266bc8b26e7f8c1b85df3af7af1dcb50ce813 +%global commit0 d5a999ad0a35d895ded554e1e18c142075501a98 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -40,14 +40,14 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.20.1 +%define built_tag v1.20.2 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz Epoch: 0 Name: %{repo} -Version: 1.20.1 +Version: 1.20.2 Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers @@ -258,6 +258,9 @@ rm -f %{_unitdir}/%{repo}.service %endif %changelog +* Wed Mar 24 2021 Peter Hunt - 0:1.20.2-1 +- Bump to v1.20.2 + * Fri Mar 12 2021 Peter Hunt - 0:1.20.1-1 - Bump to v1.20.1 diff --git a/sources b/sources index 4dbef8a..f2fadcd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.20.1.tar.gz) = f232eddc751ebc0ed5574c4ab39ac432170cedd8f5fc45805938f8d043bdad940f39b4e3a8702d5a372e67f0933a5b08a871eb1ed14a29944b236e842181e16b +SHA512 (v1.20.2.tar.gz) = 0d17867d02cc1491dc14151bd97233e9127ff21152f65794f8e95d95719d47528246c8d4a7648a7586eedbf7e86bad45bfe194db7df7a391338d3d5e15633fdc From c27fdc6be894580c57e83798c7d0ac2490d3a582 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 16 Sep 2021 16:03:40 -0400 Subject: [PATCH 88/93] bump to v1.20.5 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f5c5d76..d5bde2e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /v1.20.0.tar.gz /v1.20.1.tar.gz /v1.20.2.tar.gz +/v1.20.5.tar.gz diff --git a/cri-o.spec b/cri-o.spec index c6fc4ea..71ad925 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 d5a999ad0a35d895ded554e1e18c142075501a98 +%global commit0 57392384dcccfb3b0edde6a814aef649246680a4 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -40,15 +40,15 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.20.2 +%define built_tag v1.20.5 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz Epoch: 0 Name: %{repo} -Version: 1.20.2 -Release: 1%{?dist} +Version: 1.20.5 +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -258,6 +258,9 @@ rm -f %{_unitdir}/%{repo}.service %endif %changelog +* Thu Sep 16 2021 Peter Hunt - 0:1.20.5-2 +- bump to 1.20.5 + * Wed Mar 24 2021 Peter Hunt - 0:1.20.2-1 - Bump to v1.20.2 diff --git a/sources b/sources index f2fadcd..930aa1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.20.2.tar.gz) = 0d17867d02cc1491dc14151bd97233e9127ff21152f65794f8e95d95719d47528246c8d4a7648a7586eedbf7e86bad45bfe194db7df7a391338d3d5e15633fdc +SHA512 (v1.20.5.tar.gz) = 024b33429fc0c6e34811ac4a967e9e0becde4fb6fcd0be8b96ef4444012a072e7f896220bdbe93e312c16ba00ddd71082ab68f262d1f8ec3b0f24615a4d38969 From 375170ac3551ad24b1cf610588d617baaac34e9c Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 11 Nov 2021 14:05:02 -0500 Subject: [PATCH 89/93] bump to v1.20.6 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d5bde2e..10997af 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /v1.20.1.tar.gz /v1.20.2.tar.gz /v1.20.5.tar.gz +/v1.20.6.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 71ad925..322cf5b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,7 +31,7 @@ %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 57392384dcccfb3b0edde6a814aef649246680a4 +%global commit0 0ff8c357921afde70b4f11156adc719085e27da4 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -40,15 +40,15 @@ # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.20.5 +%define built_tag v1.20.6 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz Epoch: 0 Name: %{repo} -Version: 1.20.5 -Release: 2%{?dist} +Version: 1.20.6 +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -258,6 +258,9 @@ rm -f %{_unitdir}/%{repo}.service %endif %changelog +* Thu Nov 11 2021 Peter Hunt - 0:1.20.6-1 +- bump to v1.20.6 + * Thu Sep 16 2021 Peter Hunt - 0:1.20.5-2 - bump to 1.20.5 diff --git a/sources b/sources index 930aa1a..a8b77ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.20.5.tar.gz) = 024b33429fc0c6e34811ac4a967e9e0becde4fb6fcd0be8b96ef4444012a072e7f896220bdbe93e312c16ba00ddd71082ab68f262d1f8ec3b0f24615a4d38969 +SHA512 (v1.20.6.tar.gz) = 987d0e326af5a05cae9239833a49c158f802184ebc481e8a6c898154be8574e887434a8e28df4d8e4ff48881f155f3034b40b45531a7f0c5183145fc2eddd7cd From fc10ea6053c37332e78d71b3e9a14ff0ba6624ce Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 11 Nov 2021 14:58:44 -0500 Subject: [PATCH 90/93] drop fortify source Signed-off-by: Peter Hunt --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 322cf5b..958da7e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -145,7 +145,7 @@ GO_MD2MAN=go-md2man %{__make} docs # work around until https://github.com/cri-o/cri-o/pull/4442 is accepted # we need to drop -static for Stack Canary, Relro, and PIE sed -i 's/-static//g' pinns/Makefile -CFLAGS="-std=c99 -Os -Wall -Werror -Wextra -fpie -pie -fstack-protector -D_FORTIFY_SOURCE=3 -Wl,-z,relro,-z,now" %{__make} bin/pinns +CFLAGS="-std=c99 -Os -Wall -Werror -Wextra -fpie -pie -fstack-protector -D_FORTIFY_SOURCE=2 -Wl,-z,relro,-z,now" %{__make} bin/pinns %install sed -i 's/\/local//' contrib/systemd/%{service_name}.service From fb26f1addd2fbfaf52b28946d74a8f50c009e4de Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Fri, 3 Dec 2021 14:43:03 -0500 Subject: [PATCH 91/93] fix some fedpkg build issues Signed-off-by: Peter Hunt --- cri-o.spec | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 958da7e..4c3ade8 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -12,10 +12,27 @@ %global debug_package %{nil} %endif -%if ! 0%{?gobuild:1} || 0%{?centos} -%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; +# https://github.com/cri-o/cri-o +%global goipath github.com/cri-o/cri-o +Version: 1.20.6 + +%if 0%{?rhel} && 0%{?rhel} <= 8 +%define gobuild(o:) %{expand: + # https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12 + %global _dwz_low_mem_die_limit 0 + %ifnarch ppc64 + go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**}; + %else + go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-}%{?currentgoldflags} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags %{?__golang_extldflags}' -compressdwarf=false" -a -v -x %{?**}; + %endif +} +%bcond_with check +%else +%gometa +%bcond_without check %endif + # Global vars %global provider github %global provider_tld com @@ -47,8 +64,7 @@ Epoch: 0 Name: %{repo} -Version: 1.20.6 -Release: 1%{?dist} +Release: 2%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -258,6 +274,10 @@ rm -f %{_unitdir}/%{repo}.service %endif %changelog +* Fri Dec 03 2021 Peter Hunt - 0:1.20.6-2 +- fix gobuild macros to set debug symbols right +- fix bogus date + * Thu Nov 11 2021 Peter Hunt - 0:1.20.6-1 - bump to v1.20.6 @@ -315,7 +335,7 @@ rm -f %{_unitdir}/%{repo}.service * Fri Jun 05 2020 Douglas Schilling Landgraf - 2:1.18.1-2 - Add --cni-plugin-dir /opt/cni/bin to cri-o conf file -* Thu May 16 2020 Douglas Schilling Landgraf - 2:1.18.1-1 +* Thu May 14 2020 Douglas Schilling Landgraf - 2:1.18.1-1 - Release 1.18.1 * Thu Apr 23 2020 Douglas Schilling Landgraf - 2:1.18.0-2 From 4d6525fd01ee76f6dafcc4a2ac68a0a10e5c0331 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Fri, 3 Dec 2021 14:45:01 -0500 Subject: [PATCH 92/93] fix broken macro Signed-off-by: Peter Hunt --- cri-o.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 4c3ade8..eeb53da 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -224,7 +224,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %sysctl_apply 99-cri-o.conf %endif -ln -sf %{_unitdir}/%{service_name}.service {_unitdir}/%{repo}.service +ln -sf %{_unitdir}/%{service_name}.service %{_unitdir}/%{repo}.service %systemd_post %{service_name} %preun @@ -277,6 +277,7 @@ rm -f %{_unitdir}/%{repo}.service * Fri Dec 03 2021 Peter Hunt - 0:1.20.6-2 - fix gobuild macros to set debug symbols right - fix bogus date +- fix broken macro * Thu Nov 11 2021 Peter Hunt - 0:1.20.6-1 - bump to v1.20.6 From 2f70d83b4024a504f29bedd3be722e760944aabb Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 15 Mar 2022 14:02:31 -0400 Subject: [PATCH 93/93] bump to v1.20.7 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 10997af..8a19a0c 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /v1.20.2.tar.gz /v1.20.5.tar.gz /v1.20.6.tar.gz +/v1.20.7.tar.gz diff --git a/cri-o.spec b/cri-o.spec index eeb53da..f8b044b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -14,7 +14,7 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -Version: 1.20.6 +Version: 1.20.7 %if 0%{?rhel} && 0%{?rhel} <= 8 %define gobuild(o:) %{expand: @@ -48,7 +48,7 @@ Version: 1.20.6 %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} # Commit for the builds -%global commit0 0ff8c357921afde70b4f11156adc719085e27da4 +%global commit0 5d2fa3419f15655454edb94dfcc0993cb5a1521c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global git0 https://%{import_path} @@ -57,14 +57,14 @@ Version: 1.20.6 # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) -%define built_tag v1.20.6 +%define built_tag v1.20.7 %define built_tag_strip %(b=%{built_tag}; echo ${b:1}) %define crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') %define download_url %{git0}/archive/%{built_tag}.tar.gz Epoch: 0 Name: %{repo} -Release: 2%{?dist} +Release: 1%{?dist} ExcludeArch: ppc64 Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -274,6 +274,9 @@ rm -f %{_unitdir}/%{repo}.service %endif %changelog +* Tue Mar 15 2022 Peter Hunt - 0:1.20.7-1 +- bump to v1.20.7 + * Fri Dec 03 2021 Peter Hunt - 0:1.20.6-2 - fix gobuild macros to set debug symbols right - fix bogus date diff --git a/sources b/sources index a8b77ac..9e8b73a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v1.20.6.tar.gz) = 987d0e326af5a05cae9239833a49c158f802184ebc481e8a6c898154be8574e887434a8e28df4d8e4ff48881f155f3034b40b45531a7f0c5183145fc2eddd7cd +SHA512 (v1.20.7.tar.gz) = 2748e50315cc0ded2061667e800ce440a0b6e2b9f679be76a7cba6d54daa8f50dbe9447a00d889e971f1687eaa95ceee85253f3b5b7a7b73143f9701295078e0