From 74c8d12b070d76cec2286e2bb77b45d8584b5ae1 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 8 Jun 2017 00:46:07 +0200 Subject: [PATCH 001/202] initial spec and files Signed-off-by: Antonio Murdaca --- .gitignore | 2 + cri-o.spec | 630 +++++++++++++++++++++++++++++++++++++++++ crio-network.sysconfig | 3 + crio-storage.sysconfig | 2 + crio.service | 23 ++ sources | 2 + 6 files changed, 662 insertions(+) create mode 100644 cri-o.spec create mode 100644 crio-network.sysconfig create mode 100644 crio-storage.sysconfig create mode 100644 crio.service diff --git a/.gitignore b/.gitignore index e69de29..782fb3f 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/cri-o-c0fb3d9.tar.gz +/runc-67bd2ab.tar.gz diff --git a/cri-o.spec b/cri-o.spec new file mode 100644 index 0000000..f2852a0 --- /dev/null +++ b/cri-o.spec @@ -0,0 +1,630 @@ +%if 0%{?fedora} || 0%{?rhel} == 6 +%global with_devel 1 +%global with_bundled 1 +%global with_debug 0 +%global with_check 1 +%global with_unit_test 0 +%else +%global with_devel 0 +%global with_bundled 0 +%global with_debug 0 +%global with_check 0 +%global with_unit_test 0 +%endif + +%if 0%{?with_debug} +%global _dwz_low_mem_die_limit 0 +%else +%global debug_package %{nil} +%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} +# kube-1.6.x branch +%global commit0 c0fb3d9249a31475c400d19b4fe75ba1796c7b10 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + +# runc +%global git_runc https://github.com/opencontainers/runc/ +%global commit_runc 67bd2ab554bdf8a604f020e57448b37ef2102171 +%global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) + +%global service_name crio + +Name: cri-o +Version: 0.4 +Release: 0.git%{shortcommit0}%{?dist} +Summary: OCI-based implementation of Kubernetes Container Runtime Interface +License: ASL 2.0 +URL: https://%{provider_prefix} +Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz +Source2: %{service_name}.service +Source3: %{service_name}-network.sysconfig +Source4: %{service_name}-storage.sysconfig +Source5: %{git_runc}/archive/%{commit_runc}/runc-%{shortcommit_runc}.tar.gz + +# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required +#ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} +ExclusiveArch: x86_64 aarch64 ppc64le +# 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-static +BuildRequires: pkgconfig(systemd) +BuildRequires: device-mapper-devel +Requires(pre): container-selinux +Requires: skopeo-containers +Provides: %{repo} = %{version}-%{release} +Provides: cri-o + +%description +%{summary} + +%if 0%{?with_devel} +%package devel +Summary: %{summary} +BuildArch: noarch + +%if 0%{?with_check} && ! 0%{?with_bundled} +BuildRequires: golang(github.com/BurntSushi/toml) +BuildRequires: golang(github.com/Microsoft/go-winio) +BuildRequires: golang(github.com/Sirupsen/logrus) +BuildRequires: golang(github.com/containernetworking/cni/libcni) +BuildRequires: golang(github.com/containernetworking/cni/pkg/invoke) +BuildRequires: golang(github.com/containernetworking/cni/pkg/types) +BuildRequires: golang(github.com/containernetworking/cni/pkg/version) +BuildRequires: golang(github.com/containers/image/directory) +BuildRequires: golang(github.com/containers/image/directory/explicitfilepath) +BuildRequires: golang(github.com/containers/image/docker) +BuildRequires: golang(github.com/containers/image/docker/policyconfiguration) +BuildRequires: golang(github.com/containers/image/image) +BuildRequires: golang(github.com/containers/image/manifest) +BuildRequires: golang(github.com/containers/image/oci/layout) +BuildRequires: golang(github.com/containers/image/openshift) +BuildRequires: golang(github.com/containers/image/transports) +BuildRequires: golang(github.com/containers/image/types) +BuildRequires: golang(github.com/containers/image/version) +BuildRequires: golang(github.com/docker/distribution) +BuildRequires: golang(github.com/docker/distribution/context) +BuildRequires: golang(github.com/docker/distribution/digest) +BuildRequires: golang(github.com/docker/distribution/reference) +BuildRequires: golang(github.com/docker/distribution/uuid) +BuildRequires: golang(github.com/docker/docker/api/types/blkiodev) +BuildRequires: golang(github.com/docker/docker/api/types/container) +BuildRequires: golang(github.com/docker/docker/api/types/mount) +BuildRequires: golang(github.com/docker/docker/api/types/strslice) +BuildRequires: golang(github.com/docker/docker/api/types/versions) +BuildRequires: golang(github.com/docker/docker/daemon/graphdriver) +BuildRequires: golang(github.com/docker/docker/image) +BuildRequires: golang(github.com/docker/docker/image/v1) +BuildRequires: golang(github.com/docker/docker/layer) +BuildRequires: golang(github.com/docker/docker/pkg/archive) +BuildRequires: golang(github.com/docker/docker/pkg/chrootarchive) +BuildRequires: golang(github.com/docker/docker/pkg/fileutils) +BuildRequires: golang(github.com/docker/docker/pkg/homedir) +BuildRequires: golang(github.com/docker/docker/pkg/idtools) +BuildRequires: golang(github.com/docker/docker/pkg/ioutils) +BuildRequires: golang(github.com/docker/docker/pkg/longpath) +BuildRequires: golang(github.com/docker/docker/pkg/mount) +BuildRequires: golang(github.com/docker/docker/pkg/plugins) +BuildRequires: golang(github.com/docker/docker/pkg/plugins/transport) +BuildRequires: golang(github.com/docker/docker/pkg/pools) +BuildRequires: golang(github.com/docker/docker/pkg/promise) +BuildRequires: golang(github.com/docker/docker/pkg/random) +BuildRequires: golang(github.com/docker/docker/pkg/reexec) +BuildRequires: golang(github.com/docker/docker/pkg/registrar) +BuildRequires: golang(github.com/docker/docker/pkg/stringid) +BuildRequires: golang(github.com/docker/docker/pkg/system) +BuildRequires: golang(github.com/docker/docker/pkg/truncindex) +BuildRequires: golang(github.com/docker/docker/plugin/getter) +BuildRequires: golang(github.com/docker/docker/reference) +BuildRequires: golang(github.com/docker/go-connections/nat) +BuildRequires: golang(github.com/docker/go-connections/sockets) +BuildRequires: golang(github.com/docker/go-connections/tlsconfig) +BuildRequires: golang(github.com/docker/go-units) +BuildRequires: golang(github.com/docker/libtrust) +BuildRequires: golang(github.com/ghodss/yaml) +BuildRequires: golang(github.com/gogo/protobuf/proto) +BuildRequires: golang(github.com/golang/glog) +BuildRequires: golang(github.com/golang/protobuf/proto) +BuildRequires: golang(github.com/gorilla/context) +BuildRequires: golang(github.com/gorilla/mux) +BuildRequires: golang(github.com/imdario/mergo) +BuildRequires: golang(github.com/opencontainers/image-spec/specs-go) +BuildRequires: golang(github.com/opencontainers/image-spec/specs-go/v1) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer/label) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer/selinux) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer/system) +BuildRequires: golang(github.com/opencontainers/runc/libcontainer/user) +BuildRequires: golang(github.com/opencontainers/runtime-spec/specs-go) +BuildRequires: golang(github.com/opencontainers/runtime-tools/generate) +BuildRequires: golang(github.com/rajatchopra/ocicni) +BuildRequires: golang(github.com/syndtr/gocapability/capability) +BuildRequires: golang(github.com/tchap/go-patricia/patricia) +BuildRequires: golang(github.com/vbatts/tar-split/archive/tar) +BuildRequires: golang(github.com/vbatts/tar-split/tar/asm) +BuildRequires: golang(github.com/vbatts/tar-split/tar/storage) +BuildRequires: golang(golang.org/x/net/context) +BuildRequires: golang(golang.org/x/net/http2) +BuildRequires: golang(golang.org/x/net/http2/hpack) +BuildRequires: golang(golang.org/x/net/internal/timeseries) +BuildRequires: golang(golang.org/x/net/proxy) +BuildRequires: golang(golang.org/x/net/trace) +BuildRequires: golang(golang.org/x/sys/unix) +BuildRequires: golang(google.golang.org/grpc) +BuildRequires: golang(google.golang.org/grpc/codes) +BuildRequires: golang(google.golang.org/grpc/credentials) +BuildRequires: golang(google.golang.org/grpc/grpclog) +BuildRequires: golang(google.golang.org/grpc/internal) +BuildRequires: golang(google.golang.org/grpc/metadata) +BuildRequires: golang(google.golang.org/grpc/naming) +BuildRequires: golang(google.golang.org/grpc/peer) +BuildRequires: golang(google.golang.org/grpc/transport) +BuildRequires: golang(gopkg.in/yaml.v2) +BuildRequires: golang(k8s.io/kubernetes/pkg/fields) +BuildRequires: golang(k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime) +BuildRequires: golang(k8s.io/kubernetes/pkg/selection) +BuildRequires: golang(k8s.io/kubernetes/pkg/util/errors) +BuildRequires: golang(k8s.io/kubernetes/pkg/util/homedir) +BuildRequires: golang(k8s.io/kubernetes/pkg/util/net) +BuildRequires: golang(k8s.io/kubernetes/pkg/util/sets) +%endif + +Requires: golang(github.com/BurntSushi/toml) +Requires: golang(github.com/Microsoft/go-winio) +Requires: golang(github.com/Sirupsen/logrus) +Requires: golang(github.com/containernetworking/cni/libcni) +Requires: golang(github.com/containernetworking/cni/pkg/invoke) +Requires: golang(github.com/containernetworking/cni/pkg/types) +Requires: golang(github.com/containernetworking/cni/pkg/version) +Requires: golang(github.com/containers/image/directory) +Requires: golang(github.com/containers/image/directory/explicitfilepath) +Requires: golang(github.com/containers/image/docker) +Requires: golang(github.com/containers/image/docker/policyconfiguration) +Requires: golang(github.com/containers/image/image) +Requires: golang(github.com/containers/image/manifest) +Requires: golang(github.com/containers/image/oci/layout) +Requires: golang(github.com/containers/image/openshift) +Requires: golang(github.com/containers/image/transports) +Requires: golang(github.com/containers/image/types) +Requires: golang(github.com/containers/image/version) +Requires: golang(github.com/docker/distribution) +Requires: golang(github.com/docker/distribution/context) +Requires: golang(github.com/docker/distribution/digest) +Requires: golang(github.com/docker/distribution/reference) +Requires: golang(github.com/docker/distribution/uuid) +Requires: golang(github.com/docker/docker/api/types/blkiodev) +Requires: golang(github.com/docker/docker/api/types/container) +Requires: golang(github.com/docker/docker/api/types/mount) +Requires: golang(github.com/docker/docker/api/types/strslice) +Requires: golang(github.com/docker/docker/api/types/versions) +Requires: golang(github.com/docker/docker/daemon/graphdriver) +Requires: golang(github.com/docker/docker/image) +Requires: golang(github.com/docker/docker/image/v1) +Requires: golang(github.com/docker/docker/layer) +Requires: golang(github.com/docker/docker/pkg/archive) +Requires: golang(github.com/docker/docker/pkg/chrootarchive) +Requires: golang(github.com/docker/docker/pkg/fileutils) +Requires: golang(github.com/docker/docker/pkg/homedir) +Requires: golang(github.com/docker/docker/pkg/idtools) +Requires: golang(github.com/docker/docker/pkg/ioutils) +Requires: golang(github.com/docker/docker/pkg/longpath) +Requires: golang(github.com/docker/docker/pkg/mount) +Requires: golang(github.com/docker/docker/pkg/plugins) +Requires: golang(github.com/docker/docker/pkg/plugins/transport) +Requires: golang(github.com/docker/docker/pkg/pools) +Requires: golang(github.com/docker/docker/pkg/promise) +Requires: golang(github.com/docker/docker/pkg/random) +Requires: golang(github.com/docker/docker/pkg/reexec) +Requires: golang(github.com/docker/docker/pkg/registrar) +Requires: golang(github.com/docker/docker/pkg/stringid) +Requires: golang(github.com/docker/docker/pkg/system) +Requires: golang(github.com/docker/docker/pkg/truncindex) +Requires: golang(github.com/docker/docker/plugin/getter) +Requires: golang(github.com/docker/docker/reference) +Requires: golang(github.com/docker/go-connections/nat) +Requires: golang(github.com/docker/go-connections/sockets) +Requires: golang(github.com/docker/go-connections/tlsconfig) +Requires: golang(github.com/docker/go-units) +Requires: golang(github.com/docker/libtrust) +Requires: golang(github.com/ghodss/yaml) +Requires: golang(github.com/gogo/protobuf/proto) +Requires: golang(github.com/golang/glog) +Requires: golang(github.com/golang/protobuf/proto) +Requires: golang(github.com/gorilla/context) +Requires: golang(github.com/gorilla/mux) +Requires: golang(github.com/imdario/mergo) +Requires: golang(github.com/opencontainers/image-spec/specs-go) +Requires: golang(github.com/opencontainers/image-spec/specs-go/v1) +Requires: golang(github.com/opencontainers/runc/libcontainer/label) +Requires: golang(github.com/opencontainers/runc/libcontainer/selinux) +Requires: golang(github.com/opencontainers/runc/libcontainer/system) +Requires: golang(github.com/opencontainers/runc/libcontainer/user) +Requires: golang(github.com/opencontainers/runtime-spec/specs-go) +Requires: golang(github.com/opencontainers/runtime-tools/generate) +Requires: golang(github.com/rajatchopra/ocicni) +Requires: golang(github.com/syndtr/gocapability/capability) +Requires: golang(github.com/tchap/go-patricia/patricia) +Requires: golang(github.com/vbatts/tar-split/archive/tar) +Requires: golang(github.com/vbatts/tar-split/tar/asm) +Requires: golang(github.com/vbatts/tar-split/tar/storage) +Requires: golang(golang.org/x/net/context) +Requires: golang(golang.org/x/net/http2) +Requires: golang(golang.org/x/net/http2/hpack) +Requires: golang(golang.org/x/net/internal/timeseries) +Requires: golang(golang.org/x/net/proxy) +Requires: golang(golang.org/x/net/trace) +Requires: golang(golang.org/x/sys/unix) +Requires: golang(google.golang.org/grpc) +Requires: golang(google.golang.org/grpc/codes) +Requires: golang(google.golang.org/grpc/credentials) +Requires: golang(google.golang.org/grpc/grpclog) +Requires: golang(google.golang.org/grpc/internal) +Requires: golang(google.golang.org/grpc/metadata) +Requires: golang(google.golang.org/grpc/naming) +Requires: golang(google.golang.org/grpc/peer) +Requires: golang(google.golang.org/grpc/transport) +Requires: golang(gopkg.in/yaml.v2) +Requires: golang(k8s.io/kubernetes/pkg/fields) +Requires: golang(k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime) +Requires: golang(k8s.io/kubernetes/pkg/selection) +Requires: golang(k8s.io/kubernetes/pkg/util/errors) +Requires: golang(k8s.io/kubernetes/pkg/util/homedir) +Requires: golang(k8s.io/kubernetes/pkg/util/net) +Requires: golang(k8s.io/kubernetes/pkg/util/sets) + +Provides: golang(%{import_path}/oci) = %{version}-%{release} +Provides: golang(%{import_path}/server) = %{version}-%{release} +Provides: golang(%{import_path}/utils) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/BurntSushi/toml)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/Sirupsen/logrus)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/libcni)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/invoke)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/types)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/version)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory/explicitfilepath)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker/policyconfiguration)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/image)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/manifest)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/oci/layout)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/openshift)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/transports)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/types)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/version)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/coreos/go-systemd/daemon)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/context)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/digest)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/reference)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/uuid)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/blkiodev)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/container)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/mount)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/strslice)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/versions)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/daemon/graphdriver)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image/v1)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/layer)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/archive)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/chrootarchive)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/fileutils)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/homedir)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/idtools)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/ioutils)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/mount)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins/transport)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/pools)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/promise)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/random)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/reexec)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/registrar)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/stringid)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/system)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/truncindex)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/plugin/getter)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/reference)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/nat)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/sockets)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/tlsconfig)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-units)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/libtrust)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/ghodss/yaml)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/gogo/protobuf/proto)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/glog)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/protobuf/proto)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/context)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/mux)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/imdario/mergo)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go/v1)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/label)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/selinux)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/system)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/user)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-spec/specs-go)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-tools/generate)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/rajatchopra/ocicni)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/syndtr/gocapability/capability)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/tchap/go-patricia/patricia)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/urfave/cli)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/archive/tar)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/asm)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/storage)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/context)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2/hpack)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/proxy)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/trace)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/sys/unix)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/codes)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/credentials)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/grpclog)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/metadata)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/naming)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/peer)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/transport)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/gopkg.in/yaml.v2)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/fields)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/selection)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/errors)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/homedir)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/net)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/sets)) = %{version}-%{release} + +%description devel +%{summary} + +This package contains library source intended for +building other packages which use import path with +%{import_path} prefix. +%endif + +%if 0%{?with_unit_test} && 0%{?with_devel} +%package unit-test-devel +Summary: Unit tests for %{name} package +%if 0%{?with_check} +#Here comes all BuildRequires: PACKAGE the unit tests +#in %%check section need for running +%endif + +# test subpackage tests code from devel subpackage +Requires: %{name}-devel = %{version}-%{release} + +%description unit-test-devel +%{summary} + +This package contains unit tests for project +providing packages with %{import_path} prefix. +%endif + +%prep +%setup -q -n cri-o-%{commit0} +cp %{SOURCE2} contrib/systemd/. + +tar zxf %{SOURCE5} + +%build +mkdir _build +pushd _build +mkdir -p src/%{provider}.%{provider_tld}/{%{project},opencontainers} +ln -s $(dirs +1 -l) src/%{import_path} +ln -s $(dirs +1 -l)/runc-%{commit_runc} src/%{provider}.%{provider_tld}/opencontainers/runc +popd + +ln -s vendor src + +make docs +export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} +make binaries + +./%{service_name} \ + --selinux=true \ + --root %{_sharedstatedir}/containers \ + --storage-driver=overlay2 \ + --runtime /usr/libexec/%{service_name}/runc \ + --cgroup-manager=systemd config > %{service_name}.conf + +pushd _build/src/github.com/opencontainers/runc +make BUILDTAGS="seccomp selinux" +popd + +%install +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 %{service_name} %{buildroot}%{_bindir} +install -p -m 755 crioctl %{buildroot}%{_bindir} +install -p -m 755 kpod %{buildroot}%{_bindir} +install -p -m 755 conmon/conmon %{buildroot}%{_libexecdir}/%{service_name} +install -p -m 755 pause/pause %{buildroot}%{_libexecdir}/%{service_name} + +install -p -m 755 runc-%{commit_runc}/runc %{buildroot}%{_libexecdir}/%{service_name} + +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/*.1 %{buildroot}%{_mandir}/man1 +install -m 644 docs/*.5 %{buildroot}%{_mandir}/man5 +install -m 644 docs/*.8 %{buildroot}%{_mandir}/man8 + +mkdir -p %{buildroot}%{_sharedstatedir}/containers + +# source codes for building projects +%if 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list +# find all *.go but no *_test.go files and generate devel.file-list +for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do + echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list +done +%endif + +# testing files for this project +%if 0%{?with_unit_test} && 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +# find all *_test.go files and generate unit-test.file-list +for file in $(find . -iname "*_test.go"); do + echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list +done +%endif + +%if 0%{?with_devel} +sort -u -o devel.file-list devel.file-list +%endif + +%check +%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} +%if ! 0%{?with_bundled} +export GOPATH=%{buildroot}/%{gopath}:%{gopath} +%else +export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} +%endif + +%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} + +%if 0%{?with_devel} +%files devel -f devel.file-list +%license LICENSE +%doc README.md code-of-conduct.md +%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} +%endif + +%if 0%{?with_unit_test} && 0%{?with_devel} +%files unit-test-devel -f unit-test-devel.file-list +%license LICENSE +%doc README.md code-of-conduct.md +%endif + +%files +%license LICENSE +%doc README.md +%{_bindir}/%{service_name} +%{_bindir}/kpod +%{_bindir}/crioctl +%{_mandir}/man1/kpod* +%{_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 +%dir %{_libexecdir}/%{service_name} +%{_libexecdir}/%{service_name}/conmon +%{_libexecdir}/%{service_name}/pause +%{_libexecdir}/%{service_name}/runc +%{_unitdir}/%{service_name}.service +%{_unitdir}/%{service_name}-shutdown.service +%dir %{_sharedstatedir}/containers +%{_datadir}/bash-completion/completions/* + +%changelog +* 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/crio.service b/crio.service new file mode 100644 index 0000000..fbd5b7f --- /dev/null +++ b/crio.service @@ -0,0 +1,23 @@ +[Unit] +Description=Open Container Initiative Daemon +Documentation=https://github.com/kubernetes-incubator/cri-o +After=network-online.target + +[Service] +Type=notify +EnvironmentFile=-/etc/sysconfig/crio-storage +EnvironmentFile=-/etc/sysconfig/crio-network +Environment=GOTRACEBACK=crash +ExecStart=/usr/bin/crio --config /etc/crio/crio.conf \ + $CRIO_STORAGE_OPTIONS \ + $CRIO_NETWORK_OPTIONS +ExecReload=/bin/kill -s HUP $MAINPID +TasksMax=8192 +LimitNOFILE=1048576 +LimitNPROC=1048576 +LimitCORE=infinity +TimeoutStartSec=0 +Restart=on-abnormal + +[Install] +WantedBy=multi-user.target diff --git a/sources b/sources index e69de29..45d8752 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (cri-o-c0fb3d9.tar.gz) = 75a13e8ab51d8f478188b1ca14c538ba5a666805448036374fba17b2497373a71e909f8d97f349bbe03a4de919d08381787429d0f1b2262c7c6d10423795e3c4 +SHA512 (runc-67bd2ab.tar.gz) = 4aac5f3d00ab022c0d0e4140f0e8caaa37aeb9cdc31b95485a3094e3b7082f1b617337d860777016807b2f16a3dc1a6e5b768af1a9e61d806fe763c7e1dcde28 From 331cb946e746206a98ca628f4d165d7ff73138b8 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 8 Jun 2017 01:29:47 +0200 Subject: [PATCH 002/202] no need for --config in unit Signed-off-by: Antonio Murdaca --- crio.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crio.service b/crio.service index fbd5b7f..416e319 100644 --- a/crio.service +++ b/crio.service @@ -8,7 +8,7 @@ Type=notify EnvironmentFile=-/etc/sysconfig/crio-storage EnvironmentFile=-/etc/sysconfig/crio-network Environment=GOTRACEBACK=crash -ExecStart=/usr/bin/crio --config /etc/crio/crio.conf \ +ExecStart=/usr/bin/crio \ $CRIO_STORAGE_OPTIONS \ $CRIO_NETWORK_OPTIONS ExecReload=/bin/kill -s HUP $MAINPID From 4f7c19cbbc73e3ac4b14433bec326537feb8c8c8 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 8 Jun 2017 01:39:32 +0200 Subject: [PATCH 003/202] tweak upstream unit Signed-off-by: Antonio Murdaca --- cri-o.spec | 5 ++--- crio.service | 23 ----------------------- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 crio.service diff --git a/cri-o.spec b/cri-o.spec index f2852a0..7c07a8b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -43,7 +43,6 @@ Summary: OCI-based implementation of Kubernetes Container Runtime Interfa License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Source2: %{service_name}.service Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig Source5: %{git_runc}/archive/%{commit_runc}/runc-%{shortcommit_runc}.tar.gz @@ -416,7 +415,7 @@ providing packages with %{import_path} prefix. %prep %setup -q -n cri-o-%{commit0} -cp %{SOURCE2} contrib/systemd/. +sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/spec/crio.service tar zxf %{SOURCE5} @@ -436,9 +435,9 @@ make binaries ./%{service_name} \ --selinux=true \ - --root %{_sharedstatedir}/containers \ --storage-driver=overlay2 \ --runtime /usr/libexec/%{service_name}/runc \ + --conmon /usr/libexec/%{service_name}/conmon \ --cgroup-manager=systemd config > %{service_name}.conf pushd _build/src/github.com/opencontainers/runc diff --git a/crio.service b/crio.service deleted file mode 100644 index 416e319..0000000 --- a/crio.service +++ /dev/null @@ -1,23 +0,0 @@ -[Unit] -Description=Open Container Initiative Daemon -Documentation=https://github.com/kubernetes-incubator/cri-o -After=network-online.target - -[Service] -Type=notify -EnvironmentFile=-/etc/sysconfig/crio-storage -EnvironmentFile=-/etc/sysconfig/crio-network -Environment=GOTRACEBACK=crash -ExecStart=/usr/bin/crio \ - $CRIO_STORAGE_OPTIONS \ - $CRIO_NETWORK_OPTIONS -ExecReload=/bin/kill -s HUP $MAINPID -TasksMax=8192 -LimitNOFILE=1048576 -LimitNPROC=1048576 -LimitCORE=infinity -TimeoutStartSec=0 -Restart=on-abnormal - -[Install] -WantedBy=multi-user.target From 0fd7781d585bc97304e7eddfa685461df72b578a Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Thu, 8 Jun 2017 01:44:04 +0200 Subject: [PATCH 004/202] fix typo Signed-off-by: Antonio Murdaca --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 7c07a8b..4cc9709 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -415,7 +415,7 @@ providing packages with %{import_path} prefix. %prep %setup -q -n cri-o-%{commit0} -sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/spec/crio.service +sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/crio.service tar zxf %{SOURCE5} From 33548db9f939da72a4e8a1e99ae1ff6cf85091e5 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Wed, 21 Jun 2017 11:05:20 +0200 Subject: [PATCH 005/202] v1.0.0.alpha.0 Signed-off-by: Antonio Murdaca --- .gitignore | 1 + cri-o.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 782fb3f..b7af7d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /cri-o-c0fb3d9.tar.gz /runc-67bd2ab.tar.gz +/cri-o-5dcbdc0.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 4cc9709..2db762f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,8 +25,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -# kube-1.6.x branch -%global commit0 c0fb3d9249a31475c400d19b4fe75ba1796c7b10 +%global commit0 5dcbdc05e597098381f138061a05810f5a000f39 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # runc @@ -37,8 +36,8 @@ %global service_name crio Name: cri-o -Version: 0.4 -Release: 0.git%{shortcommit0}%{?dist} +Version: 1.0.0.alpha.0 +Release: 0.git%{shortcommit0}%{?dist}.1 Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -556,6 +555,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* 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 diff --git a/sources b/sources index 45d8752..8fed864 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cri-o-c0fb3d9.tar.gz) = 75a13e8ab51d8f478188b1ca14c538ba5a666805448036374fba17b2497373a71e909f8d97f349bbe03a4de919d08381787429d0f1b2262c7c6d10423795e3c4 +SHA512 (cri-o-5dcbdc0.tar.gz) = a1031c25efdd8ca8877f0a2f4371d0fb0d2fca56f21826c79a721e3d26a6b4434f81ac3501a5d3d2607a6109ed211c73f5e8a7d0454ef17cb476078e428cc928 SHA512 (runc-67bd2ab.tar.gz) = 4aac5f3d00ab022c0d0e4140f0e8caaa37aeb9cdc31b95485a3094e3b7082f1b617337d860777016807b2f16a3dc1a6e5b768af1a9e61d806fe763c7e1dcde28 From 7d25a267aba358252fd9df5cf4bdaf9796b58f7d Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Wed, 21 Jun 2017 12:39:21 +0200 Subject: [PATCH 006/202] rebuild for s390x Signed-off-by: Antonio Murdaca --- cri-o.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 2db762f..2b7255c 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Version: 1.0.0.alpha.0 -Release: 0.git%{shortcommit0}%{?dist}.1 +Release: 0.git%{shortcommit0}%{?dist}.2 Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -48,7 +48,7 @@ Source5: %{git_runc}/archive/%{commit_runc}/runc-%{shortcommit_runc}.tar. # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} -ExclusiveArch: x86_64 aarch64 ppc64le +ExclusiveArch: x86_64 aarch64 ppc64le s390x # 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 @@ -555,6 +555,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* 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 From 347b56a909c3fbe3e454c46f3b8980e1b2e81077 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Fri, 23 Jun 2017 12:31:52 +0200 Subject: [PATCH 007/202] Ship cri-o-cni sub pkg Signed-off-by: Antonio Murdaca --- .gitignore | 1 + cri-o.spec | 44 +++++++++++++++++++++++++++++++++++++++++++- sources | 1 + 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b7af7d3..2373cff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cri-o-c0fb3d9.tar.gz /runc-67bd2ab.tar.gz /cri-o-5dcbdc0.tar.gz +/plugins-dcf7368.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 2b7255c..ef30059 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -33,11 +33,16 @@ %global commit_runc 67bd2ab554bdf8a604f020e57448b37ef2102171 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) +# CNI plugins +%global git_cni https://github.com/containernetworking/plugins +%global commit_cni dcf7368eeab15e2affc6256f0bb1e84dd46a34de +%global shortcommit_cni %(c=%{commit_cni}; echo ${c:0:7}) + %global service_name crio Name: cri-o Version: 1.0.0.alpha.0 -Release: 0.git%{shortcommit0}%{?dist}.2 +Release: 0.git%{shortcommit0}%{?dist}.3 Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -45,6 +50,7 @@ Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0} Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig Source5: %{git_runc}/archive/%{commit_runc}/runc-%{shortcommit_runc}.tar.gz +Source6: %{git_cni}/archive/%{commit_cni}/plugins-%{shortcommit_cni}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} @@ -66,6 +72,8 @@ Requires: skopeo-containers Provides: %{repo} = %{version}-%{release} Provides: cri-o +Recommends: cri-o-cni + %description %{summary} @@ -412,11 +420,23 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif +%package cni +License: LGPLv3 +Summary: CNI plugins for CRI-O +Requires: %{name} = %{version}-%{release} + +%description cni +CNI plugins and configurations for CRI-O. + +This package provides basic CNI plugins and basic configurations to be used with +CRI-O. + %prep %setup -q -n cri-o-%{commit0} sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/crio.service tar zxf %{SOURCE5} +tar zxf %{SOURCE6} %build mkdir _build @@ -443,6 +463,10 @@ pushd _build/src/github.com/opencontainers/runc make BUILDTAGS="seccomp selinux" popd +pushd plugins-%{commit_cni} +./build.sh +popd + %install make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd install.completions @@ -456,6 +480,13 @@ install -p -m 755 pause/pause %{buildroot}%{_libexecdir}/%{service_name} install -p -m 755 runc-%{commit_runc}/runc %{buildroot}%{_libexecdir}/%{service_name} +install -dp %{buildroot}/opt/cni/bin +install -p -m 755 plugins-%{commit_cni}/bin/* %{buildroot}/opt/cni/bin + +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 @@ -554,7 +585,18 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %dir %{_sharedstatedir}/containers %{_datadir}/bash-completion/completions/* +%files cni +%license plugins-%{commit_cni}/LICENSE +%doc plugins-%{commit_cni}/README.md +%dir %{_sysconfdir}/cni/net.d +%{_sysconfdir}/cni/net.d/* +%dir /opt/cni/bin +/opt/cni/bin/* + %changelog +* 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 diff --git a/sources b/sources index 8fed864..78d11c4 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (cri-o-5dcbdc0.tar.gz) = a1031c25efdd8ca8877f0a2f4371d0fb0d2fca56f21826c79a721e3d26a6b4434f81ac3501a5d3d2607a6109ed211c73f5e8a7d0454ef17cb476078e428cc928 +SHA512 (plugins-dcf7368.tar.gz) = 59b035790870e4349ad9c4ad34c655618bdba7fce8927c2efbcf0f205d7365e0e2b5a853335282f3193b4b8d9ebb41152a828d2d12d3613421a303e6feb8e1ab SHA512 (runc-67bd2ab.tar.gz) = 4aac5f3d00ab022c0d0e4140f0e8caaa37aeb9cdc31b95485a3094e3b7082f1b617337d860777016807b2f16a3dc1a6e5b768af1a9e61d806fe763c7e1dcde28 From b74df5c475815b80dec0b7d8dcf74b4e0eb25ec5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 24 Jun 2017 02:12:56 -0400 Subject: [PATCH 008/202] Requires instead of Recommends for CentOS 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 ef30059..bf28081 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -72,7 +72,11 @@ Requires: skopeo-containers Provides: %{repo} = %{version}-%{release} Provides: cri-o +%if 0%{?centos} +Requires: cri-o-cni +%else Recommends: cri-o-cni +%endif # centos %description %{summary} From ac7d86baa855edecf56d2969d5dc8860b4e60503 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 26 Jun 2017 10:39:27 -0400 Subject: [PATCH 009/202] cri-o obsoletes ocid 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 bf28081..0373369 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -71,6 +71,8 @@ Requires(pre): container-selinux Requires: skopeo-containers Provides: %{repo} = %{version}-%{release} Provides: cri-o +Obsoletes: ocid <= 0.3 +Provides: ocid = %{version}-%{release} %if 0%{?centos} Requires: cri-o-cni From 2a998dabfb32e2a929c1eea90a7821598549e621 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 30 Jun 2017 13:51:12 -0400 Subject: [PATCH 010/202] cri-o-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) - skip s390x build (rhbz#1466865) Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 51 +++++++++++++++++---------------------------------- sources | 2 +- 3 files changed, 19 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 2373cff..25d452e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /runc-67bd2ab.tar.gz /cri-o-5dcbdc0.tar.gz /plugins-dcf7368.tar.gz +/cri-o-91977d3.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 0373369..038454f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,7 +25,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 5dcbdc05e597098381f138061a05810f5a000f39 +%global commit0 91977d3989d1bec715ec8063f447d143e7612d18 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # runc @@ -42,7 +42,7 @@ Name: cri-o Version: 1.0.0.alpha.0 -Release: 0.git%{shortcommit0}%{?dist}.3 +Release: 1.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -54,7 +54,8 @@ Source6: %{git_cni}/archive/%{commit_cni}/plugins-%{shortcommit_cni}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} -ExclusiveArch: x86_64 aarch64 ppc64le s390x +# skip s390x (rhbz#1466865) +ExclusiveArch: x86_64 aarch64 ppc64le # 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 @@ -75,9 +76,9 @@ Obsoletes: ocid <= 0.3 Provides: ocid = %{version}-%{release} %if 0%{?centos} -Requires: cri-o-cni +Requires: containernetworking-plugins >= 0.5.2-2 %else -Recommends: cri-o-cni +Recommends: containernetworking-plugins >= 0.5.2-2 %endif # centos %description @@ -426,20 +427,9 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif -%package cni -License: LGPLv3 -Summary: CNI plugins for CRI-O -Requires: %{name} = %{version}-%{release} - -%description cni -CNI plugins and configurations for CRI-O. - -This package provides basic CNI plugins and basic configurations to be used with -CRI-O. - %prep -%setup -q -n cri-o-%{commit0} -sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/crio.service +%autosetup -Sgit -n %{name}-%{commit0} +sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/%{service_name}.service tar zxf %{SOURCE5} tar zxf %{SOURCE6} @@ -469,10 +459,6 @@ pushd _build/src/github.com/opencontainers/runc make BUILDTAGS="seccomp selinux" popd -pushd plugins-%{commit_cni} -./build.sh -popd - %install make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd install.completions @@ -486,9 +472,6 @@ install -p -m 755 pause/pause %{buildroot}%{_libexecdir}/%{service_name} install -p -m 755 runc-%{commit_runc}/runc %{buildroot}%{_libexecdir}/%{service_name} -install -dp %{buildroot}/opt/cni/bin -install -p -m 755 plugins-%{commit_cni}/bin/* %{buildroot}/opt/cni/bin - 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 @@ -573,7 +556,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %doc README.md %{_bindir}/%{service_name} %{_bindir}/kpod -%{_bindir}/crioctl +%{_bindir}/%{service_name}ctl %{_mandir}/man1/kpod* %{_mandir}/man5/%{service_name}.conf.5* %{_mandir}/man8/%{service_name}.8* @@ -582,6 +565,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %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 %dir %{_libexecdir}/%{service_name} %{_libexecdir}/%{service_name}/conmon %{_libexecdir}/%{service_name}/pause @@ -591,15 +576,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %dir %{_sharedstatedir}/containers %{_datadir}/bash-completion/completions/* -%files cni -%license plugins-%{commit_cni}/LICENSE -%doc plugins-%{commit_cni}/README.md -%dir %{_sysconfdir}/cni/net.d -%{_sysconfdir}/cni/net.d/* -%dir /opt/cni/bin -/opt/cni/bin/* - %changelog +* 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) +- skip s390x build (rhbz#1466865) + * Fri Jun 23 2017 Antonio Murdaca - 1.0.0.alpha.0-0.git5dcbdc0.3 - rebuilt to include cri-o-cni sub package diff --git a/sources b/sources index 78d11c4..08df226 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cri-o-5dcbdc0.tar.gz) = a1031c25efdd8ca8877f0a2f4371d0fb0d2fca56f21826c79a721e3d26a6b4434f81ac3501a5d3d2607a6109ed211c73f5e8a7d0454ef17cb476078e428cc928 +SHA512 (cri-o-91977d3.tar.gz) = 03d621998f4659c3e07df2a0bb862a4e6fd02107986c92c0fe8daa74257298f7bddb4aec7a069d9f226a02139500ea8ff7469fc5c41e4b48b50ca5b712b75058 SHA512 (plugins-dcf7368.tar.gz) = 59b035790870e4349ad9c4ad34c655618bdba7fce8927c2efbcf0f205d7365e0e2b5a853335282f3193b4b8d9ebb41152a828d2d12d3613421a303e6feb8e1ab SHA512 (runc-67bd2ab.tar.gz) = 4aac5f3d00ab022c0d0e4140f0e8caaa37aeb9cdc31b95485a3094e3b7082f1b617337d860777016807b2f16a3dc1a6e5b768af1a9e61d806fe763c7e1dcde28 From cf9d4c208023c16a678419481937a8d326c59456 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 30 Jun 2017 14:20:10 -0400 Subject: [PATCH 011/202] remove cri-o-cni info Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 038454f..ccd38e7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -33,11 +33,6 @@ %global commit_runc 67bd2ab554bdf8a604f020e57448b37ef2102171 %global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) -# CNI plugins -%global git_cni https://github.com/containernetworking/plugins -%global commit_cni dcf7368eeab15e2affc6256f0bb1e84dd46a34de -%global shortcommit_cni %(c=%{commit_cni}; echo ${c:0:7}) - %global service_name crio Name: cri-o @@ -50,7 +45,6 @@ Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0} Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig Source5: %{git_runc}/archive/%{commit_runc}/runc-%{shortcommit_runc}.tar.gz -Source6: %{git_cni}/archive/%{commit_cni}/plugins-%{shortcommit_cni}.tar.gz # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required #ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} From aaa8f31ca58159e1eae2e5e9a77c9f48e3c65ba7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 1 Jul 2017 19:30:32 +0000 Subject: [PATCH 012/202] skip untarring non-existing tarball Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index ccd38e7..d9b9457 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -426,7 +426,6 @@ providing packages with %{import_path} prefix. sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/%{service_name}.service tar zxf %{SOURCE5} -tar zxf %{SOURCE6} %build mkdir _build From 34b5885cf0fa6dbccf21613d7f1ce5a0e8f9dafc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 1 Jul 2017 19:34:25 +0000 Subject: [PATCH 013/202] package also Provides: crio 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 d9b9457..6a78cbf 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -65,7 +65,7 @@ BuildRequires: device-mapper-devel Requires(pre): container-selinux Requires: skopeo-containers Provides: %{repo} = %{version}-%{release} -Provides: cri-o +Provides: %{service_name} = %{version}-%{release} Obsoletes: ocid <= 0.3 Provides: ocid = %{version}-%{release} From 6648c3849001f38bdc4ff636c3587155a98a3445 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 13 Jul 2017 16:53:15 -0400 Subject: [PATCH 014/202] cri-o-1.0.0.alpha.0-2.gitfa25b38 - built commit fa25b38 - Provides: crio Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 8 ++++++-- sources | 3 +-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 25d452e..d5fdc15 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /cri-o-5dcbdc0.tar.gz /plugins-dcf7368.tar.gz /cri-o-91977d3.tar.gz +/cri-o-fa25b38.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 6a78cbf..703a75c 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,7 +25,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 91977d3989d1bec715ec8063f447d143e7612d18 +%global commit0 fa25b381b153780faafc5535ca29f3b0a6c94944 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) # runc @@ -37,7 +37,7 @@ Name: cri-o Version: 1.0.0.alpha.0 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -570,6 +570,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* Thu Jul 13 2017 Lokesh Mandvekar - 1.0.0.alpha.0-2.gitfa25b38 +- built commit fa25b38 +- Provides: crio + * Fri Jun 30 2017 Lokesh Mandvekar - 1.0.0.alpha.0-1.git91977d3 - built commit 91977d3 - remove cri-o-cni subpackage diff --git a/sources b/sources index 08df226..ef61048 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (cri-o-91977d3.tar.gz) = 03d621998f4659c3e07df2a0bb862a4e6fd02107986c92c0fe8daa74257298f7bddb4aec7a069d9f226a02139500ea8ff7469fc5c41e4b48b50ca5b712b75058 -SHA512 (plugins-dcf7368.tar.gz) = 59b035790870e4349ad9c4ad34c655618bdba7fce8927c2efbcf0f205d7365e0e2b5a853335282f3193b4b8d9ebb41152a828d2d12d3613421a303e6feb8e1ab +SHA512 (cri-o-fa25b38.tar.gz) = 24cf7155b8845828a3e153354bd19d15ce2b3dffb7f1db099d5bd019cad42a6309a9c99c726ece6d91c2c5af9eecf71fa38a65acb08235d5c6a1a00eedd0521d SHA512 (runc-67bd2ab.tar.gz) = 4aac5f3d00ab022c0d0e4140f0e8caaa37aeb9cdc31b95485a3094e3b7082f1b617337d860777016807b2f16a3dc1a6e5b768af1a9e61d806fe763c7e1dcde28 From fd0f676547fda27b5e2cb53789212994d1fd1bf9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 14 Jul 2017 15:51:44 -0400 Subject: [PATCH 015/202] cri-o-1.0.0.alpha.0-3.gitfa25b38 - enable all arches except ppc64 because it's been removed from goarches Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 703a75c..2f687f2 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Version: 1.0.0.alpha.0 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -45,11 +45,7 @@ Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0} Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig Source5: %{git_runc}/archive/%{commit_runc}/runc-%{shortcommit_runc}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -#ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} -# skip s390x (rhbz#1466865) -ExclusiveArch: x86_64 aarch64 ppc64le +ExcludeArch: ppc64 # 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 @@ -570,6 +566,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* Thu Jul 13 2017 Lokesh Mandvekar - 1.0.0.alpha.0-3.gitfa25b38 +- enable all arches except ppc64 because it's been removed from goarches + * Thu Jul 13 2017 Lokesh Mandvekar - 1.0.0.alpha.0-2.gitfa25b38 - built commit fa25b38 - Provides: crio From a587369966cb68ecf5df55556910e82ef715a2ab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 05:38:08 +0000 Subject: [PATCH 016/202] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 2f687f2..c8137cb 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Version: 1.0.0.alpha.0 -Release: 3.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -566,6 +566,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.0.0.alpha.0-4.gitfa25b38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Jul 13 2017 Lokesh Mandvekar - 1.0.0.alpha.0-3.gitfa25b38 - enable all arches except ppc64 because it's been removed from goarches From 465b8baa3221e63c0c50ad6e717210f91c5339ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 19:16:00 +0000 Subject: [PATCH 017/202] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index c8137cb..0599507 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Version: 1.0.0.alpha.0 -Release: 4.git%{shortcommit0}%{?dist} +Release: 5.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -566,6 +566,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.0.0.alpha.0-5.gitfa25b38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.0.0.alpha.0-4.gitfa25b38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 6015b56ab60f899b95dfdba0c195023c366ee052 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 3 Aug 2017 13:16:03 +0000 Subject: [PATCH 018/202] 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 --- .gitignore | 1 + cri-o.spec | 37 +++++++++++++++++-------------------- sources | 4 ++-- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index d5fdc15..3c56866 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /plugins-dcf7368.tar.gz /cri-o-91977d3.tar.gz /cri-o-fa25b38.tar.gz +/cri-o-66d96e7.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 0599507..99773ee 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,27 +25,23 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 fa25b381b153780faafc5535ca29f3b0a6c94944 +%global commit0 66d96e77e33bf773781e2a8313e8a73b9c679caa %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -# runc -%global git_runc https://github.com/opencontainers/runc/ -%global commit_runc 67bd2ab554bdf8a604f020e57448b37ef2102171 -%global shortcommit_runc %(c=%{commit_runc}; echo ${c:0:7}) - %global service_name crio Name: cri-o -Version: 1.0.0.alpha.0 -Release: 5.git%{shortcommit0}%{?dist} +Version: 1.0.0.beta.0 +Release: 1.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig -Source5: %{git_runc}/archive/%{commit_runc}/runc-%{shortcommit_runc}.tar.gz ExcludeArch: ppc64 +Provides: %{repo} + # 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 @@ -60,6 +56,7 @@ BuildRequires: pkgconfig(systemd) BuildRequires: device-mapper-devel Requires(pre): container-selinux Requires: skopeo-containers +Requires: runc >= runc-1.0.1 Provides: %{repo} = %{version}-%{release} Provides: %{service_name} = %{version}-%{release} Obsoletes: ocid <= 0.3 @@ -421,14 +418,11 @@ providing packages with %{import_path} prefix. %autosetup -Sgit -n %{name}-%{commit0} sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/%{service_name}.service -tar zxf %{SOURCE5} - %build mkdir _build pushd _build mkdir -p src/%{provider}.%{provider_tld}/{%{project},opencontainers} ln -s $(dirs +1 -l) src/%{import_path} -ln -s $(dirs +1 -l)/runc-%{commit_runc} src/%{provider}.%{provider_tld}/opencontainers/runc popd ln -s vendor src @@ -440,14 +434,9 @@ make binaries ./%{service_name} \ --selinux=true \ --storage-driver=overlay2 \ - --runtime /usr/libexec/%{service_name}/runc \ --conmon /usr/libexec/%{service_name}/conmon \ --cgroup-manager=systemd config > %{service_name}.conf -pushd _build/src/github.com/opencontainers/runc -make BUILDTAGS="seccomp selinux" -popd - %install make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd install.completions @@ -459,8 +448,6 @@ install -p -m 755 kpod %{buildroot}%{_bindir} install -p -m 755 conmon/conmon %{buildroot}%{_libexecdir}/%{service_name} install -p -m 755 pause/pause %{buildroot}%{_libexecdir}/%{service_name} -install -p -m 755 runc-%{commit_runc}/runc %{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 @@ -559,13 +546,23 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %dir %{_libexecdir}/%{service_name} %{_libexecdir}/%{service_name}/conmon %{_libexecdir}/%{service_name}/pause -%{_libexecdir}/%{service_name}/runc %{_unitdir}/%{service_name}.service +%{_unitdir}/cri-o.service %{_unitdir}/%{service_name}-shutdown.service %dir %{_sharedstatedir}/containers %{_datadir}/bash-completion/completions/* %changelog +* 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 + * Wed Aug 02 2017 Fedora Release Engineering - 1.0.0.alpha.0-5.gitfa25b38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index ef61048..575f86d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (cri-o-fa25b38.tar.gz) = 24cf7155b8845828a3e153354bd19d15ce2b3dffb7f1db099d5bd019cad42a6309a9c99c726ece6d91c2c5af9eecf71fa38a65acb08235d5c6a1a00eedd0521d -SHA512 (runc-67bd2ab.tar.gz) = 4aac5f3d00ab022c0d0e4140f0e8caaa37aeb9cdc31b95485a3094e3b7082f1b617337d860777016807b2f16a3dc1a6e5b768af1a9e61d806fe763c7e1dcde28 +SHA512 (plugins-dcf7368.tar.gz) = 59b035790870e4349ad9c4ad34c655618bdba7fce8927c2efbcf0f205d7365e0e2b5a853335282f3193b4b8d9ebb41152a828d2d12d3613421a303e6feb8e1ab +SHA512 (cri-o-66d96e7.tar.gz) = c83e52e33cf4a3146914b2f631092f2983c065845d98a681f3c1b2d7b9b92c5506de5051745bc3fa214b8c7321331d45c830bd088ffd81fefc11906c3591091c From 3ed3a4c7f1e0f31588d8ce1fd4669016a6d55ef3 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 3 Aug 2017 13:25:28 +0000 Subject: [PATCH 019/202] 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 --- cri-o.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/cri-o.spec b/cri-o.spec index 99773ee..a2310da 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -50,6 +50,7 @@ BuildRequires: glib2-devel BuildRequires: glibc-static BuildRequires: go-md2man BuildRequires: gpgme-devel +BuildRequires: ostree-devel BuildRequires: libassuan-devel BuildRequires: libseccomp-static BuildRequires: pkgconfig(systemd) From db3fbf2a3fb893cc82de02356300f1396012aa38 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 3 Aug 2017 14:58:06 +0000 Subject: [PATCH 020/202] 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 --- arm.patch | 20 ++++++++++++++++++++ cri-o.spec | 1 + 2 files changed, 21 insertions(+) create mode 100644 arm.patch diff --git a/arm.patch b/arm.patch new file mode 100644 index 0000000..4c642d3 --- /dev/null +++ b/arm.patch @@ -0,0 +1,20 @@ +From 0b67f5cfac21119c16953cbdb174e47a141c559b Mon Sep 17 00:00:00 2001 +From: Antonio Murdaca +Date: Thu, 3 Aug 2017 16:35:40 +0200 +Subject: [PATCH] oci: fix build condition + +Signed-off-by: Antonio Murdaca +--- + oci/finished.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/oci/finished.go b/oci/finished.go +index e19051bdd..9fedbfb7a 100644 +--- a/oci/finished.go ++++ b/oci/finished.go +@@ -1,4 +1,4 @@ +-// +build !arm !386 ++// +build !arm,!386 + + package oci + diff --git a/cri-o.spec b/cri-o.spec index a2310da..bb4ce5d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -39,6 +39,7 @@ URL: https://%{provider_prefix} Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig +Patch: arm.patch ExcludeArch: ppc64 Provides: %{repo} From 113878be4511ea9474204443705bbc3b478511e3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 11 Aug 2017 14:51:13 +0000 Subject: [PATCH 021/202] BR: make 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 bb4ce5d..5e4637f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -56,6 +56,7 @@ BuildRequires: libassuan-devel BuildRequires: libseccomp-static BuildRequires: pkgconfig(systemd) BuildRequires: device-mapper-devel +BuildRequires: make Requires(pre): container-selinux Requires: skopeo-containers Requires: runc >= runc-1.0.1 From 8c6e7d747ca35c1c38cda134a7eece16f13ca153 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 8 Sep 2017 11:08:02 -0400 Subject: [PATCH 022/202] runc-1.0.0.beta.0-2.gitf9387ac - bump to latest master - use runc >= 2:1.0.0-10 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + arm.patch | 20 -------------------- cri-o.spec | 16 ++++++++-------- sources | 3 +-- 4 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 arm.patch diff --git a/.gitignore b/.gitignore index 3c56866..e836c4e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /cri-o-91977d3.tar.gz /cri-o-fa25b38.tar.gz /cri-o-66d96e7.tar.gz +/cri-o-f9387ac.tar.gz diff --git a/arm.patch b/arm.patch deleted file mode 100644 index 4c642d3..0000000 --- a/arm.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0b67f5cfac21119c16953cbdb174e47a141c559b Mon Sep 17 00:00:00 2001 -From: Antonio Murdaca -Date: Thu, 3 Aug 2017 16:35:40 +0200 -Subject: [PATCH] oci: fix build condition - -Signed-off-by: Antonio Murdaca ---- - oci/finished.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/oci/finished.go b/oci/finished.go -index e19051bdd..9fedbfb7a 100644 ---- a/oci/finished.go -+++ b/oci/finished.go -@@ -1,4 +1,4 @@ --// +build !arm !386 -+// +build !arm,!386 - - package oci - diff --git a/cri-o.spec b/cri-o.spec index 5e4637f..1be879b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,21 +25,20 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 66d96e77e33bf773781e2a8313e8a73b9c679caa +%global commit0 f9387aca28439b81b7af12311fecf6f9f798f223 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio Name: cri-o Version: 1.0.0.beta.0 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig -Patch: arm.patch ExcludeArch: ppc64 Provides: %{repo} @@ -51,7 +50,6 @@ BuildRequires: glib2-devel BuildRequires: glibc-static BuildRequires: go-md2man BuildRequires: gpgme-devel -BuildRequires: ostree-devel BuildRequires: libassuan-devel BuildRequires: libseccomp-static BuildRequires: pkgconfig(systemd) @@ -59,7 +57,7 @@ BuildRequires: device-mapper-devel BuildRequires: make Requires(pre): container-selinux Requires: skopeo-containers -Requires: runc >= runc-1.0.1 +Requires: runc >= 2:1.0.0-10 Provides: %{repo} = %{version}-%{release} Provides: %{service_name} = %{version}-%{release} Obsoletes: ocid <= 0.3 @@ -429,10 +427,8 @@ ln -s $(dirs +1 -l) src/%{import_path} popd ln -s vendor src - -make docs export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -make binaries +BUILDTAGS='selinux seccomp btrfs_noversion $(shell hack/libdm_tag.sh) containers_image_ostree_stub' make binaries docs ./%{service_name} \ --selinux=true \ @@ -556,6 +552,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* Tue Sep 5 2017 Lokesh Mandvekar - 1.0.0.beta.0-2.gitf9387ac +- bump to latest master +- use runc >= 2:1.0.0-10 + * Thu Aug 3 2017 Dan Walsh - 1.0.0.beta.0-1.git66d96e7 - Beta Release - Additional registry support diff --git a/sources b/sources index 575f86d..eca864e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (plugins-dcf7368.tar.gz) = 59b035790870e4349ad9c4ad34c655618bdba7fce8927c2efbcf0f205d7365e0e2b5a853335282f3193b4b8d9ebb41152a828d2d12d3613421a303e6feb8e1ab -SHA512 (cri-o-66d96e7.tar.gz) = c83e52e33cf4a3146914b2f631092f2983c065845d98a681f3c1b2d7b9b92c5506de5051745bc3fa214b8c7321331d45c830bd088ffd81fefc11906c3591091c +SHA512 (cri-o-f9387ac.tar.gz) = e69f6e372fd749fb87e8e51f936cf10d4dea5f07cbaaad6c31c76865ddbc7b7b4b52388c1a333512dab430d1f98a6f75b201fb8518c74b00ca6f4f09e7a94a3b From d9c5ef635d9161ce49795119a2e0c5ae87e22439 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 8 Sep 2017 15:09:26 -0400 Subject: [PATCH 023/202] cri-o-1.0.0.beta.0-3.gitf9387ac - btrfs_noversion in BUILDTAGS for previous build was in error Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 1be879b..6ded29f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -32,7 +32,7 @@ Name: cri-o Version: 1.0.0.beta.0 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -428,7 +428,7 @@ popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -BUILDTAGS='selinux seccomp btrfs_noversion $(shell hack/libdm_tag.sh) containers_image_ostree_stub' make binaries docs +BUILDTAGS='selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) containers_image_ostree_stub' make binaries docs ./%{service_name} \ --selinux=true \ @@ -552,6 +552,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* Tue Sep 5 2017 Lokesh Mandvekar - 1.0.0.beta.0-3.gitf9387ac +- btrfs_noversion in BUILDTAGS for previous build was in error + * Tue Sep 5 2017 Lokesh Mandvekar - 1.0.0.beta.0-2.gitf9387ac - bump to latest master - use runc >= 2:1.0.0-10 From 9a8cdeb6ef2e6b4072a5099d1fbe28d4dc475fe9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 8 Sep 2017 21:53:02 +0000 Subject: [PATCH 024/202] Bugs, stability and performance fixes Moved from kubernetes 1.6 to 1.7 cadvisor isupport Full kube e2e tests coverage. We are now gating pull requests on kube e2e (we were gating them just on node-e2e). Continue working on kpod kpod cp kpod diff kpod export kpod logs kpod mount kpod ps kpod rename kpod stats kpod umount --- .gitignore | 1 + cri-o.spec | 20 ++++++++++++++++++-- sources | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e836c4e..a38add7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /cri-o-fa25b38.tar.gz /cri-o-66d96e7.tar.gz /cri-o-f9387ac.tar.gz +/cri-o-bb1da97.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 6ded29f..e5c403a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,13 +25,13 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 f9387aca28439b81b7af12311fecf6f9f798f223 +%global commit0 bb1da978e30b3d32f988e30568b5161e8cfd700b %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio Name: cri-o -Version: 1.0.0.beta.0 +Version: 1.0.0.rc.1 Release: 3.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 @@ -552,6 +552,22 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* Fri Sep 8 2017 Dan Walsh - 1.0.0.rc.1-1.gitbb1da97 +- Bugs, stability and performance fixes +- Moved from kubernetes 1.6 to 1.7 +- cadvisor isupport +- Full kube e2e tests coverage. We are now gating pull requests on kube e2e (we were gating them just on node-e2e). +- Continue working on kpod +- kpod cp +- kpod diff +- kpod export +- kpod logs +- kpod mount +- kpod ps +- kpod rename +- kpod stats +- kpod umount + * Tue Sep 5 2017 Lokesh Mandvekar - 1.0.0.beta.0-3.gitf9387ac - btrfs_noversion in BUILDTAGS for previous build was in error diff --git a/sources b/sources index eca864e..aa2cffe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-f9387ac.tar.gz) = e69f6e372fd749fb87e8e51f936cf10d4dea5f07cbaaad6c31c76865ddbc7b7b4b52388c1a333512dab430d1f98a6f75b201fb8518c74b00ca6f4f09e7a94a3b +SHA512 (cri-o-bb1da97.tar.gz) = 0ac441b88287857b2fda76a53a740a904cb7d71b64680a9436ea373c742417e2c0b140c5de5a8b8dba65e900f997ad723ee513bd3d5c6665273ff17de571c935 From 31fd47bc527d180d98ed5257d3d0f4fd400149b9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 8 Sep 2017 22:09:21 +0000 Subject: [PATCH 025/202] Bugs, stability and performance fixes Moved from kubernetes 1.6 to 1.7 cadvisor isupport Full kube e2e tests coverage. We are now gating pull requests on kube e2e (we were gating them just on node-e2e). Continue working on kpod kpod cp kpod diff kpod export kpod logs kpod mount kpod ps kpod rename kpod stats kpod umount --- cri-o.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index e5c403a..72f7f55 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -31,8 +31,8 @@ %global service_name crio Name: cri-o -Version: 1.0.0.rc.1 -Release: 3.git%{shortcommit0}%{?dist} +Version: 1.0.0.rc1 +Release: 1.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -552,7 +552,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog -* Fri Sep 8 2017 Dan Walsh - 1.0.0.rc.1-1.gitbb1da97 +* Fri Sep 8 2017 Dan Walsh - 1.0.0.rc1-1.gitbb1da97 - Bugs, stability and performance fixes - Moved from kubernetes 1.6 to 1.7 - cadvisor isupport From 2bcc4e0975ca31304e98e9543873b6d13ab96732 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 12 Sep 2017 15:44:26 +0000 Subject: [PATCH 026/202] Change default storage to overlay not overlay2, which shoulf fix issues with kpod working out of the box. --- cri-o.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 72f7f55..0784170 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -32,7 +32,7 @@ Name: cri-o Version: 1.0.0.rc1 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -432,7 +432,7 @@ BUILDTAGS='selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) ./%{service_name} \ --selinux=true \ - --storage-driver=overlay2 \ + --storage-driver=overlay \ --conmon /usr/libexec/%{service_name}/conmon \ --cgroup-manager=systemd config > %{service_name}.conf @@ -552,6 +552,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* Tue Sep 12 2017 Dan Walsh - 1.0.0.rc1-2.gitbb1da97 +- Change default storage to overlay not overlay2, which shoulf fix issues with kpod working out of the box. + * Fri Sep 8 2017 Dan Walsh - 1.0.0.rc1-1.gitbb1da97 - Bugs, stability and performance fixes - Moved from kubernetes 1.6 to 1.7 From 9df9c7b5819228b1db2a1033c6e7e414aa1d9d28 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 18 Sep 2017 11:19:23 -0400 Subject: [PATCH 027/202] packaging changes - disable devel package golang(github.com/Microsoft/go-winio) not found - remove redundant Provides: cri-o - always build with bundled deps Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 117 +---------------------------------------------------- 1 file changed, 1 insertion(+), 116 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 0784170..5f20a0d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,12 +1,10 @@ %if 0%{?fedora} || 0%{?rhel} == 6 -%global with_devel 1 -%global with_bundled 1 +%global with_devel 0 %global with_debug 0 %global with_check 1 %global with_unit_test 0 %else %global with_devel 0 -%global with_bundled 0 %global with_debug 0 %global with_check 0 %global with_unit_test 0 @@ -40,8 +38,6 @@ Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0} Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig ExcludeArch: ppc64 -Provides: %{repo} - # 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 @@ -58,7 +54,6 @@ BuildRequires: make Requires(pre): container-selinux Requires: skopeo-containers Requires: runc >= 2:1.0.0-10 -Provides: %{repo} = %{version}-%{release} Provides: %{service_name} = %{version}-%{release} Obsoletes: ocid <= 0.3 Provides: ocid = %{version}-%{release} @@ -76,112 +71,6 @@ Recommends: containernetworking-plugins >= 0.5.2-2 %package devel Summary: %{summary} BuildArch: noarch - -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(github.com/BurntSushi/toml) -BuildRequires: golang(github.com/Microsoft/go-winio) -BuildRequires: golang(github.com/Sirupsen/logrus) -BuildRequires: golang(github.com/containernetworking/cni/libcni) -BuildRequires: golang(github.com/containernetworking/cni/pkg/invoke) -BuildRequires: golang(github.com/containernetworking/cni/pkg/types) -BuildRequires: golang(github.com/containernetworking/cni/pkg/version) -BuildRequires: golang(github.com/containers/image/directory) -BuildRequires: golang(github.com/containers/image/directory/explicitfilepath) -BuildRequires: golang(github.com/containers/image/docker) -BuildRequires: golang(github.com/containers/image/docker/policyconfiguration) -BuildRequires: golang(github.com/containers/image/image) -BuildRequires: golang(github.com/containers/image/manifest) -BuildRequires: golang(github.com/containers/image/oci/layout) -BuildRequires: golang(github.com/containers/image/openshift) -BuildRequires: golang(github.com/containers/image/transports) -BuildRequires: golang(github.com/containers/image/types) -BuildRequires: golang(github.com/containers/image/version) -BuildRequires: golang(github.com/docker/distribution) -BuildRequires: golang(github.com/docker/distribution/context) -BuildRequires: golang(github.com/docker/distribution/digest) -BuildRequires: golang(github.com/docker/distribution/reference) -BuildRequires: golang(github.com/docker/distribution/uuid) -BuildRequires: golang(github.com/docker/docker/api/types/blkiodev) -BuildRequires: golang(github.com/docker/docker/api/types/container) -BuildRequires: golang(github.com/docker/docker/api/types/mount) -BuildRequires: golang(github.com/docker/docker/api/types/strslice) -BuildRequires: golang(github.com/docker/docker/api/types/versions) -BuildRequires: golang(github.com/docker/docker/daemon/graphdriver) -BuildRequires: golang(github.com/docker/docker/image) -BuildRequires: golang(github.com/docker/docker/image/v1) -BuildRequires: golang(github.com/docker/docker/layer) -BuildRequires: golang(github.com/docker/docker/pkg/archive) -BuildRequires: golang(github.com/docker/docker/pkg/chrootarchive) -BuildRequires: golang(github.com/docker/docker/pkg/fileutils) -BuildRequires: golang(github.com/docker/docker/pkg/homedir) -BuildRequires: golang(github.com/docker/docker/pkg/idtools) -BuildRequires: golang(github.com/docker/docker/pkg/ioutils) -BuildRequires: golang(github.com/docker/docker/pkg/longpath) -BuildRequires: golang(github.com/docker/docker/pkg/mount) -BuildRequires: golang(github.com/docker/docker/pkg/plugins) -BuildRequires: golang(github.com/docker/docker/pkg/plugins/transport) -BuildRequires: golang(github.com/docker/docker/pkg/pools) -BuildRequires: golang(github.com/docker/docker/pkg/promise) -BuildRequires: golang(github.com/docker/docker/pkg/random) -BuildRequires: golang(github.com/docker/docker/pkg/reexec) -BuildRequires: golang(github.com/docker/docker/pkg/registrar) -BuildRequires: golang(github.com/docker/docker/pkg/stringid) -BuildRequires: golang(github.com/docker/docker/pkg/system) -BuildRequires: golang(github.com/docker/docker/pkg/truncindex) -BuildRequires: golang(github.com/docker/docker/plugin/getter) -BuildRequires: golang(github.com/docker/docker/reference) -BuildRequires: golang(github.com/docker/go-connections/nat) -BuildRequires: golang(github.com/docker/go-connections/sockets) -BuildRequires: golang(github.com/docker/go-connections/tlsconfig) -BuildRequires: golang(github.com/docker/go-units) -BuildRequires: golang(github.com/docker/libtrust) -BuildRequires: golang(github.com/ghodss/yaml) -BuildRequires: golang(github.com/gogo/protobuf/proto) -BuildRequires: golang(github.com/golang/glog) -BuildRequires: golang(github.com/golang/protobuf/proto) -BuildRequires: golang(github.com/gorilla/context) -BuildRequires: golang(github.com/gorilla/mux) -BuildRequires: golang(github.com/imdario/mergo) -BuildRequires: golang(github.com/opencontainers/image-spec/specs-go) -BuildRequires: golang(github.com/opencontainers/image-spec/specs-go/v1) -BuildRequires: golang(github.com/opencontainers/runc/libcontainer/label) -BuildRequires: golang(github.com/opencontainers/runc/libcontainer/selinux) -BuildRequires: golang(github.com/opencontainers/runc/libcontainer/system) -BuildRequires: golang(github.com/opencontainers/runc/libcontainer/user) -BuildRequires: golang(github.com/opencontainers/runtime-spec/specs-go) -BuildRequires: golang(github.com/opencontainers/runtime-tools/generate) -BuildRequires: golang(github.com/rajatchopra/ocicni) -BuildRequires: golang(github.com/syndtr/gocapability/capability) -BuildRequires: golang(github.com/tchap/go-patricia/patricia) -BuildRequires: golang(github.com/vbatts/tar-split/archive/tar) -BuildRequires: golang(github.com/vbatts/tar-split/tar/asm) -BuildRequires: golang(github.com/vbatts/tar-split/tar/storage) -BuildRequires: golang(golang.org/x/net/context) -BuildRequires: golang(golang.org/x/net/http2) -BuildRequires: golang(golang.org/x/net/http2/hpack) -BuildRequires: golang(golang.org/x/net/internal/timeseries) -BuildRequires: golang(golang.org/x/net/proxy) -BuildRequires: golang(golang.org/x/net/trace) -BuildRequires: golang(golang.org/x/sys/unix) -BuildRequires: golang(google.golang.org/grpc) -BuildRequires: golang(google.golang.org/grpc/codes) -BuildRequires: golang(google.golang.org/grpc/credentials) -BuildRequires: golang(google.golang.org/grpc/grpclog) -BuildRequires: golang(google.golang.org/grpc/internal) -BuildRequires: golang(google.golang.org/grpc/metadata) -BuildRequires: golang(google.golang.org/grpc/naming) -BuildRequires: golang(google.golang.org/grpc/peer) -BuildRequires: golang(google.golang.org/grpc/transport) -BuildRequires: golang(gopkg.in/yaml.v2) -BuildRequires: golang(k8s.io/kubernetes/pkg/fields) -BuildRequires: golang(k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime) -BuildRequires: golang(k8s.io/kubernetes/pkg/selection) -BuildRequires: golang(k8s.io/kubernetes/pkg/util/errors) -BuildRequires: golang(k8s.io/kubernetes/pkg/util/homedir) -BuildRequires: golang(k8s.io/kubernetes/pkg/util/net) -BuildRequires: golang(k8s.io/kubernetes/pkg/util/sets) -%endif - Requires: golang(github.com/BurntSushi/toml) Requires: golang(github.com/Microsoft/go-winio) Requires: golang(github.com/Sirupsen/logrus) @@ -493,11 +382,7 @@ sort -u -o devel.file-list devel.file-list %check %if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} -%endif %endif From 57d274effbdd5aa6ccce4375a99df235226194c6 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 20 Sep 2017 10:09:52 -0400 Subject: [PATCH 028/202] cri-o-1.0.0-1.rc2.git0fc411d - bump to v1.0.0-rc2 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 a38add7..48f282d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /cri-o-66d96e7.tar.gz /cri-o-f9387ac.tar.gz /cri-o-bb1da97.tar.gz +/cri-o-0fc411d.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 5f20a0d..dadc1b2 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -23,14 +23,14 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 bb1da978e30b3d32f988e30568b5161e8cfd700b +%global commit0 0fc411d4fe0c3277eba106f6b98704ab7748d297 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio Name: cri-o -Version: 1.0.0.rc1 -Release: 2.git%{shortcommit0}%{?dist} +Version: 1.0.0 +Release: 1.rc2.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -437,6 +437,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog +* Wed Sep 20 2017 Lokesh Mandvekar - 1.0.0-1.rc2.git0fc411d +- bump to v1.0.0-rc2 + * Tue Sep 12 2017 Dan Walsh - 1.0.0.rc1-2.gitbb1da97 - Change default storage to overlay not overlay2, which shoulf fix issues with kpod working out of the box. diff --git a/sources b/sources index aa2cffe..5ccbb05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-bb1da97.tar.gz) = 0ac441b88287857b2fda76a53a740a904cb7d71b64680a9436ea373c742417e2c0b140c5de5a8b8dba65e900f997ad723ee513bd3d5c6665273ff17de571c935 +SHA512 (cri-o-0fc411d.tar.gz) = 7e2414ba3c0bcb72374a5efbb1adcd431e038d2ba79e368b0e011cd43139f1a024b21bc603fcf3a59c7ccca44812d04ce64e8b4230605ddf3128cf0b87bf17e9 From 7a2cea75b92b0cf0217a11774a5ddba4e088cb2f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 20 Sep 2017 10:25:06 -0400 Subject: [PATCH 029/202] cri-o-1.0.0-1.rc2.git0fc411d correct v1.0.0-rc2 commit used 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 dadc1b2..4672da4 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -23,7 +23,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 0fc411d4fe0c3277eba106f6b98704ab7748d297 +%global commit0 6784a66f2ddb3113233faebce706dfe2b6a4925e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -437,7 +437,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/bash-completion/completions/* %changelog -* Wed Sep 20 2017 Lokesh Mandvekar - 1.0.0-1.rc2.git0fc411d +* Wed Sep 20 2017 Lokesh Mandvekar - 1.0.0-1.rc2.git6784a66 - bump to v1.0.0-rc2 * Tue Sep 12 2017 Dan Walsh - 1.0.0.rc1-2.gitbb1da97 From 4ca57c09441a87096bc2940783010ff289ef4857 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 20 Sep 2017 10:31:05 -0400 Subject: [PATCH 030/202] import source for v1.0.0-rc2 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 48f282d..1264bb6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /cri-o-f9387ac.tar.gz /cri-o-bb1da97.tar.gz /cri-o-0fc411d.tar.gz +/cri-o-6784a66.tar.gz diff --git a/sources b/sources index 5ccbb05..c1d2a94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-0fc411d.tar.gz) = 7e2414ba3c0bcb72374a5efbb1adcd431e038d2ba79e368b0e011cd43139f1a024b21bc603fcf3a59c7ccca44812d04ce64e8b4230605ddf3128cf0b87bf17e9 +SHA512 (cri-o-6784a66.tar.gz) = bd91c3827f3f795d4431612e29efc0c9c5997c051acae99b5f9e767e824d25bd2fceb7fc8f1c98b80476c81e0f22af51b6b772206aa44b84f343fd89dfc263a8 From af78346778a128227a0cd5fd927a8e498f9c3528 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 3 Oct 2017 05:35:24 -0400 Subject: [PATCH 031/202] cri-o-1.0.0-1.rc3.dev.gita8ea146 - bump to 1.0.0-rc3.dev - built commit a8ea146 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1264bb6..447c6ca 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /cri-o-bb1da97.tar.gz /cri-o-0fc411d.tar.gz /cri-o-6784a66.tar.gz +/cri-o-a8ea146.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 4672da4..0384154 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -23,14 +23,14 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 6784a66f2ddb3113233faebce706dfe2b6a4925e +%global commit0 a8ea146d7167d866a30927dc062c17967cda8a5b %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio Name: cri-o Version: 1.0.0 -Release: 1.rc2.git%{shortcommit0}%{?dist} +Release: 1.rc3.dev.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -435,8 +435,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_unitdir}/%{service_name}-shutdown.service %dir %{_sharedstatedir}/containers %{_datadir}/bash-completion/completions/* +%dir %{_datadir}/oci-umount +%dir %{_datadir}/oci-umount/oci-umount.d +%{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-1.rc3.dev.gita8ea146 +- bump to 1.0.0-rc3.dev +- built commit a8ea146 + * Wed Sep 20 2017 Lokesh Mandvekar - 1.0.0-1.rc2.git6784a66 - bump to v1.0.0-rc2 diff --git a/sources b/sources index c1d2a94..272ddc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-6784a66.tar.gz) = bd91c3827f3f795d4431612e29efc0c9c5997c051acae99b5f9e767e824d25bd2fceb7fc8f1c98b80476c81e0f22af51b6b772206aa44b84f343fd89dfc263a8 +SHA512 (cri-o-a8ea146.tar.gz) = bec2794b5a5d1ffad84aa8188bc09bb3e04c90b4be7b3113b598e9ed0a9c0492cc719b63865fc552012e70fbb70b2b2e589a6f36d3e42d1441f7ad4fe86058e0 From 395affe08cb6198ac524f2689a81d3011fc21936 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 3 Oct 2017 08:28:59 -0400 Subject: [PATCH 032/202] use BR: libseccomp-devel for centos 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 0384154..8bc104c 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -47,7 +47,11 @@ BuildRequires: glibc-static BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel +%if 0%{?centos} +BuildRequires: libseccomp-devel +%else BuildRequires: libseccomp-static +%endif BuildRequires: pkgconfig(systemd) BuildRequires: device-mapper-devel BuildRequires: make From bc230224cb96e9344cd0f70f8faaa68cd49ac210 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Oct 2017 09:09:46 -0400 Subject: [PATCH 033/202] cri-o-1.0.0-2.rc3.dev.gita8ea146 - adjust runc dep for CentOS Virt SIG builds Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 8bc104c..5bf90b6 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Name: cri-o Version: 1.0.0 -Release: 1.rc3.dev.git%{shortcommit0}%{?dist} +Release: 2.rc3.dev.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -57,7 +57,11 @@ BuildRequires: device-mapper-devel BuildRequires: make Requires(pre): container-selinux Requires: skopeo-containers +%if 0%{?fedora} Requires: runc >= 2:1.0.0-10 +%else +Requires: runc >= 1.0.0-10 +%endif Provides: %{service_name} = %{version}-%{release} Obsoletes: ocid <= 0.3 Provides: ocid = %{version}-%{release} @@ -444,6 +448,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-2.rc3.dev.gita8ea146 +- adjust runc dep for CentOS Virt SIG builds + * Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-1.rc3.dev.gita8ea146 - bump to 1.0.0-rc3.dev - built commit a8ea146 From 2c3f97a10638582ab806d53969bad31eabe25771 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 5 Oct 2017 14:21:18 -0400 Subject: [PATCH 034/202] cri-o-1.0.0-3.rc3.gitd2c6f64 - build v1.0.0-rc3 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 447c6ca..d592792 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /cri-o-0fc411d.tar.gz /cri-o-6784a66.tar.gz /cri-o-a8ea146.tar.gz +/cri-o-d2c6f64.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 5bf90b6..e9aaffe 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -23,14 +23,14 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 a8ea146d7167d866a30927dc062c17967cda8a5b +%global commit0 d2c6f64125de8cc0ce04cd22a66733e898e9538d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio Name: cri-o Version: 1.0.0 -Release: 2.rc3.dev.git%{shortcommit0}%{?dist} +Release: 3.rc3.git%{shortcommit0}%{?dist} Summary: OCI-based implementation of Kubernetes Container Runtime Interface License: ASL 2.0 URL: https://%{provider_prefix} @@ -448,6 +448,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-3.rc3.gitd2c6f64 +- build v1.0.0-rc3 tag + * Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-2.rc3.dev.gita8ea146 - adjust runc dep for CentOS Virt SIG builds diff --git a/sources b/sources index 272ddc0..fd8cea8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-a8ea146.tar.gz) = bec2794b5a5d1ffad84aa8188bc09bb3e04c90b4be7b3113b598e9ed0a9c0492cc719b63865fc552012e70fbb70b2b2e589a6f36d3e42d1441f7ad4fe86058e0 +SHA512 (cri-o-d2c6f64.tar.gz) = 1e8ca877827bf2b0f4440308edd1e56d2d518ca2d7bb3d1653eab4b25fcab45b1cfa4e8e3712f2256ca527cf2d0eb5f89ef5a7a832d4b9f5e4c9c65a80b8514e From f4809bf48f9bfa826f3a3c6ecf2727f2cf29788e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 13 Oct 2017 14:53:56 -0400 Subject: [PATCH 035/202] use /usr/libexec/cni for plugin_dir - remove references to /opt since it's against Fedora Guidelines. - require/recommend containernetworking-plugins >= 0.5.2-7 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 e9aaffe..4f9b7ba 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -67,9 +67,9 @@ Obsoletes: ocid <= 0.3 Provides: ocid = %{version}-%{release} %if 0%{?centos} -Requires: containernetworking-plugins >= 0.5.2-2 +Requires: containernetworking-plugins >= 0.5.2-7 %else -Recommends: containernetworking-plugins >= 0.5.2-2 +Recommends: containernetworking-plugins >= 0.5.2-7 %endif # centos %description @@ -331,6 +331,7 @@ BUILDTAGS='selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) --selinux=true \ --storage-driver=overlay \ --conmon /usr/libexec/%{service_name}/conmon \ + --cni-plugin-dir /usr/libexec/cni \ --cgroup-manager=systemd config > %{service_name}.conf %install From 5d56f219c710dd45b2e20b0163838f225fecffc8 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 13 Oct 2017 20:25:35 +0000 Subject: [PATCH 036/202] Bump to Version 1.0.0 --- cri-o.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 4f9b7ba..f01b0cc 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -23,15 +23,15 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 d2c6f64125de8cc0ce04cd22a66733e898e9538d +%global commit0 cd1bac5ee06f0e6e150711180a59d136d4726694 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio Name: cri-o Version: 1.0.0 -Release: 3.rc3.git%{shortcommit0}%{?dist} -Summary: OCI-based implementation of Kubernetes Container Runtime Interface +Release: 4.git%{shortcommit0}%{?dist} +Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz @@ -332,6 +332,7 @@ BUILDTAGS='selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) --storage-driver=overlay \ --conmon /usr/libexec/%{service_name}/conmon \ --cni-plugin-dir /usr/libexec/cni \ + --default-mounts /usr/share/rhel/secrets:/run/secrets \ --cgroup-manager=systemd config > %{service_name}.conf %install @@ -449,6 +450,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Fri Oct 13 2017 Dan Walsh - 1.0.0-4.gitcd1bac5 +- Release v1.0.0 +- Performance improvements +- Add secrets patch to default mount directories from the host into containers +- Add kpod login/logout +- Change debug flag to log-level, allows admin to specify the loggin level +- Bump to kube v1.7.8 +- Build with go 1.8.4 + * Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-3.rc3.gitd2c6f64 - build v1.0.0-rc3 tag From f627cbca1cae26e1beb8e4778a0fd2de76b69f8d Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 13 Oct 2017 20:33:59 +0000 Subject: [PATCH 037/202] Release v1.0.0 Performance improvements Add secrets patch to default mount directories from the host into containers Add kpod login/logout Change debug flag to log-level, allows admin to specify the loggin level Bump to kube v1.7.8 Build with go 1.8.4 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d592792..e640bdd 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /cri-o-6784a66.tar.gz /cri-o-a8ea146.tar.gz /cri-o-d2c6f64.tar.gz +/cri-o-cd1bac5.tar.gz diff --git a/sources b/sources index fd8cea8..4bb3761 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-d2c6f64.tar.gz) = 1e8ca877827bf2b0f4440308edd1e56d2d518ca2d7bb3d1653eab4b25fcab45b1cfa4e8e3712f2256ca527cf2d0eb5f89ef5a7a832d4b9f5e4c9c65a80b8514e +SHA512 (cri-o-cd1bac5.tar.gz) = 990b0249bcedd955c53fa2d04f5e46c7ff0874dac6b55e19eb8c6c7bad31952e6dfbbe92a1a30dbcfe39503375a11a32f0e521e067ca81f4b1c90339df1a71cd From 5adf4fe3ac472f42a81f515e2bf96eb70d8d94b3 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 16 Oct 2017 21:50:20 +0000 Subject: [PATCH 038/202] Get the correct checksum --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e640bdd..5ff7915 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /cri-o-a8ea146.tar.gz /cri-o-d2c6f64.tar.gz /cri-o-cd1bac5.tar.gz +/cri-o-a636972.tar.gz diff --git a/cri-o.spec b/cri-o.spec index f01b0cc..c09ce51 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -23,14 +23,14 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 cd1bac5ee06f0e6e150711180a59d136d4726694 +%global commit0 a636972c3e3c86e398a4fa0d7b76386d4683072e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio Name: cri-o Version: 1.0.0 -Release: 4.git%{shortcommit0}%{?dist} +Release: 5.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -314,7 +314,6 @@ providing packages with %{import_path} prefix. %prep %autosetup -Sgit -n %{name}-%{commit0} -sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/%{service_name}.service %build mkdir _build @@ -336,6 +335,7 @@ BUILDTAGS='selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) --cgroup-manager=systemd config > %{service_name}.conf %install +sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/%{service_name}.service make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd install.completions # install binaries @@ -450,6 +450,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Mon Oct 16 2017 Dan Walsh - 1.0.0-5.gita636972 +- Get the correct checksum + * Fri Oct 13 2017 Dan Walsh - 1.0.0-4.gitcd1bac5 - Release v1.0.0 - Performance improvements diff --git a/sources b/sources index 4bb3761..5cda81a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-cd1bac5.tar.gz) = 990b0249bcedd955c53fa2d04f5e46c7ff0874dac6b55e19eb8c6c7bad31952e6dfbbe92a1a30dbcfe39503375a11a32f0e521e067ca81f4b1c90339df1a71cd +SHA512 (cri-o-a636972.tar.gz) = ee072a74a2c19fd3cdea76c132a8caad5ba9eba56816ab43a83191c425509a17d33bd3d48cc8199e3b42cf81fc5efe10086e24d53e7701f5b7f925edd5dca5b1 From beb2a431596eca91b2a9c182aa77afc9a0b38a4f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 17 Oct 2017 08:54:59 -0400 Subject: [PATCH 039/202] override kernel check for centos 7 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 c09ce51..913b517 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -332,6 +332,9 @@ BUILDTAGS='selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) --conmon /usr/libexec/%{service_name}/conmon \ --cni-plugin-dir /usr/libexec/cni \ --default-mounts /usr/share/rhel/secrets:/run/secrets \ +%if 0%{?centos} + --storage-opt overlay.override_kernel_check=1 \ +%endif --cgroup-manager=systemd config > %{service_name}.conf %install From 952333569ce6dc305787041c277545b8b1387169 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 19 Oct 2017 16:52:20 +0000 Subject: [PATCH 040/202] Add Epoch --- cri-o.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 913b517..4c515b4 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -29,8 +29,11 @@ %global service_name crio Name: cri-o +%if 0%{?fedora} || 0%{?rhel} == 6 +Epoch: 2 +%endif Version: 1.0.0 -Release: 5.git%{shortcommit0}%{?dist} +Release: 6.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -453,6 +456,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Mon Oct 16 2017 Dan Walsh - 1.0.0-6.gita636972 +- Add epoch to make sure that this installs + * Mon Oct 16 2017 Dan Walsh - 1.0.0-5.gita636972 - Get the correct checksum From ecb7c348ee057d4472c3b53f5e7edd7ba46e332d Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 25 Oct 2017 18:02:34 +0000 Subject: [PATCH 041/202] Lots of bug fixes Fixes to pass cri-tools tests --- .gitignore | 1 + cri-o.spec | 10 +++++++--- sources | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5ff7915..f607379 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /cri-o-d2c6f64.tar.gz /cri-o-cd1bac5.tar.gz /cri-o-a636972.tar.gz +/cri-o-64a30e1.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 4c515b4..762a34f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -23,7 +23,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 a636972c3e3c86e398a4fa0d7b76386d4683072e +%global commit0 64a30e16547f1f93e20e6bc0b2e81ab2e04319bd %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -32,8 +32,8 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.0.0 -Release: 6.git%{shortcommit0}%{?dist} +Version: 1.0.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -456,6 +456,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Wed Oct 25 2017 Dan Walsh - 1.0.1-1.git64a30e1 +- Lots of bug fixes +- Fixes to pass cri-tools tests + * Mon Oct 16 2017 Dan Walsh - 1.0.0-6.gita636972 - Add epoch to make sure that this installs diff --git a/sources b/sources index 5cda81a..6946d54 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (cri-o-a636972.tar.gz) = ee072a74a2c19fd3cdea76c132a8caad5ba9eba56816ab43a83191c425509a17d33bd3d48cc8199e3b42cf81fc5efe10086e24d53e7701f5b7f925edd5dca5b1 +SHA512 (cri-o-64a30e1.tar.gz) = 5b597b913c5c7f544010e8da028aed1fcb669868c3e246b55f5be191b17bcf1bce474705ea4fe72469d8b0d6c9e582827b067ff82e8f9deb3e847475d4e65ab3 From 11da5ede25495a88d206df9365d6be2120e298cb Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 25 Oct 2017 14:27:40 -0400 Subject: [PATCH 042/202] cri-o-1.0.1-2.git64a30e1 - packaging fixes to handle epoch Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 762a34f..9424f6c 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -33,7 +33,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.0.1 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -51,29 +51,28 @@ BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel %if 0%{?centos} -BuildRequires: libseccomp-devel %else -BuildRequires: libseccomp-static %endif BuildRequires: pkgconfig(systemd) BuildRequires: device-mapper-devel BuildRequires: make Requires(pre): container-selinux -Requires: skopeo-containers %if 0%{?fedora} +BuildRequires: libseccomp-static Requires: runc >= 2:1.0.0-10 +Requires: skopeo-containers >= 0.1.24-6 +Recommends: containernetworking-plugins >= 0.5.2-7 +Provides: %{service_name} = %{epoch}:%{version}-%{release} +Provides: ocid = %{epoch}:%{version}-%{release} %else +BuildRequires: libseccomp-devel Requires: runc >= 1.0.0-10 -%endif +Requires: skopeo-containers >= 1:0.1.24-6 +Requires: containernetworking-plugins >= 0.5.2-7 Provides: %{service_name} = %{version}-%{release} -Obsoletes: ocid <= 0.3 Provides: ocid = %{version}-%{release} - -%if 0%{?centos} -Requires: containernetworking-plugins >= 0.5.2-7 -%else -Recommends: containernetworking-plugins >= 0.5.2-7 -%endif # centos +%endif +Obsoletes: ocid <= 0.3 %description %{summary} @@ -456,6 +455,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Wed Oct 25 2017 Lokesh Mandvekar - 1.0.1-2.git64a30e1 +- packaging fixes to handle epoch + * Wed Oct 25 2017 Dan Walsh - 1.0.1-1.git64a30e1 - Lots of bug fixes - Fixes to pass cri-tools tests From 04fff411565d4ce9b12a7bc97ff7039feaa06942 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 25 Oct 2017 14:31:26 -0400 Subject: [PATCH 043/202] remove empty if-else conditional 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 9424f6c..a63998b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -50,9 +50,6 @@ BuildRequires: glibc-static BuildRequires: go-md2man BuildRequires: gpgme-devel BuildRequires: libassuan-devel -%if 0%{?centos} -%else -%endif BuildRequires: pkgconfig(systemd) BuildRequires: device-mapper-devel BuildRequires: make From ef0e5ec5505e9b534d2f6082564592a34f20ae04 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 30 Oct 2017 20:34:07 +0000 Subject: [PATCH 044/202] Lots of bug fixes Fixes to pass cri-tools tests --- .gitignore | 1 + cri-o.spec | 11 ++++++----- sources | 3 +-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f607379..06c199e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cri-o-cd1bac5.tar.gz /cri-o-a636972.tar.gz /cri-o-64a30e1.tar.gz +/cri-o-748bc46.tar.gz diff --git a/cri-o.spec b/cri-o.spec index a63998b..c8401b0 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -23,7 +23,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 64a30e16547f1f93e20e6bc0b2e81ab2e04319bd +%global commit0 748bc46605589d6021f0f15b3b44284cccd986ca %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -32,8 +32,8 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.0.1 -Release: 2.git%{shortcommit0}%{?dist} +Version: 1.0.2 +Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -452,8 +452,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog -* Wed Oct 25 2017 Lokesh Mandvekar - 1.0.1-2.git64a30e1 -- packaging fixes to handle epoch +* 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 diff --git a/sources b/sources index 6946d54..501be27 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (cri-o-a636972.tar.gz) = ee072a74a2c19fd3cdea76c132a8caad5ba9eba56816ab43a83191c425509a17d33bd3d48cc8199e3b42cf81fc5efe10086e24d53e7701f5b7f925edd5dca5b1 -SHA512 (cri-o-64a30e1.tar.gz) = 5b597b913c5c7f544010e8da028aed1fcb669868c3e246b55f5be191b17bcf1bce474705ea4fe72469d8b0d6c9e582827b067ff82e8f9deb3e847475d4e65ab3 +SHA512 (cri-o-748bc46.tar.gz) = 7e63cf6f300543a95a01e58c508c49be4d888b9347bde3c5acd64dc99d6e69ee3162fd290200c8e5411115ba5e313d3f59a370d3be72af66df2992b800d35166 From a872723927fe95de53e8f0ad7e3a00bff0a0fb5f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 9 Nov 2017 15:04:51 -0500 Subject: [PATCH 045/202] cri-o-1.0.3-1.git17bcfb4 - bump to v1.0.3 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 29 ++++++++++++++++++++++------- sources | 2 +- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 06c199e..4daa4a7 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /cri-o-a636972.tar.gz /cri-o-64a30e1.tar.gz /cri-o-748bc46.tar.gz +/cri-o-17bcfb4.tar.gz diff --git a/cri-o.spec b/cri-o.spec index c8401b0..89ea83b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,6 +1,6 @@ %if 0%{?fedora} || 0%{?rhel} == 6 %global with_devel 0 -%global with_debug 0 +%global with_debug 1 %global with_check 1 %global with_unit_test 0 %else @@ -16,6 +16,10 @@ %global debug_package %{nil} %endif +%if ! 0%{?gobuild:1} +%define gobuild(o:) go build -buildmode=pie -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 @@ -23,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 748bc46605589d6021f0f15b3b44284cccd986ca +%global commit0 17bcfb495caf9454911c8b8e28134194ce947d5a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -32,7 +36,7 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.0.2 +Version: 1.0.3 Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -313,6 +317,7 @@ providing packages with %{import_path} prefix. %prep %autosetup -Sgit -n %{name}-%{commit0} +sed -i '/strip/d' pause/Makefile %build mkdir _build @@ -323,7 +328,14 @@ popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -BUILDTAGS='selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) containers_image_ostree_stub' make binaries docs +export BUILDTAGS='selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) containers_image_ostree_stub' + +mkdir bin +BUILDTAGS=$BUILDTAGS make conmon pause docs + +GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o %{service_name} %{import_path}/cmd/%{service_name} +GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o %{service_name}ctl %{import_path}/cmd/%{service_name}ctl +GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o kpod %{import_path}/cmd/kpod ./%{service_name} \ --selinux=true \ @@ -343,10 +355,10 @@ make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.s # install binaries install -dp %{buildroot}{%{_bindir},%{_libexecdir}/%{service_name}} install -p -m 755 %{service_name} %{buildroot}%{_bindir} -install -p -m 755 crioctl %{buildroot}%{_bindir} +install -p -m 755 %{service_name}ctl %{buildroot}%{_bindir} install -p -m 755 kpod %{buildroot}%{_bindir} -install -p -m 755 conmon/conmon %{buildroot}%{_libexecdir}/%{service_name} -install -p -m 755 pause/pause %{buildroot}%{_libexecdir}/%{service_name} +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 @@ -452,6 +464,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Thu Nov 09 2017 Lokesh Mandvekar - 1.0.3-1.git17bcfb4 +- bump to v1.0.3 + * Mon Oct 30 2017 Dan Walsh - 1.0.2-1.git748bc46 - Lots of bug fixes - Fixes to pass cri-tools tests diff --git a/sources b/sources index 501be27..eaec6f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-748bc46.tar.gz) = 7e63cf6f300543a95a01e58c508c49be4d888b9347bde3c5acd64dc99d6e69ee3162fd290200c8e5411115ba5e313d3f59a370d3be72af66df2992b800d35166 +SHA512 (cri-o-17bcfb4.tar.gz) = 7d39454b49081c4884adf8ae5dc7e6e6d4554dfa9c2b3bf36255608cf5712fdcb3d0327b2618e914eb59905752da0342ae8c09a9f45e1dc1ee287b7da1b9b258 From e313e471774cf0dfbb16dd1140c847494f1dd4ce Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 10 Nov 2017 07:57:44 -0500 Subject: [PATCH 046/202] enable debuginfo along with custom buildtags Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 89ea83b..8964625 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -16,9 +16,9 @@ %global debug_package %{nil} %endif -%if ! 0%{?gobuild:1} -%define gobuild(o:) go build -buildmode=pie -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -tags ${BUILDTAGS} -a -v -x %{?**}; -%endif +#%%if ! 0%%{?gobuild:1} +%define gobuild(o:) go build -tags="$BUILDTAGS rpm_crashtraceback" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; +#%%endif %global provider github %global provider_tld com @@ -328,16 +328,14 @@ popd ln -s vendor src export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} -export BUILDTAGS='selinux seccomp $(shell hack/btrfs_tag.sh) $(shell hack/libdm_tag.sh) containers_image_ostree_stub' +export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub" -mkdir bin +GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} +GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{service_name}ctl %{import_path}/cmd/%{service_name}ctl +GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/kpod %{import_path}/cmd/kpod BUILDTAGS=$BUILDTAGS make conmon pause docs -GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o %{service_name} %{import_path}/cmd/%{service_name} -GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o %{service_name}ctl %{import_path}/cmd/%{service_name}ctl -GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o kpod %{import_path}/cmd/kpod - -./%{service_name} \ +./bin/%{service_name} \ --selinux=true \ --storage-driver=overlay \ --conmon /usr/libexec/%{service_name}/conmon \ @@ -354,9 +352,9 @@ make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.s # install binaries install -dp %{buildroot}{%{_bindir},%{_libexecdir}/%{service_name}} -install -p -m 755 %{service_name} %{buildroot}%{_bindir} -install -p -m 755 %{service_name}ctl %{buildroot}%{_bindir} -install -p -m 755 kpod %{buildroot}%{_bindir} +install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir} +install -p -m 755 bin/%{service_name}ctl %{buildroot}%{_bindir} +install -p -m 755 bin/kpod %{buildroot}%{_bindir} install -p -m 755 bin/conmon %{buildroot}%{_libexecdir}/%{service_name} install -p -m 755 bin/pause %{buildroot}%{_libexecdir}/%{service_name} From a637d26633bae4f542ebfbf579f9c013fca0d232 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 13 Nov 2017 11:17:07 +0000 Subject: [PATCH 047/202] bump v1.8.0 Add support for Kubernetes v1.8 --- .gitignore | 1 + cri-o.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4daa4a7..28fc2d1 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /cri-o-64a30e1.tar.gz /cri-o-748bc46.tar.gz /cri-o-17bcfb4.tar.gz +/cri-o-80f54bc.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 8964625..a0ab96d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 17bcfb495caf9454911c8b8e28134194ce947d5a +%global commit0 80f54bc14dface589a872db95453a457310aa195 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,7 +36,7 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.0.3 +Version: 1.8.0 Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -462,6 +462,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Mon Nov 13 2017 Dan Walsh - 1.8.0-1.git80f54bc1 +- bump v1.8.0 +- Add support for Kubernetes v1.8 + * Thu Nov 09 2017 Lokesh Mandvekar - 1.0.3-1.git17bcfb4 - bump to v1.0.3 diff --git a/sources b/sources index eaec6f5..d40df6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-17bcfb4.tar.gz) = 7d39454b49081c4884adf8ae5dc7e6e6d4554dfa9c2b3bf36255608cf5712fdcb3d0327b2618e914eb59905752da0342ae8c09a9f45e1dc1ee287b7da1b9b258 +SHA512 (cri-o-80f54bc.tar.gz) = 1e8ea805f51909eea15f391499e603505e4406d831534d60089e38044fae6d705940944cddcc14b09662d9890158262ee91feee8d35cbd4b87e012baca555d27 From 05c212a0aed40130c3e30899c914c512f7b57495 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 13 Nov 2017 11:23:16 +0000 Subject: [PATCH 048/202] bump v1.8.0 Add support for Kubernetes v1.8 kpod support moved to the kpod package. --- cri-o.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index a0ab96d..27db586 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -332,7 +332,6 @@ export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_ta GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{service_name}ctl %{import_path}/cmd/%{service_name}ctl -GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/kpod %{import_path}/cmd/kpod BUILDTAGS=$BUILDTAGS make conmon pause docs ./bin/%{service_name} \ @@ -354,7 +353,6 @@ make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.s install -dp %{buildroot}{%{_bindir},%{_libexecdir}/%{service_name}} install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir} install -p -m 755 bin/%{service_name}ctl %{buildroot}%{_bindir} -install -p -m 755 bin/kpod %{buildroot}%{_bindir} install -p -m 755 bin/conmon %{buildroot}%{_libexecdir}/%{service_name} install -p -m 755 bin/pause %{buildroot}%{_libexecdir}/%{service_name} @@ -437,9 +435,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %license LICENSE %doc README.md %{_bindir}/%{service_name} -%{_bindir}/kpod %{_bindir}/%{service_name}ctl -%{_mandir}/man1/kpod* %{_mandir}/man5/%{service_name}.conf.5* %{_mandir}/man8/%{service_name}.8* %dir %{_sysconfdir}/%{service_name} @@ -465,6 +461,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} * Mon Nov 13 2017 Dan Walsh - 1.8.0-1.git80f54bc1 - bump v1.8.0 - Add support for Kubernetes v1.8 +- kpod support moved to the kpod package. * Thu Nov 09 2017 Lokesh Mandvekar - 1.0.3-1.git17bcfb4 - bump to v1.0.3 From 603a13cf48effdf51837ff0be0fce937b03f4c66 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 13 Nov 2017 11:55:26 +0000 Subject: [PATCH 049/202] bump v1.8.0 Add support for Kubernetes v1.8 kpod support moved to the kpod package. --- cri-o.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 27db586..175bb23 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -347,7 +347,7 @@ BUILDTAGS=$BUILDTAGS make conmon pause docs %install sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/%{service_name}.service -make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd install.completions +make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd # install binaries install -dp %{buildroot}{%{_bindir},%{_libexecdir}/%{service_name}} @@ -365,7 +365,6 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/%{service_name}-storage install -dp %{buildroot}%{_mandir}/man{1,5,8} -install -m 644 docs/*.1 %{buildroot}%{_mandir}/man1 install -m 644 docs/*.5 %{buildroot}%{_mandir}/man5 install -m 644 docs/*.8 %{buildroot}%{_mandir}/man8 @@ -445,6 +444,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %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 @@ -452,7 +452,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_unitdir}/cri-o.service %{_unitdir}/%{service_name}-shutdown.service %dir %{_sharedstatedir}/containers -%{_datadir}/bash-completion/completions/* %dir %{_datadir}/oci-umount %dir %{_datadir}/oci-umount/oci-umount.d %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf From aeb29ac23b158222bcc70df99ccc8ba0b0602f0b Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 14 Nov 2017 08:57:35 -0500 Subject: [PATCH 050/202] enable debuginfo across the board 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 175bb23..057f95c 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,11 +1,11 @@ +%global with_debug 1 + %if 0%{?fedora} || 0%{?rhel} == 6 %global with_devel 0 -%global with_debug 1 %global with_check 1 %global with_unit_test 0 %else %global with_devel 0 -%global with_debug 0 %global with_check 0 %global with_unit_test 0 %endif From b28a6bcad582aeeada22a3d822c0269af94dfb18 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 22 Nov 2017 16:26:09 +0000 Subject: [PATCH 051/202] Add /proc/scsi to masked paths --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 28fc2d1..c1da266 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /cri-o-748bc46.tar.gz /cri-o-17bcfb4.tar.gz /cri-o-80f54bc.tar.gz +/cri-o-32d1708.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 057f95c..e202a69 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 80f54bc14dface589a872db95453a457310aa195 +%global commit0 32d1708dcb99f15547ec5dbdadc19ee669ab13dc %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,7 +36,7 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.8.0 +Version: 1.8.1 Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -457,6 +457,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_datadir}/oci-umount/oci-umount.d/%{service_name}-umount.conf %changelog +* Wed Nov 22 2017 Dan Walsh - 1.8.1-1.git32d1708d +- Add /proc/scsi to masked paths + * Mon Nov 13 2017 Dan Walsh - 1.8.0-1.git80f54bc1 - bump v1.8.0 - Add support for Kubernetes v1.8 diff --git a/sources b/sources index d40df6e..2e15aa5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-80f54bc.tar.gz) = 1e8ea805f51909eea15f391499e603505e4406d831534d60089e38044fae6d705940944cddcc14b09662d9890158262ee91feee8d35cbd4b87e012baca555d27 +SHA512 (cri-o-32d1708.tar.gz) = 1cc688410b1ba4b384d2d2a42905c8f81e318d4690709921fb83bdaba59a313d195a5999ec327b1911923e2a650bbbbd1c88a6c0999086c71cf724647223966d From 1d6de9230bc8dbbf19de5e2aaf20c080c39e4ec2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 28 Nov 2017 15:02:42 -0500 Subject: [PATCH 052/202] cri-o-2:1.8.1-2.git32d1708d - separate conmon into a separate subpackage Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index e202a69..e06f4b9 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,13 +1,11 @@ %global with_debug 1 +%global with_devel 0 +%global with_unit_test 0 %if 0%{?fedora} || 0%{?rhel} == 6 -%global with_devel 0 %global with_check 1 -%global with_unit_test 0 %else -%global with_devel 0 %global with_check 0 -%global with_unit_test 0 %endif %if 0%{?with_debug} @@ -37,7 +35,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.8.1 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -315,6 +313,17 @@ This package contains unit tests for project providing packages with %{import_path} prefix. %endif +%package -n conmon +Summary: OCI container runtime monitor +%if 0%{?fedora} +Requires: %{name} >= %{epoch}:%{version}-%{release} +%else +Requires: %{name} >= %{version}-%{release} +%endif + +%description -n conmon +conmon is an OCI container runtime monitor. + %prep %autosetup -Sgit -n %{name}-%{commit0} sed -i '/strip/d' pause/Makefile @@ -446,7 +455,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %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}/cri-o.service @@ -456,7 +464,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 +* Tue Nov 28 2017 Lokesh Mandvekar - 2:1.8.1-2.git32d1708d +- separate conmon into a separate subpackage + * Wed Nov 22 2017 Dan Walsh - 1.8.1-1.git32d1708d - Add /proc/scsi to masked paths From 17fdd2e06c7a37b6936ba2dea546778e7413ffe7 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 29 Nov 2017 08:53:49 -0500 Subject: [PATCH 053/202] cri-o-2:1.8.2-1.git3de7ab4c - bump to v1.8.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 c1da266..6ad5866 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /cri-o-17bcfb4.tar.gz /cri-o-80f54bc.tar.gz /cri-o-32d1708.tar.gz +/cri-o-3de7ab4.tar.gz diff --git a/cri-o.spec b/cri-o.spec index e06f4b9..ba76ca2 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,7 +25,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 32d1708dcb99f15547ec5dbdadc19ee669ab13dc +%global commit0 3de7ab4c095a2f684149356a87fadefb09405f1f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -34,8 +34,8 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.8.1 -Release: 2.git%{shortcommit0}%{?dist} +Version: 1.8.2 +Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -470,6 +470,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Nov 29 2017 Lokesh Mandvekar - 2:1.8.2-1.git3de7ab4c +- bump to v1.8.2 + * Tue Nov 28 2017 Lokesh Mandvekar - 2:1.8.1-2.git32d1708d - separate conmon into a separate subpackage diff --git a/sources b/sources index 2e15aa5..d781f67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-32d1708.tar.gz) = 1cc688410b1ba4b384d2d2a42905c8f81e318d4690709921fb83bdaba59a313d195a5999ec327b1911923e2a650bbbbd1c88a6c0999086c71cf724647223966d +SHA512 (cri-o-3de7ab4.tar.gz) = a45f1eaf963861b37d976e4aa35ade586ccd2494d08a6370de7035a3e1716398ecd1e31c53367b75c2f501de18f4f55560736d4629659b36afc1401c737edbb2 From 8f7f0ebaf67e89eab9615610012327373e2f819e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Wed, 29 Nov 2017 09:48:31 -0500 Subject: [PATCH 054/202] cri-o-2:1.8.2-2.git3de7ab4c - add additional deps From: Antonio Murdaca Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index ba76ca2..3a12653 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -35,7 +35,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.8.2 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -56,6 +56,9 @@ BuildRequires: pkgconfig(systemd) BuildRequires: device-mapper-devel BuildRequires: make Requires(pre): container-selinux +Requires: socat +Requires: iptables +Requires: iproute %if 0%{?fedora} BuildRequires: libseccomp-static Requires: runc >= 2:1.0.0-10 @@ -470,6 +473,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Nov 29 2017 Lokesh Mandvekar - 2:1.8.2-2.git3de7ab4c +- add additional deps +- From: Antonio Murdaca + * Wed Nov 29 2017 Lokesh Mandvekar - 2:1.8.2-1.git3de7ab4c - bump to v1.8.2 From 30a728de658a76d86d706cf54d0c3efed55f5e0a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 30 Nov 2017 11:28:03 -0500 Subject: [PATCH 055/202] cri-o-2:1.8.2-3.git3de7ab4c - cri-o should require conmon and not the other way around Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 3a12653..70f7a3d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -35,7 +35,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.8.2 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -59,6 +59,7 @@ Requires(pre): container-selinux Requires: socat Requires: iptables Requires: iproute +Requires: conmon %if 0%{?fedora} BuildRequires: libseccomp-static Requires: runc >= 2:1.0.0-10 @@ -318,11 +319,6 @@ providing packages with %{import_path} prefix. %package -n conmon Summary: OCI container runtime monitor -%if 0%{?fedora} -Requires: %{name} >= %{epoch}:%{version}-%{release} -%else -Requires: %{name} >= %{version}-%{release} -%endif %description -n conmon conmon is an OCI container runtime monitor. @@ -473,6 +469,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Nov 30 2017 Lokesh Mandvekar - 2:1.8.2-3.git3de7ab4c +- cri-o should require conmon and not the other way around + * Wed Nov 29 2017 Lokesh Mandvekar - 2:1.8.2-2.git3de7ab4c - add additional deps - From: Antonio Murdaca From 4ef23ddae01a07aad1678a3df00cf34dc85922f7 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 10 Dec 2017 13:30:15 +0000 Subject: [PATCH 056/202] Update to kubernetes 1.9.0 cri requirements --- .gitignore | 2 ++ cri-o.spec | 15 ++++++++++++--- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6ad5866..f8650c2 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /cri-o-80f54bc.tar.gz /cri-o-32d1708.tar.gz /cri-o-3de7ab4.tar.gz +/cri-o-d9922a9.tar.gz +/cri-o-0ab5e80.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 70f7a3d..d311467 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,7 +25,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 3de7ab4c095a2f684149356a87fadefb09405f1f +%global commit0 0ab5e80c3856d27600fb3df83c75517483e5a0bf %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -34,8 +34,8 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.8.2 -Release: 3.git%{shortcommit0}%{?dist} +Version: 1.9.0 +Release: 1.beta.1git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -469,6 +469,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sun Dec 10 2017 Dan Walsh - 2:1.9.0-1.beta.1.git0ab5e80 +- Update to kubernetes 1.9.0 cri requirements + +* Sun Dec 10 2017 Dan Walsh - 2:1.8.3-1.gitd9922a9 +- container_create: fix apparmor from container config +- container_create: correctly set image and kube envs +- oci: do not append conmon env to container process +- container_exec: use process file with runc exec + * Thu Nov 30 2017 Lokesh Mandvekar - 2:1.8.2-3.git3de7ab4c - cri-o should require conmon and not the other way around diff --git a/sources b/sources index d781f67..5ed69c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-3de7ab4.tar.gz) = a45f1eaf963861b37d976e4aa35ade586ccd2494d08a6370de7035a3e1716398ecd1e31c53367b75c2f501de18f4f55560736d4629659b36afc1401c737edbb2 +SHA512 (cri-o-0ab5e80.tar.gz) = 4a4e57590cc7ac853c3b70d8ad8196d21a315c7f1c1cb97047da20d826ba8a54621108016ceaac602cbb1d489454b74ce2d0bd4af05473d2109bbfb4bb2b08e8 From 6f630a2a7f249f3230d35bed11a6dffb3ce64c5a Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 11 Dec 2017 16:05:47 +0000 Subject: [PATCH 057/202] Update to kubernetes 1.9.0 beta 2 cri requirements container_exec: fix terminal true process json lib: sandbox: refactor to memory store --- .gitignore | 1 + cri-o.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f8650c2..74c041c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /cri-o-3de7ab4.tar.gz /cri-o-d9922a9.tar.gz /cri-o-0ab5e80.tar.gz +/cri-o-a85ea60.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d311467..d142936 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,7 +25,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 0ab5e80c3856d27600fb3df83c75517483e5a0bf +%global commit0 a85ea609db33ce5da282a02873021a3fdfb6562f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -35,7 +35,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.9.0 -Release: 1.beta.1git%{shortcommit0}%{?dist} +Release: 2.beta.2git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -469,8 +469,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Dec 11 2017 Dan Walsh - 2:1.9.0-1.beta.1.gita85ea60 +- Update to kubernetes 1.9.0 beta 2 cri requirements +- container_exec: fix terminal true process json +- lib: sandbox: refactor to memory store + * Sun Dec 10 2017 Dan Walsh - 2:1.9.0-1.beta.1.git0ab5e80 -- Update to kubernetes 1.9.0 cri requirements +- Update to kubernetes 1.9.0 beta 1 cri requirements * Sun Dec 10 2017 Dan Walsh - 2:1.8.3-1.gitd9922a9 - container_create: fix apparmor from container config diff --git a/sources b/sources index 5ed69c8..54c8017 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-0ab5e80.tar.gz) = 4a4e57590cc7ac853c3b70d8ad8196d21a315c7f1c1cb97047da20d826ba8a54621108016ceaac602cbb1d489454b74ce2d0bd4af05473d2109bbfb4bb2b08e8 +SHA512 (cri-o-a85ea60.tar.gz) = f23da421ef7f46e091fdd1b0c88fe8b23304ff84dd3e46ea404204fc9df9f6c831c7dbe078a1d3a32789bbaa6d2cf7c97345d298da9b80a881fae44c77054054 From 2d46326ab826f0ce9bdf617d0419aa2de931462a Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 15 Dec 2017 15:22:52 +0000 Subject: [PATCH 058/202] Final Release 1.9.0 --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 74c041c..4361b22 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /cri-o-d9922a9.tar.gz /cri-o-0ab5e80.tar.gz /cri-o-a85ea60.tar.gz +/cri-o-814c6ab.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d142936..585718b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -25,7 +25,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 a85ea609db33ce5da282a02873021a3fdfb6562f +%global commit0 814c6ab0913d827543696b366048056a31d9529c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -35,7 +35,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.9.0 -Release: 2.beta.2git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -469,6 +469,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Dec 15 2017 Dan Walsh - 2:1.9.0-3.gita85ea60 +- Final Release 1.9.0 + * Mon Dec 11 2017 Dan Walsh - 2:1.9.0-1.beta.1.gita85ea60 - Update to kubernetes 1.9.0 beta 2 cri requirements - container_exec: fix terminal true process json diff --git a/sources b/sources index 54c8017..15a5330 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-a85ea60.tar.gz) = f23da421ef7f46e091fdd1b0c88fe8b23304ff84dd3e46ea404204fc9df9f6c831c7dbe078a1d3a32789bbaa6d2cf7c97345d298da9b80a881fae44c77054054 +SHA512 (cri-o-814c6ab.tar.gz) = ef261b26f781f355671b060314d471e23db656cf4d8cee2d16fdbad3d5368bab51c405bf7e32788b0758a78a4e611f97e2e14ebaca56ac03b5b4a26ad028bf35 From 5569063a9f5a01877238410ab6bbafabbf4e26e9 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 15 Dec 2017 18:21:33 +0000 Subject: [PATCH 059/202] Final Release 1.9.0 --- cri-o.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 585718b..55b1bd2 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -339,7 +339,6 @@ export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(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} -GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{service_name}ctl %{import_path}/cmd/%{service_name}ctl BUILDTAGS=$BUILDTAGS make conmon pause docs ./bin/%{service_name} \ From 21021c20e9f08bdf2b2ca60c0d6d40ee5f0e40a8 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 15 Dec 2017 18:25:25 +0000 Subject: [PATCH 060/202] Final Release 1.9.0 --- cri-o.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 55b1bd2..1a2e232 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -359,7 +359,6 @@ make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.s # install binaries install -dp %{buildroot}{%{_bindir},%{_libexecdir}/%{service_name}} install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir} -install -p -m 755 bin/%{service_name}ctl %{buildroot}%{_bindir} install -p -m 755 bin/conmon %{buildroot}%{_libexecdir}/%{service_name} install -p -m 755 bin/pause %{buildroot}%{_libexecdir}/%{service_name} @@ -441,7 +440,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %license LICENSE %doc README.md %{_bindir}/%{service_name} -%{_bindir}/%{service_name}ctl %{_mandir}/man5/%{service_name}.conf.5* %{_mandir}/man8/%{service_name}.8* %dir %{_sysconfdir}/%{service_name} From b9c2486177e30ab3332140291ebf2929e5115e58 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 18 Dec 2017 17:27:34 +0530 Subject: [PATCH 061/202] cri-o-2:1.9.0-4.gita85ea60 - need runc >= 2:1.0.0-15 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 1a2e232..4f98f6a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -35,7 +35,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.9.0 -Release: 3.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -62,14 +62,14 @@ Requires: iproute Requires: conmon %if 0%{?fedora} BuildRequires: libseccomp-static -Requires: runc >= 2:1.0.0-10 +Requires: runc >= 2:1.0.0-15 Requires: skopeo-containers >= 0.1.24-6 Recommends: containernetworking-plugins >= 0.5.2-7 Provides: %{service_name} = %{epoch}:%{version}-%{release} Provides: ocid = %{epoch}:%{version}-%{release} %else BuildRequires: libseccomp-devel -Requires: runc >= 1.0.0-10 +Requires: runc >= 1.0.0-15 Requires: skopeo-containers >= 1:0.1.24-6 Requires: containernetworking-plugins >= 0.5.2-7 Provides: %{service_name} = %{version}-%{release} @@ -466,6 +466,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Dec 18 2017 Lokesh Mandvekar - 2:1.9.0-4.gita85ea60 +- need runc >= 2:1.0.0-15 + * Fri Dec 15 2017 Dan Walsh - 2:1.9.0-3.gita85ea60 - Final Release 1.9.0 From 7fdbe1e1abf5bac654f6f64d72aa398a403ed32f Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Wed, 1 Nov 2017 09:13:54 -0600 Subject: [PATCH 062/202] Package integration tests For Fedora CI, we need RPM-installable tests. Here we package those into a new cri-o-integration-tests rpm. Note that this does not yet build an installable set of tests, because crictl (from cri-tools repo) and podman (nee kpod) are required but not yet packaged. Signed-off-by: Ed Santiago --- cri-o.spec | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 70f7a3d..cb051bf 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -4,8 +4,10 @@ %if 0%{?fedora} || 0%{?rhel} == 6 %global with_check 1 +%global with_integration_tests 1 %else %global with_check 0 +%global with_integration_tests 0 %endif %if 0%{?with_debug} @@ -39,7 +41,7 @@ Release: 3.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} -Source0: https://github.com/kubernetes-incubator/cri-o/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz +Source0: https://%{provider_prefix}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz Source3: %{service_name}-network.sysconfig Source4: %{service_name}-storage.sysconfig ExcludeArch: ppc64 @@ -323,6 +325,19 @@ Summary: OCI container runtime monitor %description -n conmon conmon is an OCI container runtime monitor. +%if 0%{?with_integration_tests} +%package integration-tests +Summary: Integration tests for %{name} +Requires: %{service_name} = %{epoch}:%{version}-%{release} +Requires: bats +Requires: containernetworking-cni +Requires: nmap-ncat +Requires: socat + +%description integration-tests +%{summary} +%endif + %prep %autosetup -Sgit -n %{name}-%{commit0} sed -i '/strip/d' pause/Makefile @@ -335,7 +350,7 @@ ln -s $(dirs +1 -l) src/%{import_path} popd ln -s vendor src -export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} +export GOPATH=$(pwd)/_build:$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(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} @@ -353,6 +368,13 @@ BUILDTAGS=$BUILDTAGS make conmon pause docs %endif --cgroup-manager=systemd config > %{service_name}.conf +%if 0%{?with_integration_tests} +export GOPATH=$(pwd)/_build +for i in bin2img copyimg checkseccomp; do + GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o test/$i/$i %{provider_prefix}/test/$i +done +%endif + %install sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/%{service_name}.service make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd @@ -403,6 +425,14 @@ for file in $(find . -iname "*_test.go"); do done %endif +%if 0%{?with_integration_tests} +install -d -p %{buildroot}/%{_datadir}/%{name}/test +cp -r test %{buildroot}/%{_datadir}/%{name}/ + +install -d -p %{buildroot}/etc/containers/registries.d +cp test/redhat_sigstore.yaml %{buildroot}/etc/containers/registries.d/registry.access.redhat.com.yaml +%endif + %if 0%{?with_devel} sort -u -o devel.file-list devel.file-list %endif @@ -438,6 +468,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %doc README.md code-of-conduct.md %endif +%if 0%{?with_integration_tests} +%files integration-tests +%license LICENSE +%doc README.md +%{_datadir}/%{name}/test/* +/etc/containers/registries.d/registry.access.redhat.com.yaml +%endif + %files %license LICENSE %doc README.md From 125ca708706875be2d12cc394b087e91fcc97013 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 24 Jan 2018 11:05:42 +0100 Subject: [PATCH 063/202] Final Release 1.9.1 --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4361b22..f8a0154 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /cri-o-0ab5e80.tar.gz /cri-o-a85ea60.tar.gz /cri-o-814c6ab.tar.gz +/cri-o-b066a83.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 037a46b..d486283 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 814c6ab0913d827543696b366048056a31d9529c +%global commit0 b066a839ec526e94e2cdefe262fb328897c83b17 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,8 +36,8 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.9.0 -Release: 4.git%{shortcommit0}%{?dist} +Version: 1.9.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Jan 24 2018 Dan Walsh - 2:1.9.1-1.gitb066a8 +- Final Release 1.9.1 + * Mon Dec 18 2017 Lokesh Mandvekar - 2:1.9.0-4.gita85ea60 - need runc >= 2:1.0.0-15 diff --git a/sources b/sources index 15a5330..d6370ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-814c6ab.tar.gz) = ef261b26f781f355671b060314d471e23db656cf4d8cee2d16fdbad3d5368bab51c405bf7e32788b0758a78a4e611f97e2e14ebaca56ac03b5b4a26ad028bf35 +SHA512 (cri-o-b066a83.tar.gz) = 3cf8f7ee447c83d7cd27b65dd5cbe3b1fe2c1c1383305d465fe2cac576255ded15c088e0949d7621c20a03e9e0e09b0e061e6595a5d71bc1a0fd6fb79563b984 From e621f5c14af1966d2cb3da1d7e0f14a88f0ec671 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:54:33 +0000 Subject: [PATCH 064/202] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index d486283..dd92003 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.9.1 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2:1.9.1-2.gitb066a83 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 24 2018 Dan Walsh - 2:1.9.1-1.gitb066a8 - Final Release 1.9.1 From d9b59ef2409ee9142261df294dbba71408e9205f Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 8 Feb 2018 17:39:01 -0500 Subject: [PATCH 065/202] 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 --- .gitignore | 1 + cri-o.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f8a0154..9579a75 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /cri-o-a85ea60.tar.gz /cri-o-814c6ab.tar.gz /cri-o-b066a83.tar.gz +/cri-o-63ea1dd.tar.gz diff --git a/cri-o.spec b/cri-o.spec index dd92003..acefe3e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 b066a839ec526e94e2cdefe262fb328897c83b17 +%global commit0 63ea1dd9bd31d29dcd4be421114d8cacb70cd8fa %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,8 +36,8 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.9.1 -Release: 2.git%{shortcommit0}%{?dist} +Version: 1.9.2 +Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* 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 Feb 07 2018 Fedora Release Engineering - 2:1.9.1-2.gitb066a83 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index d6370ef..52da579 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-b066a83.tar.gz) = 3cf8f7ee447c83d7cd27b65dd5cbe3b1fe2c1c1383305d465fe2cac576255ded15c088e0949d7621c20a03e9e0e09b0e061e6595a5d71bc1a0fd6fb79563b984 +SHA512 (cri-o-63ea1dd.tar.gz) = 7f2be03c305d1c38a2c7a9144444597b6afdc0e378dfb1f17401438f8bf3099d72909caf543a58e76c86c407fc970c09922aac67077db711aa3e2d944ad85816 From a9c59d3379f7527f4ddf3fdb3b100cc6efbcc845 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sun, 11 Feb 2018 05:31:36 -0500 Subject: [PATCH 066/202] Update containers/image and containers/storage Pick up lots of fixes in image and storage library --- .gitignore | 1 + cri-o.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9579a75..681ec9d 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /cri-o-814c6ab.tar.gz /cri-o-b066a83.tar.gz /cri-o-63ea1dd.tar.gz +/cri-o-f09b2d3.tar.gz diff --git a/cri-o.spec b/cri-o.spec index acefe3e..b3b8118 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 63ea1dd9bd31d29dcd4be421114d8cacb70cd8fa +%global commit0 f09b2d3c2c8f22879584ca2bd05a3eab4585b6e9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,7 +36,7 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.9.2 +Version: 1.9.3 Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -504,6 +504,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* 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 diff --git a/sources b/sources index 52da579..43e552e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-63ea1dd.tar.gz) = 7f2be03c305d1c38a2c7a9144444597b6afdc0e378dfb1f17401438f8bf3099d72909caf543a58e76c86c407fc970c09922aac67077db711aa3e2d944ad85816 +SHA512 (cri-o-f09b2d3.tar.gz) = 43fb1de2d87a04bec2c839d9b0c226084888aba9b04079ba9a9b6578e72e9b0ed167039e39f6f6bec6e1e4cb5ca0749f719e44bb378832e4253498f90abb5649 From feddf9c9dedb548928bc643df1e5aed5192a98db Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 15 Feb 2018 10:24:35 -0500 Subject: [PATCH 067/202] imageService: cache information about images container_create: correctly set user system container: add /var/tmp as RW --- .gitignore | 1 + cri-o.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 681ec9d..72ed79b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /cri-o-b066a83.tar.gz /cri-o-63ea1dd.tar.gz /cri-o-f09b2d3.tar.gz +/cri-o-28c7dee.tar.gz diff --git a/cri-o.spec b/cri-o.spec index b3b8118..9e11f3a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 f09b2d3c2c8f22879584ca2bd05a3eab4585b6e9 +%global commit0 28c7dee3ca1ccc1bc627b61c833aaff86f28aeff %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,7 +36,7 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.9.3 +Version: 1.9.4 Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -504,6 +504,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* 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 diff --git a/sources b/sources index 43e552e..b9c4c0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-f09b2d3.tar.gz) = 43fb1de2d87a04bec2c839d9b0c226084888aba9b04079ba9a9b6578e72e9b0ed167039e39f6f6bec6e1e4cb5ca0749f719e44bb378832e4253498f90abb5649 +SHA512 (cri-o-28c7dee.tar.gz) = 9650085c456d799fd51f68b2d9410f0e9c549cf57b4a5ddcf9edd34d8cba20a17fa86b8fd19589788adeacec6e020de09e9225815da291c74e6a45b6c8ba619d From c0089e706089232c173a23313f7d046deb585677 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 16 Feb 2018 08:33:47 -0500 Subject: [PATCH 068/202] image: Add lock around image cache access --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 72ed79b..c8f07bc 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /cri-o-63ea1dd.tar.gz /cri-o-f09b2d3.tar.gz /cri-o-28c7dee.tar.gz +/cri-o-125ec8a.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 9e11f3a..97aa477 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 28c7dee3ca1ccc1bc627b61c833aaff86f28aeff +%global commit0 125ec8a7bd7d14a4986846c082c4654e62e1fb20 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,7 +36,7 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.9.4 +Version: 1.9.5 Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* 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 diff --git a/sources b/sources index b9c4c0a..6ebed76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-28c7dee.tar.gz) = 9650085c456d799fd51f68b2d9410f0e9c549cf57b4a5ddcf9edd34d8cba20a17fa86b8fd19589788adeacec6e020de09e9225815da291c74e6a45b6c8ba619d +SHA512 (cri-o-125ec8a.tar.gz) = 497837ba7e0a86ce999da9394dc4dcbefeaff2cef72d3121a571e87b44c29fb15cbb4cbe9dc2d5fddce9a231a6a208c331106e37850184cdba6fab9064cdff31 From 2e7594986606f415dbae27c2194e8293a888786f Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 16 Feb 2018 10:44:56 -0500 Subject: [PATCH 069/202] adjust build paths Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 97aa477..42fb51c 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -343,14 +343,14 @@ Requires: socat sed -i '/strip/d' pause/Makefile %build -mkdir _build -pushd _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)/_build:$(pwd):%{gopath} +export GOPATH=$(pwd)/_output:$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(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} @@ -368,7 +368,7 @@ BUILDTAGS=$BUILDTAGS make conmon pause docs --cgroup-manager=systemd config > %{service_name}.conf %if 0%{?with_integration_tests} -export GOPATH=$(pwd)/_build +export GOPATH=$(pwd)/_output for i in bin2img copyimg checkseccomp; do GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o test/$i/$i %{provider_prefix}/test/$i done From 4cf2482ca7ec645172d71d2a1513129bf03a452d Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 21 Feb 2018 08:37:19 -0500 Subject: [PATCH 070/202] vendor: update c/image to handle text/plain from registries --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c8f07bc..56370db 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /cri-o-f09b2d3.tar.gz /cri-o-28c7dee.tar.gz /cri-o-125ec8a.tar.gz +/cri-o-5e48c92.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 42fb51c..041a24d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 125ec8a7bd7d14a4986846c082c4654e62e1fb20 +%global commit0 5e48c92074f060b01cae31fa6190cf82214051c3 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,7 +36,7 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.9.5 +Version: 1.9.6 Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* 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 diff --git a/sources b/sources index 6ebed76..ebef706 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-125ec8a.tar.gz) = 497837ba7e0a86ce999da9394dc4dcbefeaff2cef72d3121a571e87b44c29fb15cbb4cbe9dc2d5fddce9a231a6a208c331106e37850184cdba6fab9064cdff31 +SHA512 (cri-o-5e48c92.tar.gz) = 24d8d2b1a87d1bfc60b5942ca8950293ce1aeb3a0159293f72d0ee8b3e3f04fed3f668f7464fff966898dfefe9253dbd40e9f8c93b6f5bf8d59506a046663b2c From 17125f41ff10faefd0ac26d288a1eafb81aa8fa7 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 23 Feb 2018 14:06:53 -0500 Subject: [PATCH 071/202] 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 --- .gitignore | 1 + cri-o.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 56370db..b79b1a5 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /cri-o-28c7dee.tar.gz /cri-o-125ec8a.tar.gz /cri-o-5e48c92.tar.gz +/cri-o-a98f9c9.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 041a24d..035d2f6 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 5e48c92074f060b01cae31fa6190cf82214051c3 +%global commit0 a98f9c902421a2d02b650f20a587b345a2ca17f1 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,7 +36,7 @@ Name: cri-o %if 0%{?fedora} || 0%{?rhel} == 6 Epoch: 2 %endif -Version: 1.9.6 +Version: 1.9.7 Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -504,6 +504,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Feb 23 2018 Dan Walsh - 2:1.9.6-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 diff --git a/sources b/sources index ebef706..899b851 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-5e48c92.tar.gz) = 24d8d2b1a87d1bfc60b5942ca8950293ce1aeb3a0159293f72d0ee8b3e3f04fed3f668f7464fff966898dfefe9253dbd40e9f8c93b6f5bf8d59506a046663b2c +SHA512 (cri-o-a98f9c9.tar.gz) = 7964fec4c98aede78d27a781072ede42a0425939318c6b34ec0706951d0f2835383f4d93bcdc042a580ba2cc3c13dfb2020f5529bdae41603dbf8cc64442fdd3 From 78dc2d287b0a7f64ad48fe1a9296c542a2bfe96c Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 23 Feb 2018 15:12:23 -0500 Subject: [PATCH 072/202] cri-o-2:1.9.7-2.gita98f9c9 - make sure correct version in changelog Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 035d2f6..1d0ab39 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.9.7 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,7 +504,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog -* Fri Feb 23 2018 Dan Walsh - 2:1.9.6-1.gita98f9c9 +* Fri Feb 23 2018 Lokesh Mandvekar - 2:1.9.7-2.gita98f9c9 +- make sure correct version in changelog + +* 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 From 90a577a46e9e9c9a76fa62255be2d326376a2c45 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 1 Mar 2018 14:06:56 -0500 Subject: [PATCH 073/202] cri-o-2:1.9.8-1.git7d9d2aa - bump to v1.9.8 - enable integration tests for centos Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b79b1a5..f8ed55e 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /cri-o-125ec8a.tar.gz /cri-o-5e48c92.tar.gz /cri-o-a98f9c9.tar.gz +/cri-o-7d9d2aa.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 1d0ab39..e6f89fa 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -2,7 +2,7 @@ %global with_devel 0 %global with_unit_test 0 -%if 0%{?fedora} || 0%{?rhel} == 6 +%if 0%{?fedora} || 0%{?centos} %global with_check 1 %global with_integration_tests 1 %else @@ -27,17 +27,17 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 a98f9c902421a2d02b650f20a587b345a2ca17f1 +%global commit0 7d9d2aa36cc3244af2d8d5a5eb71a7ec7dcc5a8c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio Name: cri-o -%if 0%{?fedora} || 0%{?rhel} == 6 +%if 0%{?fedora} Epoch: 2 %endif -Version: 1.9.7 -Release: 2.git%{shortcommit0}%{?dist} +Version: 1.9.8 +Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Mar 01 2018 Lokesh Mandvekar - 2:1.9.8-1.git7d9d2aa +- bump to v1.9.8 +- enable integration tests for centos + * Fri Feb 23 2018 Lokesh Mandvekar - 2:1.9.7-2.gita98f9c9 - make sure correct version in changelog diff --git a/sources b/sources index 899b851..f5fdd28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-a98f9c9.tar.gz) = 7964fec4c98aede78d27a781072ede42a0425939318c6b34ec0706951d0f2835383f4d93bcdc042a580ba2cc3c13dfb2020f5529bdae41603dbf8cc64442fdd3 +SHA512 (cri-o-7d9d2aa.tar.gz) = b956a60bce1236aae6090a184cccffbf6c4df4476ca2b1a74e26032a82a06b7cdf6fc6692f5e4b22a0e497dbfcd00bc1c42667378cd9b4f2fc4b707c2a5d7d0d From dede183e2fdc712572a456c9177431810e4af58a Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 9 Mar 2018 08:09:13 -0500 Subject: [PATCH 074/202] bump to v1.9.9 --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f8ed55e..4fa886a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /cri-o-5e48c92.tar.gz /cri-o-a98f9c9.tar.gz /cri-o-7d9d2aa.tar.gz +/cri-o-4d7e7dc.tar.gz diff --git a/cri-o.spec b/cri-o.spec index e6f89fa..7567182 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 7d9d2aa36cc3244af2d8d5a5eb71a7ec7dcc5a8c +%global commit0 4d7e7dcdbdb7e071cdddc7c9b4ff2c91f5444070 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,7 +36,7 @@ Name: cri-o %if 0%{?fedora} Epoch: 2 %endif -Version: 1.9.8 +Version: 1.9.9 Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Mar 09 2018 Dan Walsh - 2:1.9.9-1.git4d7e7dc +- bump to v1.9.9 + * Thu Mar 01 2018 Lokesh Mandvekar - 2:1.9.8-1.git7d9d2aa - bump to v1.9.8 - enable integration tests for centos diff --git a/sources b/sources index f5fdd28..ffc8fa6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-7d9d2aa.tar.gz) = b956a60bce1236aae6090a184cccffbf6c4df4476ca2b1a74e26032a82a06b7cdf6fc6692f5e4b22a0e497dbfcd00bc1c42667378cd9b4f2fc4b707c2a5d7d0d +SHA512 (cri-o-4d7e7dc.tar.gz) = 022324bfc0d50b30ebcce2ae18586875671a90a2f0ced649f972588f649dab69c1153569f4b6ec26bf378402a1cccc96d33574d73d5cda490bc5eac5933ad22d From 935740fbcc3d099bc127cb14e661bcf8da99ab51 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 13 Mar 2018 08:51:29 -0400 Subject: [PATCH 075/202] bump to v1.9.10 --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4fa886a..163210c 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /cri-o-a98f9c9.tar.gz /cri-o-7d9d2aa.tar.gz /cri-o-4d7e7dc.tar.gz +/cri-o-8723732.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 7567182..1dbfa13 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 4d7e7dcdbdb7e071cdddc7c9b4ff2c91f5444070 +%global commit0 87237324485137e0f439c3011999401186b62874 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,7 +36,7 @@ Name: cri-o %if 0%{?fedora} Epoch: 2 %endif -Version: 1.9.9 +Version: 1.9.10 Release: 1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* 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 diff --git a/sources b/sources index ffc8fa6..36630f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-4d7e7dc.tar.gz) = 022324bfc0d50b30ebcce2ae18586875671a90a2f0ced649f972588f649dab69c1153569f4b6ec26bf378402a1cccc96d33574d73d5cda490bc5eac5933ad22d +SHA512 (cri-o-8723732.tar.gz) = 6e1f4f6528911b0c990e28dc61532a5aa4e4d59d6218980aea9b57aeb16b23f002118f5f2850529db5cc26f527f01ab06bc64a56425bcf72aec0ff9784c87376 From f5f37d5659a00a42cf1d3fbd59d419f7419e0a3d Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 16 Mar 2018 07:15:22 -0400 Subject: [PATCH 076/202] bump to v1.10.0-beta.1 --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 163210c..f0ead0c 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /cri-o-7d9d2aa.tar.gz /cri-o-4d7e7dc.tar.gz /cri-o-8723732.tar.gz +/cri-o-c956614.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 1dbfa13..e5edce4 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 87237324485137e0f439c3011999401186b62874 +%global commit0 c956614baec8a13c72169c127343128c29d8b035 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,8 +36,8 @@ Name: cri-o %if 0%{?fedora} Epoch: 2 %endif -Version: 1.9.10 -Release: 1.git%{shortcommit0}%{?dist} +Version: 1.10.0 +Release: 1.beta.1.git%{shortcommit0}%{?dist} Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Mar 16 2018 Dan Walsh - 2:1.10.0-beta.1 +- bump to v1.10.0-beta.1 + * Tue Mar 13 2018 Dan Walsh - 2:1.9.10-1.git8723732 - bump to v1.9.10 diff --git a/sources b/sources index 36630f7..6b731d0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (cri-o-8723732.tar.gz) = 6e1f4f6528911b0c990e28dc61532a5aa4e4d59d6218980aea9b57aeb16b23f002118f5f2850529db5cc26f527f01ab06bc64a56425bcf72aec0ff9784c87376 +SHA512 (cri-o-c956614.tar.gz) = ee485caf0d4151368af98a0fa29248194f335117a1a18c70e5c2affd95ad30a95d69f53f89d4c47499754abe961115a25f1c076996a86b94368a59cc6e9db126 From 0dc11f5a0183bb45c9b10c8ad6f865d32e32c97b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 16 Mar 2018 07:26:59 -0400 Subject: [PATCH 077/202] bump to v1.10.0-beta.1 --- sources | 1 - 1 file changed, 1 deletion(-) diff --git a/sources b/sources index 6b731d0..b041d99 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (cri-o-8723732.tar.gz) = 6e1f4f6528911b0c990e28dc61532a5aa4e4d59d6218980aea9b57aeb16b23f002118f5f2850529db5cc26f527f01ab06bc64a56425bcf72aec0ff9784c87376 SHA512 (cri-o-c956614.tar.gz) = ee485caf0d4151368af98a0fa29248194f335117a1a18c70e5c2affd95ad30a95d69f53f89d4c47499754abe961115a25f1c076996a86b94368a59cc6e9db126 From b9179ce4fc711754b203acea01a0a74f7e152832 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 26 Mar 2018 09:59:14 -0400 Subject: [PATCH 078/202] build from master branch Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 88 +++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index e5edce4..22cfd14 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -36,48 +36,48 @@ Name: cri-o %if 0%{?fedora} Epoch: 2 %endif -Version: 1.10.0 -Release: 1.beta.1.git%{shortcommit0}%{?dist} -Summary: CRI-O is the Kubernetes Container Runtime Interface for OCI-based containers -License: ASL 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit0}/%{repo}-%{shortcommit0}.tar.gz -Source3: %{service_name}-network.sysconfig -Source4: %{service_name}-storage.sysconfig -ExcludeArch: ppc64 +Version: 1.10.0 +Release: 2.git%{shortcommit0}%{?dist} +Summary: Kubernetes Container Runtime Interface for OCI-based containers +License: ASL 2.0 +URL: https://%{provider_prefix} +Source0: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Source3: %{service_name}-network.sysconfig +Source4: %{service_name}-storage.sysconfig +ExcludeArch: ppc64 # 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: pkgconfig(systemd) -BuildRequires: device-mapper-devel -BuildRequires: make -Requires(pre): container-selinux -Requires: socat -Requires: iptables -Requires: iproute -Requires: conmon +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: pkgconfig(systemd) +BuildRequires: device-mapper-devel +BuildRequires: make +Requires(pre): container-selinux +Requires: socat +Requires: iptables +Requires: iproute +Requires: conmon %if 0%{?fedora} -BuildRequires: libseccomp-static -Requires: runc >= 2:1.0.0-15 -Requires: skopeo-containers >= 0.1.24-6 -Recommends: containernetworking-plugins >= 0.5.2-7 -Provides: %{service_name} = %{epoch}:%{version}-%{release} -Provides: ocid = %{epoch}:%{version}-%{release} +BuildRequires: libseccomp-static +Requires: runc >= 2:1.0.0-15 +Requires: skopeo-containers >= 0.1.24-6 +Recommends: containernetworking-plugins >= 0.5.2-7 +Provides: %{service_name} = %{epoch}:%{version}-%{release} +Provides: ocid = %{epoch}:%{version}-%{release} %else -BuildRequires: libseccomp-devel -Requires: runc >= 1.0.0-15 -Requires: skopeo-containers >= 1:0.1.24-6 -Requires: containernetworking-plugins >= 0.5.2-7 -Provides: %{service_name} = %{version}-%{release} -Provides: ocid = %{version}-%{release} +BuildRequires: libseccomp-devel +Requires: runc >= 1.0.0-15 +Requires: skopeo-containers >= 1:0.1.24-6 +Requires: containernetworking-plugins >= 0.5.2-7 +Provides: %{service_name} = %{version}-%{release} +Provides: ocid = %{version}-%{release} %endif -Obsoletes: ocid <= 0.3 +Obsoletes: ocid <= 0.3 %description %{summary} @@ -327,12 +327,12 @@ conmon is an OCI container runtime monitor. %if 0%{?with_integration_tests} %package integration-tests -Summary: Integration tests for %{name} -Requires: %{service_name} = %{epoch}:%{version}-%{release} -Requires: bats -Requires: containernetworking-cni -Requires: nmap-ncat -Requires: socat +Summary: Integration tests for %{name} +Requires: %{service_name} = %{epoch}:%{version}-%{release} +Requires: bats +Requires: containernetworking-cni +Requires: nmap-ncat +Requires: socat %description integration-tests %{summary} From ea87f6d49aac8339087c2cfe4b7c4cf3edd07105 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 26 Mar 2018 10:24:10 -0400 Subject: [PATCH 079/202] update Makefile targets for conmon and pause 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 22cfd14..c1636b7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -354,7 +354,7 @@ export GOPATH=$(pwd)/_output:$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(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 conmon pause docs +BUILDTAGS=$BUILDTAGS make bin/conmon bin/pause docs ./bin/%{service_name} \ --selinux=true \ From 0ccf3151f387b6df97a08ee6a93f8cc773198ad0 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 26 Mar 2018 10:26:39 -0400 Subject: [PATCH 080/202] cri-o-2:1.10.0-3.gitb0f6d98 - built commit b0f6d98 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 f0ead0c..0ea885a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /cri-o-4d7e7dc.tar.gz /cri-o-8723732.tar.gz /cri-o-c956614.tar.gz +/cri-o-b0f6d98.tar.gz diff --git a/cri-o.spec b/cri-o.spec index c1636b7..720319d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 c956614baec8a13c72169c127343128c29d8b035 +%global commit0 b0f6d98b9435c094a24fe55c3e75f3daff7196ee %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Mar 26 2018 Lokesh Mandvekar - 2:1.10.0-3.gitb0f6d98 +- built commit b0f6d98 + * Fri Mar 16 2018 Dan Walsh - 2:1.10.0-beta.1 - bump to v1.10.0-beta.1 diff --git a/sources b/sources index b041d99..f53d70e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-c956614.tar.gz) = ee485caf0d4151368af98a0fa29248194f335117a1a18c70e5c2affd95ad30a95d69f53f89d4c47499754abe961115a25f1c076996a86b94368a59cc6e9db126 +SHA512 (cri-o-b0f6d98.tar.gz) = cd1637165ee66fbff8832d199d8376f6e49fa6410109c4b3ca7365c40ea78f48c5d6b27276712dc072cf891314a5d85fa1749355e5addc9a0d36083549de431c From d3b9fee0866dba12b492461c4a31516da883aa77 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 30 Mar 2018 08:27:55 -0400 Subject: [PATCH 081/202] Release of v1.10.0 --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0ea885a..0bdc473 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /cri-o-8723732.tar.gz /cri-o-c956614.tar.gz /cri-o-b0f6d98.tar.gz +/cri-o-623b502.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 720319d..a2a3450 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 b0f6d98b9435c094a24fe55c3e75f3daff7196ee +%global commit0 623b502ac773128d082ccbe2630aae9625464871 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 3.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Mar 30 2018 Dan Walsh - 2:1.10.0-4 +- Release of v1.10.0 + * Mon Mar 26 2018 Lokesh Mandvekar - 2:1.10.0-3.gitb0f6d98 - built commit b0f6d98 diff --git a/sources b/sources index f53d70e..0d1de79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-b0f6d98.tar.gz) = cd1637165ee66fbff8832d199d8376f6e49fa6410109c4b3ca7365c40ea78f48c5d6b27276712dc072cf891314a5d85fa1749355e5addc9a0d36083549de431c +SHA512 (cri-o-623b502.tar.gz) = e60ac8721f26ba4da3bd32769d9245e784052c0ead7f7d9773c94d42231c5aa885a043daa6da4d43b356742f4f7d54aa8f5cebc6923ef30c3a1bdc48bdad8bd3 From e27d07f549e07ee6c3aea5f31939db99a65719b3 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 30 Mar 2018 08:38:41 -0400 Subject: [PATCH 082/202] Release of v1.10.0 --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index a2a3450..9509085 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -351,7 +351,7 @@ popd ln -s vendor src export GOPATH=$(pwd)/_output:$(pwd):%{gopath} -export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub" +export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.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 From 99ceb8cd5d29668b786d4c0c68705589eaf5c071 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Fri, 30 Mar 2018 09:15:16 -0400 Subject: [PATCH 083/202] Release of v1.10.0 --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 9509085..b8a6f4d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -354,7 +354,7 @@ export GOPATH=$(pwd)/_output:$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.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 +BUILDTAGS=$BUILDTAGS make conmon pause docs ./bin/%{service_name} \ --selinux=true \ From 5fd5344faa52dec4b991e8674bb8f63e7b15b922 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 8 Apr 2018 01:37:44 +0000 Subject: [PATCH 084/202] update build paths for binaries 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 b8a6f4d..9509085 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -354,7 +354,7 @@ export GOPATH=$(pwd)/_output:$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) containers_image_ostree_stub" GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} -BUILDTAGS=$BUILDTAGS make conmon pause docs +BUILDTAGS=$BUILDTAGS make bin/conmon bin/pause docs ./bin/%{service_name} \ --selinux=true \ From 7ca8a21f391474fd740355967847da10387fce1e Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 8 Apr 2018 01:48:51 +0000 Subject: [PATCH 085/202] cri-o-2:1.10.0-5.git86b61d4 - built commit 86b61d4 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 0bdc473..0011052 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /cri-o-c956614.tar.gz /cri-o-b0f6d98.tar.gz /cri-o-623b502.tar.gz +/cri-o-86b61d4.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 9509085..89e92cf 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 623b502ac773128d082ccbe2630aae9625464871 +%global commit0 86b61d44cfe7de0f4095877d303c4d1b3aa2ec06 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 4.git%{shortcommit0}%{?dist} +Release: 5.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-5.git86b61d4 +- built commit 86b61d4 + * Fri Mar 30 2018 Dan Walsh - 2:1.10.0-4 - Release of v1.10.0 diff --git a/sources b/sources index 0d1de79..67009a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-623b502.tar.gz) = e60ac8721f26ba4da3bd32769d9245e784052c0ead7f7d9773c94d42231c5aa885a043daa6da4d43b356742f4f7d54aa8f5cebc6923ef30c3a1bdc48bdad8bd3 +SHA512 (cri-o-86b61d4.tar.gz) = 42c12ac0aef1dba4f2f94ad3d6a6a2ab3d8c2317034fddc8846e0ec7220a58af9774640ba8ca2770395a861df9c5fb7ee71f846a17d8a020539830bbff24a676 From 60b220dcad756416c75a6da5b3aaae461c68ccbd Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 8 Apr 2018 12:47:36 -0400 Subject: [PATCH 086/202] cri-o-2:1.10.0-6.gitd0dbfe0 - autobuilt commit d0dbfe0 Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 89e92cf..f9adc52 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 86b61d44cfe7de0f4095877d303c4d1b3aa2ec06 +%global commit0 d0dbfe077114adee72dce495d2cdfeed3a2f8700 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 5.git%{shortcommit0}%{?dist} +Release: 6.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-6.gitd0dbfe0 +- autobuilt commit d0dbfe0 + * Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-5.git86b61d4 - built commit 86b61d4 From a591ee5e216949c1b6db4143d0ecca48009285b2 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sun, 8 Apr 2018 13:00:36 -0400 Subject: [PATCH 087/202] cri-o-2:1.10.0-7.gitd0dbfe0 - autobuilt commit d0dbfe0 Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0011052..e5823f3 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /cri-o-b0f6d98.tar.gz /cri-o-623b502.tar.gz /cri-o-86b61d4.tar.gz +/cri-o-d0dbfe0.tar.gz diff --git a/cri-o.spec b/cri-o.spec index f9adc52..950f33f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 6.git%{shortcommit0}%{?dist} +Release: 7.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-7.gitd0dbfe0 +- autobuilt commit d0dbfe0 + * Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-6.gitd0dbfe0 - autobuilt commit d0dbfe0 diff --git a/sources b/sources index 67009a5..0eead5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-86b61d4.tar.gz) = 42c12ac0aef1dba4f2f94ad3d6a6a2ab3d8c2317034fddc8846e0ec7220a58af9774640ba8ca2770395a861df9c5fb7ee71f846a17d8a020539830bbff24a676 +SHA512 (cri-o-d0dbfe0.tar.gz) = 37e3228ba993a5a9ddf7416df9f3e271b983731e69aff3fe2a05dfa734ccc8669e578c226fe7b8718c478759b91d7200dbd90a64b1d0fcdd568d3bd2113e15ad From b28851091c59bf70492d97acd9d237a8fb866b7d Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sun, 8 Apr 2018 20:26:17 +0000 Subject: [PATCH 088/202] cri-o-2:1.10.0-8.gitd0dbfe0 - autobuilt commit d0dbfe0 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 950f33f..2ec0948 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 7.git%{shortcommit0}%{?dist} +Release: 8.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sun Apr 08 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-8.gitd0dbfe0 +- autobuilt commit d0dbfe0 + * Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-7.gitd0dbfe0 - autobuilt commit d0dbfe0 From 185ff113ff18a670c25f9d0f2f10b4746b70b8e1 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Mon, 9 Apr 2018 15:40:31 +0000 Subject: [PATCH 089/202] cri-o-2:1.10.0-9.git1eec122 - autobuilt commit 1eec122 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e5823f3..8abe527 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /cri-o-623b502.tar.gz /cri-o-86b61d4.tar.gz /cri-o-d0dbfe0.tar.gz +/cri-o-1eec122.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 2ec0948..ceb3bbd 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 d0dbfe077114adee72dce495d2cdfeed3a2f8700 +%global commit0 1eec12238896e52b74827d945bf4e5657546f0d0 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 8.git%{shortcommit0}%{?dist} +Release: 9.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-9.git1eec122 +- autobuilt commit 1eec122 + * Sun Apr 08 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-8.gitd0dbfe0 - autobuilt commit d0dbfe0 diff --git a/sources b/sources index 0eead5a..dd07f11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-d0dbfe0.tar.gz) = 37e3228ba993a5a9ddf7416df9f3e271b983731e69aff3fe2a05dfa734ccc8669e578c226fe7b8718c478759b91d7200dbd90a64b1d0fcdd568d3bd2113e15ad +SHA512 (cri-o-1eec122.tar.gz) = 01ee0f9d15dee355c1acb378de61c55e4369ee1c374925f8915fc39ad7563fc5d0a37a62780ebee3455c5a934fde5765a00c2a757c166afe21dd6dc371c2fa61 From d30ce58377d211fbc9ae3809d0f57f0213fcda66 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Mon, 9 Apr 2018 19:39:56 +0000 Subject: [PATCH 090/202] cri-o-2:1.10.0-10.git1eec122 - autobuilt commit 1eec122 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index ceb3bbd..a9833eb 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 9.git%{shortcommit0}%{?dist} +Release: 10.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-10.git1eec122 +- autobuilt commit 1eec122 + * Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-9.git1eec122 - autobuilt commit 1eec122 From fd7641c79a45345235531c6c0d2a0109b3bc9757 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 10 Apr 2018 03:26:31 +0000 Subject: [PATCH 091/202] cri-o-2:1.10.0-11.git1eec122 - autobuilt commit 1eec122 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index a9833eb..7d92b98 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 10.git%{shortcommit0}%{?dist} +Release: 11.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-11.git1eec122 +- autobuilt commit 1eec122 + * Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-10.git1eec122 - autobuilt commit 1eec122 From 4f574ab340e6cc0092fe6095641c8eaa1370d730 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 10 Apr 2018 14:51:24 +0000 Subject: [PATCH 092/202] cri-o-2:1.10.0-12.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8abe527..b34c572 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /cri-o-86b61d4.tar.gz /cri-o-d0dbfe0.tar.gz /cri-o-1eec122.tar.gz +/cri-o-c24e0d9.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 7d92b98..4b78f1d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 1eec12238896e52b74827d945bf4e5657546f0d0 +%global commit0 c24e0d9ee7f74082d1ddb6154e0ba3418b538276 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 11.git%{shortcommit0}%{?dist} +Release: 12.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-12.gitc24e0d9 +- autobuilt commit c24e0d9 + * Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-11.git1eec122 - autobuilt commit 1eec122 diff --git a/sources b/sources index dd07f11..aac411e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1eec122.tar.gz) = 01ee0f9d15dee355c1acb378de61c55e4369ee1c374925f8915fc39ad7563fc5d0a37a62780ebee3455c5a934fde5765a00c2a757c166afe21dd6dc371c2fa61 +SHA512 (cri-o-c24e0d9.tar.gz) = 9f410e76920c3acd449665e437013b390cfb1e05af7da72716580f3dfb49c41a1610e0a97278d20901168b9ef65b5248b5f4ebcb46e44c5dc84781f9ba23c984 From 55513cddf107b8c16427e63aa482a0a276d97192 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 10 Apr 2018 19:12:25 +0000 Subject: [PATCH 093/202] cri-o-2:1.10.0-13.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 4b78f1d..83daa0d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 12.git%{shortcommit0}%{?dist} +Release: 13.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-13.gitc24e0d9 +- autobuilt commit c24e0d9 + * Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-12.gitc24e0d9 - autobuilt commit c24e0d9 From 211b481b05116d732fe3ec4c953131c0744e0807 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 11 Apr 2018 19:12:14 +0000 Subject: [PATCH 094/202] cri-o-2:1.10.0-14.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 83daa0d..daae9f2 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 13.git%{shortcommit0}%{?dist} +Release: 14.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Apr 11 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-14.gitc24e0d9 +- autobuilt commit c24e0d9 + * Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-13.gitc24e0d9 - autobuilt commit c24e0d9 From e637f8f07c40f366d60a971304fac06c100e6f83 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Thu, 12 Apr 2018 19:13:27 +0000 Subject: [PATCH 095/202] cri-o-2:1.10.0-15.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index daae9f2..5758cd6 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 14.git%{shortcommit0}%{?dist} +Release: 15.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Apr 12 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-15.gitc24e0d9 +- autobuilt commit c24e0d9 + * Wed Apr 11 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-14.gitc24e0d9 - autobuilt commit c24e0d9 From 9d1a46824e0209a689539db4d4c451a47e8f24c1 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 13 Apr 2018 19:14:46 +0000 Subject: [PATCH 096/202] cri-o-2:1.10.0-16.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 5758cd6..2789ad3 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 15.git%{shortcommit0}%{?dist} +Release: 16.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Apr 13 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-16.gitc24e0d9 +- autobuilt commit c24e0d9 + * Thu Apr 12 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-15.gitc24e0d9 - autobuilt commit c24e0d9 From 28d5e5bcbf2467e6b763298b0df8f90a8f2b1450 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sat, 14 Apr 2018 19:15:03 +0000 Subject: [PATCH 097/202] cri-o-2:1.10.0-17.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 2789ad3..e83e07c 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 16.git%{shortcommit0}%{?dist} +Release: 17.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sat Apr 14 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-17.gitc24e0d9 +- autobuilt commit c24e0d9 + * Fri Apr 13 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-16.gitc24e0d9 - autobuilt commit c24e0d9 From 88f5cb6f265e949990e728ff1bc671183f31d28b Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sun, 15 Apr 2018 19:15:30 +0000 Subject: [PATCH 098/202] cri-o-2:1.10.0-18.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index e83e07c..a2ae7e9 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 17.git%{shortcommit0}%{?dist} +Release: 18.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sun Apr 15 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-18.gitc24e0d9 +- autobuilt commit c24e0d9 + * Sat Apr 14 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-17.gitc24e0d9 - autobuilt commit c24e0d9 From aff2694ff64f6fdd9f356ef3e78f45070d01438b Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Mon, 16 Apr 2018 03:03:15 +0000 Subject: [PATCH 099/202] cri-o-2:1.10.0-19.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index a2ae7e9..ac339a4 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 18.git%{shortcommit0}%{?dist} +Release: 19.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-19.gitc24e0d9 +- autobuilt commit c24e0d9 + * Sun Apr 15 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-18.gitc24e0d9 - autobuilt commit c24e0d9 From 436037e932b829b084c74a253ba1c3a0997ba2e9 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Mon, 16 Apr 2018 03:36:47 +0000 Subject: [PATCH 100/202] cri-o-2:1.10.0-20.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index ac339a4..7902b7e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 19.git%{shortcommit0}%{?dist} +Release: 20.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-20.gitc24e0d9 +- autobuilt commit c24e0d9 + * Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-19.gitc24e0d9 - autobuilt commit c24e0d9 From acae6ac2a6f3fbfa43eb27f68dfc4a8060f46ba8 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Mon, 16 Apr 2018 14:53:09 +0000 Subject: [PATCH 101/202] cri-o-2:1.10.0-21.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 7902b7e..1b01707 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 20.git%{shortcommit0}%{?dist} +Release: 21.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-21.gitc24e0d9 +- autobuilt commit c24e0d9 + * Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-20.gitc24e0d9 - autobuilt commit c24e0d9 From d86bcfb575abe038caf4d3e2eef3dabe0a4281a1 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Mon, 16 Apr 2018 19:16:49 +0000 Subject: [PATCH 102/202] cri-o-2:1.10.0-22.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 1b01707..5902100 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 21.git%{shortcommit0}%{?dist} +Release: 22.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-22.gitc24e0d9 +- autobuilt commit c24e0d9 + * Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-21.gitc24e0d9 - autobuilt commit c24e0d9 From d69408eb7cee46de9c5130bcfa0d4347ba25252e Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 17 Apr 2018 17:58:35 +0000 Subject: [PATCH 103/202] cri-o-2:1.10.0-23.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 5902100..9b2683d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 22.git%{shortcommit0}%{?dist} +Release: 23.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-23.gitc24e0d9 +- autobuilt commit c24e0d9 + * Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-22.gitc24e0d9 - autobuilt commit c24e0d9 From 3c83c904799683f0c4287b62b55932230f5dcfa1 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 17 Apr 2018 18:35:55 +0000 Subject: [PATCH 104/202] cri-o-2:1.10.0-24.gitc24e0d9 - autobuilt commit c24e0d9 Signed-off-by: Lokesh Mandvekar (Bot) --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 9b2683d..a9a0a25 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 23.git%{shortcommit0}%{?dist} +Release: 24.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-24.gitc24e0d9 +- autobuilt commit c24e0d9 + * Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-23.gitc24e0d9 - autobuilt commit c24e0d9 From e68fd5a21502bea6bdeb795387d41271476db133 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 24 Apr 2018 20:04:06 +0000 Subject: [PATCH 105/202] cri-o-2:1.10.0-25.git596d052 - autobuilt commit 596d052 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b34c572..b9ca385 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /cri-o-d0dbfe0.tar.gz /cri-o-1eec122.tar.gz /cri-o-c24e0d9.tar.gz +/cri-o-596d052.tar.gz diff --git a/cri-o.spec b/cri-o.spec index a9a0a25..eb36153 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 c24e0d9ee7f74082d1ddb6154e0ba3418b538276 +%global commit0 596d0527eaa6a3928fa1bf05d0c3c972645c79c9 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 24.git%{shortcommit0}%{?dist} +Release: 25.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Apr 24 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-25.git596d052 +- autobuilt commit 596d052 + * Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-24.gitc24e0d9 - autobuilt commit c24e0d9 diff --git a/sources b/sources index aac411e..c9b7f37 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-c24e0d9.tar.gz) = 9f410e76920c3acd449665e437013b390cfb1e05af7da72716580f3dfb49c41a1610e0a97278d20901168b9ef65b5248b5f4ebcb46e44c5dc84781f9ba23c984 +SHA512 (cri-o-596d052.tar.gz) = 09507847882cc9d1e7bb115a55d387fd7b1f556ab196d17e1ef527f3ae7274a19e5ac4e8418440f88db08fb3a004cecf7c27cb76aef52316c9cdfd1a7cf90513 From 22ea5bf5658761d67b9fe0fea84ea693bf101832 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Thu, 26 Apr 2018 04:19:32 +0000 Subject: [PATCH 106/202] cri-o-2:1.10.0-26.git733d791 - autobuilt commit 733d791 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b9ca385..db9ca90 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /cri-o-1eec122.tar.gz /cri-o-c24e0d9.tar.gz /cri-o-596d052.tar.gz +/cri-o-733d791.tar.gz diff --git a/cri-o.spec b/cri-o.spec index eb36153..08e1d7e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 596d0527eaa6a3928fa1bf05d0c3c972645c79c9 +%global commit0 733d791bec7792b25137eaf432ab974c5f2f9bc4 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 25.git%{shortcommit0}%{?dist} +Release: 26.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Apr 26 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-26.git733d791 +- autobuilt commit 733d791 + * Tue Apr 24 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-25.git596d052 - autobuilt commit 596d052 diff --git a/sources b/sources index c9b7f37..d4ec5b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-596d052.tar.gz) = 09507847882cc9d1e7bb115a55d387fd7b1f556ab196d17e1ef527f3ae7274a19e5ac4e8418440f88db08fb3a004cecf7c27cb76aef52316c9cdfd1a7cf90513 +SHA512 (cri-o-733d791.tar.gz) = 80ad31f4e7790c7550e5ee387950a1de9af923ec631b6f92de24116a76ee9d4ed7f648f2e2cb47083dfe9bfff06cafb67bff263c7343cef150b5cd38821c153c From dbb8718b8d1dea00cfa48577b2e9fe10f0de2844 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 27 Apr 2018 04:20:12 +0000 Subject: [PATCH 107/202] cri-o-2:1.10.0-27.gitc971f7b - autobuilt commit c971f7b Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db9ca90..96257da 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /cri-o-c24e0d9.tar.gz /cri-o-596d052.tar.gz /cri-o-733d791.tar.gz +/cri-o-c971f7b.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 08e1d7e..1ff1eee 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 733d791bec7792b25137eaf432ab974c5f2f9bc4 +%global commit0 c971f7b94933ee6801ece599198c63bdfae04892 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 26.git%{shortcommit0}%{?dist} +Release: 27.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Apr 27 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-27.gitc971f7b +- autobuilt commit c971f7b + * Thu Apr 26 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-26.git733d791 - autobuilt commit 733d791 diff --git a/sources b/sources index d4ec5b7..9f55ca0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-733d791.tar.gz) = 80ad31f4e7790c7550e5ee387950a1de9af923ec631b6f92de24116a76ee9d4ed7f648f2e2cb47083dfe9bfff06cafb67bff263c7343cef150b5cd38821c153c +SHA512 (cri-o-c971f7b.tar.gz) = 1b93165a8fe36a35b666a21013e9c5b483e0c3a982c4ce44ab2eb01eff6c0fd1942f1eb87b275a8ee0c25c92176f3dc7e3282aac912046514b734b358beb05bd From af3a7a4c4314f791fc99581cf04ac9ab0fb47a6c Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Mon, 30 Apr 2018 04:21:19 +0000 Subject: [PATCH 108/202] cri-o-2:1.10.0-28.gita221a5d - autobuilt commit a221a5d Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 96257da..68acc51 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /cri-o-596d052.tar.gz /cri-o-733d791.tar.gz /cri-o-c971f7b.tar.gz +/cri-o-a221a5d.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 1ff1eee..a6663a9 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 c971f7b94933ee6801ece599198c63bdfae04892 +%global commit0 a221a5d83d8f2e0b887acc32db77740398188162 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 27.git%{shortcommit0}%{?dist} +Release: 28.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Apr 30 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-28.gita221a5d +- autobuilt commit a221a5d + * Fri Apr 27 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-27.gitc971f7b - autobuilt commit c971f7b diff --git a/sources b/sources index 9f55ca0..5a7d297 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-c971f7b.tar.gz) = 1b93165a8fe36a35b666a21013e9c5b483e0c3a982c4ce44ab2eb01eff6c0fd1942f1eb87b275a8ee0c25c92176f3dc7e3282aac912046514b734b358beb05bd +SHA512 (cri-o-a221a5d.tar.gz) = e694e2ad168ddc54b4cb32b4d3945301c904bc090f838e2d2762ba359e6d6657df1a04a0509cf6586c7309392218159c8c52264c8ae66c55a3aa03ed5449d5d1 From 77ac05b147f3a2eb25d34f25f6336026316a32c8 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 30 Apr 2018 10:38:14 -0400 Subject: [PATCH 109/202] Fix crio.conf to use correct path to conmon and systemd for cgroup management --- cri-o.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index a6663a9..a5eb875 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 28.git%{shortcommit0}%{?dist} +Release: 29.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -359,6 +359,7 @@ BUILDTAGS=$BUILDTAGS make bin/conmon bin/pause docs ./bin/%{service_name} \ --selinux=true \ --storage-driver=overlay \ + --cgroup-manager=systemd \ --conmon /usr/libexec/%{service_name}/conmon \ --cni-plugin-dir /usr/libexec/cni \ --default-mounts /usr/share/rhel/secrets:/run/secrets \ @@ -383,6 +384,7 @@ 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 -p -m 644 %{service_name}.conf %{buildroot}%{_sysconfdir}/%{service_name}/%{service_name}.conf 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 @@ -504,6 +506,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Apr 30 2018 Dan Walsh - 2:1.10.0-29.gita221a5d +- Fix crio.conf to use correct path to conmon and systemd for cgroup management + * Mon Apr 30 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-28.gita221a5d - autobuilt commit a221a5d From e9b212833da2448d7cc885971e29b01255f55fc3 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Mon, 30 Apr 2018 16:24:02 -0400 Subject: [PATCH 110/202] Fix crio.conf to use correct path to conmon and systemd for cgroup management --- cri-o.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index a5eb875..b6b1d30 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 29.git%{shortcommit0}%{?dist} +Release: 30.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -366,7 +366,7 @@ BUILDTAGS=$BUILDTAGS make bin/conmon bin/pause docs %if 0%{?centos} --storage-opt overlay.override_kernel_check=1 \ %endif - --cgroup-manager=systemd config > %{service_name}.conf + --cgroup-manager=systemd config > %{service_name}.conf%{?dist} %if 0%{?with_integration_tests} export GOPATH=$(pwd)/_output @@ -384,7 +384,9 @@ 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 -p -m 644 %{service_name}.conf %{buildroot}%{_sysconfdir}/%{service_name}/%{service_name}.conf + +# install config +install -p -m 644 %{service_name}.conf%{?dist} %{buildroot}%{_sysconfdir}/%{service_name}/%{service_name}.conf 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 @@ -506,7 +508,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog -* Mon Apr 30 2018 Dan Walsh - 2:1.10.0-29.gita221a5d +* Mon Apr 30 2018 Dan Walsh - 2:1.10.0-30.gita221a5d - Fix crio.conf to use correct path to conmon and systemd for cgroup management * Mon Apr 30 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-28.gita221a5d From d0a92bc75b7fcc46dae3aafcc535d5d456554c31 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 2 May 2018 04:24:23 +0000 Subject: [PATCH 111/202] cri-o-2:1.10.0-31.git4e4f1e2 - autobuilt commit 4e4f1e2 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 68acc51..fb32d15 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /cri-o-733d791.tar.gz /cri-o-c971f7b.tar.gz /cri-o-a221a5d.tar.gz +/cri-o-4e4f1e2.tar.gz diff --git a/cri-o.spec b/cri-o.spec index b6b1d30..090b2f5 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 a221a5d83d8f2e0b887acc32db77740398188162 +%global commit0 4e4f1e250d566e01350dae88c0ce2ef1e7c7e43f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 30.git%{shortcommit0}%{?dist} +Release: 31.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed May 02 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-31.git4e4f1e2 +- autobuilt commit 4e4f1e2 + * Mon Apr 30 2018 Dan Walsh - 2:1.10.0-30.gita221a5d - Fix crio.conf to use correct path to conmon and systemd for cgroup management diff --git a/sources b/sources index 5a7d297..727db2a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-a221a5d.tar.gz) = e694e2ad168ddc54b4cb32b4d3945301c904bc090f838e2d2762ba359e6d6657df1a04a0509cf6586c7309392218159c8c52264c8ae66c55a3aa03ed5449d5d1 +SHA512 (cri-o-4e4f1e2.tar.gz) = 21c94e1a0502114707bde1699eca1836c3a82df420b8041f86e9dee9b4913b89ec5f8797558a7abc5e0ed9b35a2e26d9c950c955122cbac97c10e8deaefcc800 From a5b1dc96e97266f4d88310dc7aba345ebc14558a Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 2 May 2018 21:17:21 +0000 Subject: [PATCH 112/202] cri-o-2:1.10.0-32.git4e6919c - autobuilt commit 4e6919c Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fb32d15..cb34781 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /cri-o-c971f7b.tar.gz /cri-o-a221a5d.tar.gz /cri-o-4e4f1e2.tar.gz +/cri-o-4e6919c.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 090b2f5..3a9f155 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 4e4f1e250d566e01350dae88c0ce2ef1e7c7e43f +%global commit0 4e6919c593644839728dbb4b35414cd7ac09114a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 31.git%{shortcommit0}%{?dist} +Release: 32.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed May 02 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-32.git4e6919c +- autobuilt commit 4e6919c + * Wed May 02 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-31.git4e4f1e2 - autobuilt commit 4e4f1e2 diff --git a/sources b/sources index 727db2a..7330712 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-4e4f1e2.tar.gz) = 21c94e1a0502114707bde1699eca1836c3a82df420b8041f86e9dee9b4913b89ec5f8797558a7abc5e0ed9b35a2e26d9c950c955122cbac97c10e8deaefcc800 +SHA512 (cri-o-4e6919c.tar.gz) = 0cca294ca005e995a9e5e8068cf914d9d05631524e62ebf57a091fb3f374feea8536ef178ebc474e72ddb35901275184ebb359c88979840209d946a59c9833d2 From eae6e6b2391a1b67490e6773418ec4a07372f97e Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 4 May 2018 04:24:27 +0000 Subject: [PATCH 113/202] cri-o-2:1.10.0-33.git6db7ef8 - autobuilt 6db7ef8 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cb34781..4243869 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /cri-o-a221a5d.tar.gz /cri-o-4e4f1e2.tar.gz /cri-o-4e6919c.tar.gz +/cri-o-6db7ef8.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 3a9f155..cc39849 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 4e6919c593644839728dbb4b35414cd7ac09114a +%global commit0 6db7ef89bd125b8f09cd9c523a01ddfe804bc7b3 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 32.git%{shortcommit0}%{?dist} +Release: 33.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri May 04 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-33.git6db7ef8 +- autobuilt 6db7ef8 + * Wed May 02 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-32.git4e6919c - autobuilt commit 4e6919c diff --git a/sources b/sources index 7330712..4dd66af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-4e6919c.tar.gz) = 0cca294ca005e995a9e5e8068cf914d9d05631524e62ebf57a091fb3f374feea8536ef178ebc474e72ddb35901275184ebb359c88979840209d946a59c9833d2 +SHA512 (cri-o-6db7ef8.tar.gz) = 5720d23fc0940edb7e8bfbd8f5cad8225511b259f6abbe78e632238313b2e8f3f58843348f28d65f2a64708369b333c5cfef9e54bda5e2f0beef275c33fafc32 From dd9d8004b6295d5e441e9a1de1a10fa67426305f Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sat, 5 May 2018 04:25:21 +0000 Subject: [PATCH 114/202] cri-o-2:1.10.0-34.git0489381 - autobuilt 0489381 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4243869..de994fa 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /cri-o-4e4f1e2.tar.gz /cri-o-4e6919c.tar.gz /cri-o-6db7ef8.tar.gz +/cri-o-0489381.tar.gz diff --git a/cri-o.spec b/cri-o.spec index cc39849..ae87d5e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 6db7ef89bd125b8f09cd9c523a01ddfe804bc7b3 +%global commit0 0489381a1bc7247b005956e085b97261ef5d4e60 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 33.git%{shortcommit0}%{?dist} +Release: 34.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sat May 05 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-34.git0489381 +- autobuilt 0489381 + * Fri May 04 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-33.git6db7ef8 - autobuilt 6db7ef8 diff --git a/sources b/sources index 4dd66af..b1f4058 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-6db7ef8.tar.gz) = 5720d23fc0940edb7e8bfbd8f5cad8225511b259f6abbe78e632238313b2e8f3f58843348f28d65f2a64708369b333c5cfef9e54bda5e2f0beef275c33fafc32 +SHA512 (cri-o-0489381.tar.gz) = 06e185550d47e9219af0dc8e26ba8d917b9884c7c92943b5499d10742157a454602647b39e61dc630972afec2e56fe01f7a4975f4df6955efd9238a6f3e48285 From b9727dcda163d9d90d92a8b4430d2b7a0fc70175 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sun, 6 May 2018 04:25:39 +0000 Subject: [PATCH 115/202] cri-o-2:1.10.0-35.git4e54603 - autobuilt 4e54603 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index de994fa..9fffc76 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /cri-o-4e6919c.tar.gz /cri-o-6db7ef8.tar.gz /cri-o-0489381.tar.gz +/cri-o-4e54603.tar.gz diff --git a/cri-o.spec b/cri-o.spec index ae87d5e..370d972 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 0489381a1bc7247b005956e085b97261ef5d4e60 +%global commit0 4e5460395f1ddd8b41018fb5e98a76526c75c1f2 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 34.git%{shortcommit0}%{?dist} +Release: 35.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sun May 06 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-35.git4e54603 +- autobuilt 4e54603 + * Sat May 05 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-34.git0489381 - autobuilt 0489381 diff --git a/sources b/sources index b1f4058..256d5e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-0489381.tar.gz) = 06e185550d47e9219af0dc8e26ba8d917b9884c7c92943b5499d10742157a454602647b39e61dc630972afec2e56fe01f7a4975f4df6955efd9238a6f3e48285 +SHA512 (cri-o-4e54603.tar.gz) = 8d114c0f53220b9a959848408d07e1583de01cb8080ce7e56a50f8cfed4c0071806ae1c5dfc9c6c5696b76ad204976b0859d00b682ead98cb6ca55a5daba900a From 48d2d2ceb4cd2a854b5e2e95418dfc731de51f17 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Mon, 7 May 2018 04:26:28 +0000 Subject: [PATCH 116/202] cri-o-2:1.10.0-36.git5eb8c3b - autobuilt 5eb8c3b Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9fffc76..75108ef 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /cri-o-6db7ef8.tar.gz /cri-o-0489381.tar.gz /cri-o-4e54603.tar.gz +/cri-o-5eb8c3b.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 370d972..b413b08 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 4e5460395f1ddd8b41018fb5e98a76526c75c1f2 +%global commit0 5eb8c3b03679472ee525ee6304b040f23353ffbd %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 35.git%{shortcommit0}%{?dist} +Release: 36.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon May 07 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-36.git5eb8c3b +- autobuilt 5eb8c3b + * Sun May 06 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-35.git4e54603 - autobuilt 4e54603 diff --git a/sources b/sources index 256d5e5..58ad240 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-4e54603.tar.gz) = 8d114c0f53220b9a959848408d07e1583de01cb8080ce7e56a50f8cfed4c0071806ae1c5dfc9c6c5696b76ad204976b0859d00b682ead98cb6ca55a5daba900a +SHA512 (cri-o-5eb8c3b.tar.gz) = 1378c870ed2de43945be57b06cd5b2d4e99d25c3074946160ac8fb8d27a56ddb3014f8fe2478b78811de29cda8281b11179f31bca72e8abeca4cc86857b55d29 From f1e302b505d49be78a8d072743b6b9ee10c8837a Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 8 May 2018 04:26:02 +0000 Subject: [PATCH 117/202] cri-o-2:1.10.0-37.git52d0f53 - autobuilt 52d0f53 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75108ef..90d6ad4 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /cri-o-0489381.tar.gz /cri-o-4e54603.tar.gz /cri-o-5eb8c3b.tar.gz +/cri-o-52d0f53.tar.gz diff --git a/cri-o.spec b/cri-o.spec index b413b08..53580dc 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 5eb8c3b03679472ee525ee6304b040f23353ffbd +%global commit0 52d0f53dd62555607fd5f3bc5184c0b46fffed27 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.10.0 -Release: 36.git%{shortcommit0}%{?dist} +Release: 37.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue May 08 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-37.git52d0f53 +- autobuilt 52d0f53 + * Mon May 07 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-36.git5eb8c3b - autobuilt 5eb8c3b diff --git a/sources b/sources index 58ad240..711fc38 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-5eb8c3b.tar.gz) = 1378c870ed2de43945be57b06cd5b2d4e99d25c3074946160ac8fb8d27a56ddb3014f8fe2478b78811de29cda8281b11179f31bca72e8abeca4cc86857b55d29 +SHA512 (cri-o-52d0f53.tar.gz) = a44c460d690bb7284b57ae2a3783b66ab54b68e8ef604049e0d07df3780f4024d04193a1ec0b0b590be5efc07351b89e17a807f950271097938195c9bca5f5e4 From 6ea94fbd0648b41a3f53b45f9aba171445eb2e83 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 8 May 2018 05:01:27 -0700 Subject: [PATCH 118/202] bump to v1.10.1 --- .gitignore | 1 + cri-o.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 90d6ad4..e68653c 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /cri-o-4e54603.tar.gz /cri-o-5eb8c3b.tar.gz /cri-o-52d0f53.tar.gz +/cri-o-728df92.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 53580dc..81be1a5 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 52d0f53dd62555607fd5f3bc5184c0b46fffed27 +%global commit0 728df92d3e4b77c5a1d3b8e2a5c3c8f3c5bc4f00 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,8 +36,8 @@ Name: cri-o %if 0%{?fedora} Epoch: 2 %endif -Version: 1.10.0 -Release: 37.git%{shortcommit0}%{?dist} +Version: 1.10.1 +Release: 1.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue May 8 2018 Dan Walsh - 2:1.10.1-1.git728df92 +- bump to v1.10.1 + * Tue May 08 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-37.git52d0f53 - autobuilt 52d0f53 diff --git a/sources b/sources index 711fc38..6a0e84b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-52d0f53.tar.gz) = a44c460d690bb7284b57ae2a3783b66ab54b68e8ef604049e0d07df3780f4024d04193a1ec0b0b590be5efc07351b89e17a807f950271097938195c9bca5f5e4 +SHA512 (cri-o-728df92.tar.gz) = a9c42860e603ffb147982db7e4d2e6fb85eea8f191a9a4ada1214c3771920c5a2043113a61d5e18c8a7eae043d3acb26b5b6031f5d5142e9f5100862c501dc06 From 556df46c5207238a3ee196220bd13f975551467e Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 8 May 2018 05:27:22 -0700 Subject: [PATCH 119/202] bump to v1.10.1 --- cri-o.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 81be1a5..84de88f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -354,7 +354,7 @@ export GOPATH=$(pwd)/_output:$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.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 +BUILDTAGS=$BUILDTAGS make conmon pause docs ./bin/%{service_name} \ --selinux=true \ From f98ea4f8a90de426810d682b96d64a936eb4b8a0 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 10 May 2018 14:01:36 -0600 Subject: [PATCH 120/202] cri-o upstreamfirst tests Signed-off-by: Ed Santiago --- 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 f1747f46290a7d1cefa168d43ca770bf79b41727 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 11 May 2018 11:18:07 -0400 Subject: [PATCH 121/202] cri-o-2:1.11.0-1.git55a3daa - bump to v1.11.0 - built commit 55a3daa Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 24 ++++++++++++++---------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index e68653c..595686a 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /cri-o-5eb8c3b.tar.gz /cri-o-52d0f53.tar.gz /cri-o-728df92.tar.gz +/cri-o-55a3daa.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 84de88f..39af05c 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -20,23 +20,23 @@ %define gobuild(o:) go build -tags="$BUILDTAGS rpm_crashtraceback" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -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 728df92d3e4b77c5a1d3b8e2a5c3c8f3c5bc4f00 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global import_path %{provider_prefix} +%global commit0 55a3daaf3dcfe290aba6c621b4fd73db7709072e +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio -Name: cri-o +Name: cri-o %if 0%{?fedora} Epoch: 2 %endif -Version: 1.10.1 +Version: 1.11.0 Release: 1.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 @@ -354,7 +354,7 @@ export GOPATH=$(pwd)/_output:$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) containers_image_ostree_stub" GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{service_name} %{import_path}/cmd/%{service_name} -BUILDTAGS=$BUILDTAGS make conmon pause docs +BUILDTAGS=$BUILDTAGS make bin/conmon bin/pause docs ./bin/%{service_name} \ --selinux=true \ @@ -508,6 +508,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri May 11 2018 Lokesh Mandvekar - 2:1.11.0-1.git55a3daa +- bump to v1.11.0 +- built commit 55a3daa + * Tue May 8 2018 Dan Walsh - 2:1.10.1-1.git728df92 - bump to v1.10.1 diff --git a/sources b/sources index 6a0e84b..a49ce2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-728df92.tar.gz) = a9c42860e603ffb147982db7e4d2e6fb85eea8f191a9a4ada1214c3771920c5a2043113a61d5e18c8a7eae043d3acb26b5b6031f5d5142e9f5100862c501dc06 +SHA512 (cri-o-55a3daa.tar.gz) = 278482eba22a15e2e8bc620cd4ff6f496c3f75a498431d119dffdb126ab3604f98222c69ee496e87f9495f1cfb385cc6663d86bb40bbf0c143033f27cf2c3e86 From 92e65ab06f5d2eee9cf6dcc76f64f696c2cb3e89 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 16 May 2018 04:29:35 +0000 Subject: [PATCH 122/202] cri-o-2:1.11.0-2.git72cb448 - autobuilt 72cb448 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 595686a..947f1ba 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /cri-o-52d0f53.tar.gz /cri-o-728df92.tar.gz /cri-o-55a3daa.tar.gz +/cri-o-72cb448.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 39af05c..8828cf0 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 55a3daaf3dcfe290aba6c621b4fd73db7709072e +%global commit0 72cb4483f7564cb057d9e22174090ec222071c37 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed May 16 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-2.git72cb448 +- autobuilt 72cb448 + * Fri May 11 2018 Lokesh Mandvekar - 2:1.11.0-1.git55a3daa - bump to v1.11.0 - built commit 55a3daa diff --git a/sources b/sources index a49ce2c..d62735d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-55a3daa.tar.gz) = 278482eba22a15e2e8bc620cd4ff6f496c3f75a498431d119dffdb126ab3604f98222c69ee496e87f9495f1cfb385cc6663d86bb40bbf0c143033f27cf2c3e86 +SHA512 (cri-o-72cb448.tar.gz) = cd2777acea7985ee4025c47d643d0f1168865199e713e45e196a7ac398d2a18b33839da222a15cbbc7fd15b7727feea9af6fb0e6f0657ab73c66c4ed680ab496 From 419f6991cc3b6817ca31cc28494f3b74e377db07 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Thu, 17 May 2018 04:31:21 +0000 Subject: [PATCH 123/202] cri-o-2:1.11.0-3.gitd4e89bd - autobuilt d4e89bd Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 947f1ba..5bf8cad 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /cri-o-728df92.tar.gz /cri-o-55a3daa.tar.gz /cri-o-72cb448.tar.gz +/cri-o-d4e89bd.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 8828cf0..24fae2d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 72cb4483f7564cb057d9e22174090ec222071c37 +%global commit0 d4e89bdb3f56dc8a40a581acf2f0898bda8884d5 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu May 17 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-3.gitd4e89bd +- autobuilt d4e89bd + * Wed May 16 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-2.git72cb448 - autobuilt 72cb448 diff --git a/sources b/sources index d62735d..221399b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-72cb448.tar.gz) = cd2777acea7985ee4025c47d643d0f1168865199e713e45e196a7ac398d2a18b33839da222a15cbbc7fd15b7727feea9af6fb0e6f0657ab73c66c4ed680ab496 +SHA512 (cri-o-d4e89bd.tar.gz) = c18c15e7fc6d60a08cedffd9d9349193cdd8ecee6cf1e4a7561a323b7a49e21e38916ee65092c499d740ef2c365b15a4a0ca6550b239545a5055921cd245bbf3 From e5c4b8113f528a9ee952c8a9964a1eaebe235fa9 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 18 May 2018 04:31:48 +0000 Subject: [PATCH 124/202] cri-o-2:1.11.0-4.git97d2efd - autobuilt 97d2efd Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5bf8cad..8b4e27f 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /cri-o-55a3daa.tar.gz /cri-o-72cb448.tar.gz /cri-o-d4e89bd.tar.gz +/cri-o-97d2efd.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 24fae2d..ca9dbff 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 d4e89bdb3f56dc8a40a581acf2f0898bda8884d5 +%global commit0 97d2efdf2414dce77ec4d7d7e5f156ed3880b14c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 3.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri May 18 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-4.git97d2efd +- autobuilt 97d2efd + * Thu May 17 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-3.gitd4e89bd - autobuilt d4e89bd diff --git a/sources b/sources index 221399b..14ba767 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-d4e89bd.tar.gz) = c18c15e7fc6d60a08cedffd9d9349193cdd8ecee6cf1e4a7561a323b7a49e21e38916ee65092c499d740ef2c365b15a4a0ca6550b239545a5055921cd245bbf3 +SHA512 (cri-o-97d2efd.tar.gz) = 118e156930ef2cdca2c3bc4a8d515c28cbe2528a3fa5e35e5ec098c3635e06dfe7b8de25e27e2a772c551dc1ff169ea906405b69d2d3282019f2fb1f88b0e0f4 From 3f3d52ce94f141dd9feb81a4b44c147a5bee2b4b Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 25 May 2018 18:39:18 +0000 Subject: [PATCH 125/202] cri-o-2:1.11.0-5.git19e97f2 - autobuilt 19e97f2 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b4e27f..ec078eb 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /cri-o-72cb448.tar.gz /cri-o-d4e89bd.tar.gz /cri-o-97d2efd.tar.gz +/cri-o-19e97f2.tar.gz diff --git a/cri-o.spec b/cri-o.spec index ca9dbff..9ce0d1b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 97d2efdf2414dce77ec4d7d7e5f156ed3880b14c +%global commit0 19e97f2b21ff3ceca4b6415a2e012c7ee2362552 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 4.git%{shortcommit0}%{?dist} +Release: 5.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri May 25 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-5.git19e97f2 +- autobuilt 19e97f2 + * Fri May 18 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-4.git97d2efd - autobuilt 97d2efd diff --git a/sources b/sources index 14ba767..8873569 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-97d2efd.tar.gz) = 118e156930ef2cdca2c3bc4a8d515c28cbe2528a3fa5e35e5ec098c3635e06dfe7b8de25e27e2a772c551dc1ff169ea906405b69d2d3282019f2fb1f88b0e0f4 +SHA512 (cri-o-19e97f2.tar.gz) = 5ba449fbc36c6cdc404f65bf9fad656b5eff8fc3d3c67df962b83dc6d113d692243adb39398e049a379ef0f30f5c669825d89b703400e665eb0c52cf24dc869f From 8f9bc4d6089bcd476cd7eaa93e1bf4a0df3bfe50 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 30 May 2018 04:39:21 +0000 Subject: [PATCH 126/202] cri-o-2:1.11.0-6.gitdbcff37 - autobuilt dbcff37 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ec078eb..141c7b8 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /cri-o-d4e89bd.tar.gz /cri-o-97d2efd.tar.gz /cri-o-19e97f2.tar.gz +/cri-o-dbcff37.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 9ce0d1b..edd7b59 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 19e97f2b21ff3ceca4b6415a2e012c7ee2362552 +%global commit0 dbcff37d7abfc3ad6d3dd8ae1c075b392b9c4b11 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 5.git%{shortcommit0}%{?dist} +Release: 6.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed May 30 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-6.gitdbcff37 +- autobuilt dbcff37 + * Fri May 25 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-5.git19e97f2 - autobuilt 19e97f2 diff --git a/sources b/sources index 8873569..6182177 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-19e97f2.tar.gz) = 5ba449fbc36c6cdc404f65bf9fad656b5eff8fc3d3c67df962b83dc6d113d692243adb39398e049a379ef0f30f5c669825d89b703400e665eb0c52cf24dc869f +SHA512 (cri-o-dbcff37.tar.gz) = 62dab2631ac2f37a16b70273a140afa436a8ffe0f186290ddbb11aeeb5dab1ae9a5c9cc7ac64c7729a0d44a53205725cd62d6ee899d46e2d832d8be0a82904f4 From ba809568f312afde668678f30234a8b96fecbe57 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Thu, 31 May 2018 04:39:23 +0000 Subject: [PATCH 127/202] cri-o-2:1.11.0-7.gite2fdb46 - autobuilt e2fdb46 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 141c7b8..d7983e4 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /cri-o-97d2efd.tar.gz /cri-o-19e97f2.tar.gz /cri-o-dbcff37.tar.gz +/cri-o-e2fdb46.tar.gz diff --git a/cri-o.spec b/cri-o.spec index edd7b59..bdd39d6 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 dbcff37d7abfc3ad6d3dd8ae1c075b392b9c4b11 +%global commit0 e2fdb46dce454dfcb0fb3bda3800697a9ba4fd8f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 6.git%{shortcommit0}%{?dist} +Release: 7.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu May 31 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-7.gite2fdb46 +- autobuilt e2fdb46 + * Wed May 30 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-6.gitdbcff37 - autobuilt dbcff37 diff --git a/sources b/sources index 6182177..4ab8b24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-dbcff37.tar.gz) = 62dab2631ac2f37a16b70273a140afa436a8ffe0f186290ddbb11aeeb5dab1ae9a5c9cc7ac64c7729a0d44a53205725cd62d6ee899d46e2d832d8be0a82904f4 +SHA512 (cri-o-e2fdb46.tar.gz) = 167be7411e307f67c886c790dbbf660120830677b7bf59f7871b317a45c85bb94addaa72829884ad1046622a2b9db7337441f4a065a35b5e1a0b01a4dbef7b60 From e2091267e505d9c6d9f03ccc080288061f5f9a39 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 1 Jun 2018 04:39:51 +0000 Subject: [PATCH 128/202] cri-o-2:1.11.0-8.git7910f24 - autobuilt 7910f24 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d7983e4..f35f8c0 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /cri-o-19e97f2.tar.gz /cri-o-dbcff37.tar.gz /cri-o-e2fdb46.tar.gz +/cri-o-7910f24.tar.gz diff --git a/cri-o.spec b/cri-o.spec index bdd39d6..b2aff0e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 e2fdb46dce454dfcb0fb3bda3800697a9ba4fd8f +%global commit0 7910f248c97c2384546b51b063d4126a4a8ef40e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 7.git%{shortcommit0}%{?dist} +Release: 8.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Jun 01 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-8.git7910f24 +- autobuilt 7910f24 + * Thu May 31 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-7.gite2fdb46 - autobuilt e2fdb46 diff --git a/sources b/sources index 4ab8b24..11d48a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-e2fdb46.tar.gz) = 167be7411e307f67c886c790dbbf660120830677b7bf59f7871b317a45c85bb94addaa72829884ad1046622a2b9db7337441f4a065a35b5e1a0b01a4dbef7b60 +SHA512 (cri-o-7910f24.tar.gz) = 90203aee958589d005a239c1bcfcba675ee85b8bddee7a79bf351a02624701a2b48cc1445d25751bc3582f6b9769b9c60aecd2ed7f178646e7e0f54aea1b21a7 From aa1dd0d9aa470da750c36149d5b064e41f1797bb Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sun, 3 Jun 2018 04:41:19 +0000 Subject: [PATCH 129/202] cri-o-2:1.11.0-9.git1c0c3b0 - autobuilt 1c0c3b0 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f35f8c0..1f231aa 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /cri-o-dbcff37.tar.gz /cri-o-e2fdb46.tar.gz /cri-o-7910f24.tar.gz +/cri-o-1c0c3b0.tar.gz diff --git a/cri-o.spec b/cri-o.spec index b2aff0e..18349c8 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 7910f248c97c2384546b51b063d4126a4a8ef40e +%global commit0 1c0c3b0778f805b82970cdbc93529306f8f75e61 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 8.git%{shortcommit0}%{?dist} +Release: 9.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sun Jun 03 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-9.git1c0c3b0 +- autobuilt 1c0c3b0 + * Fri Jun 01 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-8.git7910f24 - autobuilt 7910f24 diff --git a/sources b/sources index 11d48a9..4eb6762 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-7910f24.tar.gz) = 90203aee958589d005a239c1bcfcba675ee85b8bddee7a79bf351a02624701a2b48cc1445d25751bc3582f6b9769b9c60aecd2ed7f178646e7e0f54aea1b21a7 +SHA512 (cri-o-1c0c3b0.tar.gz) = 04aa57c60971fdcab02d20613f52fe58dcd375aa5d0141af132aa2f91562eab9087c22833687f645d997b6b3689bd7cb77bf56f071752caf83e9d9edecd92f1d From 19f12dc95aa589ab9001ea32f250b3c3d7a8637f Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 5 Jun 2018 04:41:37 +0000 Subject: [PATCH 130/202] cri-o-2:1.11.0-10.git055eb1e - autobuilt 055eb1e Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1f231aa..ca1fba0 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /cri-o-e2fdb46.tar.gz /cri-o-7910f24.tar.gz /cri-o-1c0c3b0.tar.gz +/cri-o-055eb1e.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 18349c8..4ac7735 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 1c0c3b0778f805b82970cdbc93529306f8f75e61 +%global commit0 055eb1e56f281efdf3cd937f0ad45b9c7962bacc %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 9.git%{shortcommit0}%{?dist} +Release: 10.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Jun 05 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-10.git055eb1e +- autobuilt 055eb1e + * Sun Jun 03 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-9.git1c0c3b0 - autobuilt 1c0c3b0 diff --git a/sources b/sources index 4eb6762..6f682d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1c0c3b0.tar.gz) = 04aa57c60971fdcab02d20613f52fe58dcd375aa5d0141af132aa2f91562eab9087c22833687f645d997b6b3689bd7cb77bf56f071752caf83e9d9edecd92f1d +SHA512 (cri-o-055eb1e.tar.gz) = 8b90f1c1eb173ee2ce52569b3686bf0eb7e69af9318bac8f3e4811bffd1b74a37157c4f25c5fbb7fa7f1c5d86a3032b3003e392600db49466a46c86ec9594365 From 78a5fd64a1c461b6ebde25d58fcc0a834a86d26e Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 6 Jun 2018 04:46:40 +0000 Subject: [PATCH 131/202] cri-o-2:1.11.0-11.git540ebd6 - autobuilt 540ebd6 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ca1fba0..f7c8e82 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /cri-o-7910f24.tar.gz /cri-o-1c0c3b0.tar.gz /cri-o-055eb1e.tar.gz +/cri-o-540ebd6.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 4ac7735..9443203 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 055eb1e56f281efdf3cd937f0ad45b9c7962bacc +%global commit0 540ebd64caa8f99c9bc3f15f6fdee27c7dc0bd7b %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 10.git%{shortcommit0}%{?dist} +Release: 11.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Jun 06 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-11.git540ebd6 +- autobuilt 540ebd6 + * Tue Jun 05 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-10.git055eb1e - autobuilt 055eb1e diff --git a/sources b/sources index 6f682d3..a866e2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-055eb1e.tar.gz) = 8b90f1c1eb173ee2ce52569b3686bf0eb7e69af9318bac8f3e4811bffd1b74a37157c4f25c5fbb7fa7f1c5d86a3032b3003e392600db49466a46c86ec9594365 +SHA512 (cri-o-540ebd6.tar.gz) = 3ad5e1ebdb70682c2e5167761ef6d3d8bbd5f3866da23fe6d6e04d3b845d8b451e6d84d5f135327e8bf5094859a4b97cc48301829f714647f5c310daf31835c1 From b6aa647987ca0a55c22611261dab632ea1b47bc5 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Thu, 7 Jun 2018 04:44:58 +0000 Subject: [PATCH 132/202] cri-o-2:1.11.0-12.git54478a2 - autobuilt 54478a2 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f7c8e82..b04d839 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /cri-o-1c0c3b0.tar.gz /cri-o-055eb1e.tar.gz /cri-o-540ebd6.tar.gz +/cri-o-54478a2.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 9443203..5567794 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 540ebd64caa8f99c9bc3f15f6fdee27c7dc0bd7b +%global commit0 54478a2bafbc7d30691712bb8c1c32fbeb918a0c %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 11.git%{shortcommit0}%{?dist} +Release: 12.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Jun 07 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-12.git54478a2 +- autobuilt 54478a2 + * Wed Jun 06 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-11.git540ebd6 - autobuilt 540ebd6 diff --git a/sources b/sources index a866e2d..33c50ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-540ebd6.tar.gz) = 3ad5e1ebdb70682c2e5167761ef6d3d8bbd5f3866da23fe6d6e04d3b845d8b451e6d84d5f135327e8bf5094859a4b97cc48301829f714647f5c310daf31835c1 +SHA512 (cri-o-54478a2.tar.gz) = 9707186ab20357ea7b160de5fdaa6932a5af640745a2658c4b179c84d95225ae77b47b60a16568ef13966b35725a2216e53597332b4b6834147ddb7ee42a0351 From 18e7bfff9b3148e18afd9073f160fc65ad12a48a Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sun, 10 Jun 2018 04:45:31 +0000 Subject: [PATCH 133/202] cri-o-2:1.11.0-13.gitfcdc2c9 - autobuilt fcdc2c9 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b04d839..3d445f7 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ /cri-o-055eb1e.tar.gz /cri-o-540ebd6.tar.gz /cri-o-54478a2.tar.gz +/cri-o-fcdc2c9.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 5567794..0fc5e04 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 54478a2bafbc7d30691712bb8c1c32fbeb918a0c +%global commit0 fcdc2c9ad059131a681b8bb60bc2dd79bb411637 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 12.git%{shortcommit0}%{?dist} +Release: 13.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sun Jun 10 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-13.gitfcdc2c9 +- autobuilt fcdc2c9 + * Thu Jun 07 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-12.git54478a2 - autobuilt 54478a2 diff --git a/sources b/sources index 33c50ad..521b990 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-54478a2.tar.gz) = 9707186ab20357ea7b160de5fdaa6932a5af640745a2658c4b179c84d95225ae77b47b60a16568ef13966b35725a2216e53597332b4b6834147ddb7ee42a0351 +SHA512 (cri-o-fcdc2c9.tar.gz) = 7e2118b33584c87e8a24f140bec4cb7df1924e89d31f0180492b006aa36babe94a381b2ce9811094b5a1d6d7f199e3f45b61e0df48bf5f27fd1e26043c46b3a6 From 31a1e985a8ae12481d8e2fab368df6da35c97dc1 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 12 Jun 2018 04:45:40 +0000 Subject: [PATCH 134/202] cri-o-2:1.11.0-14.gitf64f5b8 - autobuilt f64f5b8 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3d445f7..0bfd99b 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /cri-o-540ebd6.tar.gz /cri-o-54478a2.tar.gz /cri-o-fcdc2c9.tar.gz +/cri-o-f64f5b8.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 0fc5e04..6f41bcc 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 fcdc2c9ad059131a681b8bb60bc2dd79bb411637 +%global commit0 f64f5b8a732d51fc7a5096cb53da5a9d54eb3a0d %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 13.git%{shortcommit0}%{?dist} +Release: 14.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Jun 12 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-14.gitf64f5b8 +- autobuilt f64f5b8 + * Sun Jun 10 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-13.gitfcdc2c9 - autobuilt fcdc2c9 diff --git a/sources b/sources index 521b990..5309b9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-fcdc2c9.tar.gz) = 7e2118b33584c87e8a24f140bec4cb7df1924e89d31f0180492b006aa36babe94a381b2ce9811094b5a1d6d7f199e3f45b61e0df48bf5f27fd1e26043c46b3a6 +SHA512 (cri-o-f64f5b8.tar.gz) = 23fdb4fc4a12cf4c2c60175f6deba24fefa20c8deacede0b6e4ff07bd1c411c14c8d46724fc936f1f0f88386ea34df6a48c4ddd31814b96faccc382d715d9b5c From f3149243f8572807976af5c86884bc69bb9a9c95 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 13 Jun 2018 04:46:07 +0000 Subject: [PATCH 135/202] cri-o-2:1.11.0-15.gitbe2c579 - autobuilt be2c579 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0bfd99b..07efe33 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /cri-o-54478a2.tar.gz /cri-o-fcdc2c9.tar.gz /cri-o-f64f5b8.tar.gz +/cri-o-be2c579.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 6f41bcc..5234d57 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 f64f5b8a732d51fc7a5096cb53da5a9d54eb3a0d +%global commit0 be2c579da8fe18d874be56077c138f09e12a164a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 14.git%{shortcommit0}%{?dist} +Release: 15.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Jun 13 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-15.gitbe2c579 +- autobuilt be2c579 + * Tue Jun 12 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-14.gitf64f5b8 - autobuilt f64f5b8 diff --git a/sources b/sources index 5309b9c..78feafe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-f64f5b8.tar.gz) = 23fdb4fc4a12cf4c2c60175f6deba24fefa20c8deacede0b6e4ff07bd1c411c14c8d46724fc936f1f0f88386ea34df6a48c4ddd31814b96faccc382d715d9b5c +SHA512 (cri-o-be2c579.tar.gz) = 5ad83edc48b318cc0a94dced86450f45caf45f64ff596c8a58079d926d00e6da1e5a1bd7c1cbee1362352c2e9260c67b37a88017217584a0f4859e2952e51c6b From 117b09b0fafff818c49d5542c51bad9d5768c1d3 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Thu, 14 Jun 2018 04:46:55 +0000 Subject: [PATCH 136/202] cri-o-2:1.11.0-16.gitbac65b4 - autobuilt bac65b4 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 07efe33..998143e 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /cri-o-fcdc2c9.tar.gz /cri-o-f64f5b8.tar.gz /cri-o-be2c579.tar.gz +/cri-o-bac65b4.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 5234d57..d988eb0 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 be2c579da8fe18d874be56077c138f09e12a164a +%global commit0 bac65b4149184f9fdf28dd2dabb68acb7ca41791 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 15.git%{shortcommit0}%{?dist} +Release: 16.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Jun 14 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-16.gitbac65b4 +- autobuilt bac65b4 + * Wed Jun 13 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-15.gitbe2c579 - autobuilt be2c579 diff --git a/sources b/sources index 78feafe..ff9097b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-be2c579.tar.gz) = 5ad83edc48b318cc0a94dced86450f45caf45f64ff596c8a58079d926d00e6da1e5a1bd7c1cbee1362352c2e9260c67b37a88017217584a0f4859e2952e51c6b +SHA512 (cri-o-bac65b4.tar.gz) = 7f2b5fe95339195e7e2a6aa7b1e8ec1e8246020af83ffc88bba8a1bc0bd837cc206fe5f92abc3840889025c3db0714fdb96138b1e3e613b5b28566438afdc8a7 From f3fb16e77a12adee0d6eeff433eb095ae8b56ecf Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 15 Jun 2018 04:47:52 +0000 Subject: [PATCH 137/202] cri-o-2:1.11.0-17.git5a890d8 - autobuilt 5a890d8 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 998143e..76ca2e9 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ /cri-o-f64f5b8.tar.gz /cri-o-be2c579.tar.gz /cri-o-bac65b4.tar.gz +/cri-o-5a890d8.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d988eb0..c21bf04 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 bac65b4149184f9fdf28dd2dabb68acb7ca41791 +%global commit0 5a890d868b02e56ef9ada0d3c2edeed404322eec %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 16.git%{shortcommit0}%{?dist} +Release: 17.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Jun 15 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-17.git5a890d8 +- autobuilt 5a890d8 + * Thu Jun 14 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-16.gitbac65b4 - autobuilt bac65b4 diff --git a/sources b/sources index ff9097b..e4d8fa2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-bac65b4.tar.gz) = 7f2b5fe95339195e7e2a6aa7b1e8ec1e8246020af83ffc88bba8a1bc0bd837cc206fe5f92abc3840889025c3db0714fdb96138b1e3e613b5b28566438afdc8a7 +SHA512 (cri-o-5a890d8.tar.gz) = a13e77df2159acf8142dcb718d18879dfd819f73efc11528be74b90133bac1b10f52721d23b62b78a944913eaa849ee145bd2134c4f3188f76abffac17be9567 From c35aab89f3c87a80a397ad04a969757b4f35d61a Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sat, 16 Jun 2018 04:49:14 +0000 Subject: [PATCH 138/202] cri-o-2:1.11.0-18.git46e04a6 - autobuilt 46e04a6 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 76ca2e9..1c19663 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /cri-o-be2c579.tar.gz /cri-o-bac65b4.tar.gz /cri-o-5a890d8.tar.gz +/cri-o-46e04a6.tar.gz diff --git a/cri-o.spec b/cri-o.spec index c21bf04..205f9a7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 5a890d868b02e56ef9ada0d3c2edeed404322eec +%global commit0 46e04a63df45ee23ddebcec9edba9c4cb964d2eb %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 17.git%{shortcommit0}%{?dist} +Release: 18.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sat Jun 16 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-18.git46e04a6 +- autobuilt 46e04a6 + * Fri Jun 15 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-17.git5a890d8 - autobuilt 5a890d8 diff --git a/sources b/sources index e4d8fa2..072fa95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-5a890d8.tar.gz) = a13e77df2159acf8142dcb718d18879dfd819f73efc11528be74b90133bac1b10f52721d23b62b78a944913eaa849ee145bd2134c4f3188f76abffac17be9567 +SHA512 (cri-o-46e04a6.tar.gz) = f26764f492e1bb986417971049d0728e8c36b122515a9ae12aee9a207f3b120b35f56619ce5c646151bb3a21f7d5954bebb6a1930e4ded1bcdf1878f4ce461ef From 103b8a534c8ef0a7a81025347e547f0407cd3e52 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Mon, 18 Jun 2018 04:50:07 +0000 Subject: [PATCH 139/202] cri-o-2:1.11.0-19.git51dfd19 - autobuilt 51dfd19 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1c19663..a03d896 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ /cri-o-bac65b4.tar.gz /cri-o-5a890d8.tar.gz /cri-o-46e04a6.tar.gz +/cri-o-51dfd19.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 205f9a7..f6f27ae 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 46e04a63df45ee23ddebcec9edba9c4cb964d2eb +%global commit0 51dfd190eee1dc12653f4573376294282a5d3e03 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 18.git%{shortcommit0}%{?dist} +Release: 19.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Jun 18 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-19.git51dfd19 +- autobuilt 51dfd19 + * Sat Jun 16 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-18.git46e04a6 - autobuilt 46e04a6 diff --git a/sources b/sources index 072fa95..6842625 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-46e04a6.tar.gz) = f26764f492e1bb986417971049d0728e8c36b122515a9ae12aee9a207f3b120b35f56619ce5c646151bb3a21f7d5954bebb6a1930e4ded1bcdf1878f4ce461ef +SHA512 (cri-o-51dfd19.tar.gz) = bc851c1294a4025f952af90cf2d7562a1007b0aa8576b28fadb464776bd8c159c4f443aeb80eaaf49f0cfd1a096893488d021dc6ce64f486b791ec83b48e1829 From 5dadf85731f48e05ba55622b53ec98a9d5913c22 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 19 Jun 2018 04:49:25 +0000 Subject: [PATCH 140/202] cri-o-2:1.11.0-20.gitbd1dec3 - autobuilt bd1dec3 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a03d896..32082f3 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /cri-o-5a890d8.tar.gz /cri-o-46e04a6.tar.gz /cri-o-51dfd19.tar.gz +/cri-o-bd1dec3.tar.gz diff --git a/cri-o.spec b/cri-o.spec index f6f27ae..abe5f25 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 51dfd190eee1dc12653f4573376294282a5d3e03 +%global commit0 bd1dec3170457a15f9c235ab40810c75b4da3149 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 19.git%{shortcommit0}%{?dist} +Release: 20.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Jun 19 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-20.gitbd1dec3 +- autobuilt bd1dec3 + * Mon Jun 18 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-19.git51dfd19 - autobuilt 51dfd19 diff --git a/sources b/sources index 6842625..5085473 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-51dfd19.tar.gz) = bc851c1294a4025f952af90cf2d7562a1007b0aa8576b28fadb464776bd8c159c4f443aeb80eaaf49f0cfd1a096893488d021dc6ce64f486b791ec83b48e1829 +SHA512 (cri-o-bd1dec3.tar.gz) = 210e05295ed42f83c1a0c9ded4b78cf6980a35576b35b03e34e92286cbf6d49909aaa4c286ba29069ce86cce842b6b11dead8565f769ae047564c6e276e01048 From 2bce29896a42544c1be8cf3c29d6b6848b389790 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Thu, 21 Jun 2018 04:50:04 +0000 Subject: [PATCH 141/202] cri-o-2:1.11.0-21.gitfc6bebf - autobuilt fc6bebf Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 32082f3..62ee80b 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /cri-o-46e04a6.tar.gz /cri-o-51dfd19.tar.gz /cri-o-bd1dec3.tar.gz +/cri-o-fc6bebf.tar.gz diff --git a/cri-o.spec b/cri-o.spec index abe5f25..66de7b7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 bd1dec3170457a15f9c235ab40810c75b4da3149 +%global commit0 fc6bebf6e874d20345b8aecc37e3490eaf746779 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 20.git%{shortcommit0}%{?dist} +Release: 21.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Jun 21 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-21.gitfc6bebf +- autobuilt fc6bebf + * Tue Jun 19 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-20.gitbd1dec3 - autobuilt bd1dec3 diff --git a/sources b/sources index 5085473..a79c65a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-bd1dec3.tar.gz) = 210e05295ed42f83c1a0c9ded4b78cf6980a35576b35b03e34e92286cbf6d49909aaa4c286ba29069ce86cce842b6b11dead8565f769ae047564c6e276e01048 +SHA512 (cri-o-fc6bebf.tar.gz) = e17807a673c2c90f428e985893de2f1296d8c151ef83ef39903a170525766a2fcecaf066c19f972bb0012e2cf4a54e29ad0743e78302779c256dba00d226cb19 From eaac9a809b20e566976e2a83c6d011ddb84dc788 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sat, 23 Jun 2018 04:51:30 +0000 Subject: [PATCH 142/202] cri-o-2:1.11.0-22.gita18f4ed - autobuilt a18f4ed Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 62ee80b..ac39e2f 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ /cri-o-51dfd19.tar.gz /cri-o-bd1dec3.tar.gz /cri-o-fc6bebf.tar.gz +/cri-o-a18f4ed.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 66de7b7..cf67749 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 fc6bebf6e874d20345b8aecc37e3490eaf746779 +%global commit0 a18f4ed38942b3ce6430c7cc509007bc2e2c7225 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 21.git%{shortcommit0}%{?dist} +Release: 22.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sat Jun 23 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-22.gita18f4ed +- autobuilt a18f4ed + * Thu Jun 21 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-21.gitfc6bebf - autobuilt fc6bebf diff --git a/sources b/sources index a79c65a..b72c819 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-fc6bebf.tar.gz) = e17807a673c2c90f428e985893de2f1296d8c151ef83ef39903a170525766a2fcecaf066c19f972bb0012e2cf4a54e29ad0743e78302779c256dba00d226cb19 +SHA512 (cri-o-a18f4ed.tar.gz) = 08bcf8057ec7ab9b2188fa0703dcf3090cea23579f13ab23f78b51dd2c0b909005bf1a7eec9e7d89eb36c1c2fc4307bf288f1492f474f774e637388c47919079 From 7f05121b49c856f3f02b6fe33b7768f1f1fe4b60 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Tue, 26 Jun 2018 04:54:15 +0000 Subject: [PATCH 143/202] cri-o-2:1.11.0-23.gitf9ae39e - autobuilt f9ae39e Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ac39e2f..40a4925 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ /cri-o-bd1dec3.tar.gz /cri-o-fc6bebf.tar.gz /cri-o-a18f4ed.tar.gz +/cri-o-f9ae39e.tar.gz diff --git a/cri-o.spec b/cri-o.spec index cf67749..acd8715 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 a18f4ed38942b3ce6430c7cc509007bc2e2c7225 +%global commit0 f9ae39e395880507d52295ca58e3683f22524777 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 22.git%{shortcommit0}%{?dist} +Release: 23.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Jun 26 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-23.gitf9ae39e +- autobuilt f9ae39e + * Sat Jun 23 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-22.gita18f4ed - autobuilt a18f4ed diff --git a/sources b/sources index b72c819..09d0f29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-a18f4ed.tar.gz) = 08bcf8057ec7ab9b2188fa0703dcf3090cea23579f13ab23f78b51dd2c0b909005bf1a7eec9e7d89eb36c1c2fc4307bf288f1492f474f774e637388c47919079 +SHA512 (cri-o-f9ae39e.tar.gz) = 1a16b98613185ad72abb14d9fe01db471bb85e77459064edf5fa5d0383bc9ae3edcc47ea833759d4f88b82ae04f8cbf2afa383f92929df6f150af2649b413228 From b73f6bb5385bf751b8b04ca98f24499c019c93bd Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 27 Jun 2018 04:53:42 +0000 Subject: [PATCH 144/202] cri-o-2:1.11.0-24.git953f837 - autobuilt 953f837 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 40a4925..38e63e3 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ /cri-o-fc6bebf.tar.gz /cri-o-a18f4ed.tar.gz /cri-o-f9ae39e.tar.gz +/cri-o-953f837.tar.gz diff --git a/cri-o.spec b/cri-o.spec index acd8715..31630bf 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 f9ae39e395880507d52295ca58e3683f22524777 +%global commit0 953f837b6848f49f0413eaff45c229c92a116f73 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 23.git%{shortcommit0}%{?dist} +Release: 24.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Jun 27 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-24.git953f837 +- autobuilt 953f837 + * Tue Jun 26 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-23.gitf9ae39e - autobuilt f9ae39e diff --git a/sources b/sources index 09d0f29..f7e6c8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-f9ae39e.tar.gz) = 1a16b98613185ad72abb14d9fe01db471bb85e77459064edf5fa5d0383bc9ae3edcc47ea833759d4f88b82ae04f8cbf2afa383f92929df6f150af2649b413228 +SHA512 (cri-o-953f837.tar.gz) = b55766c69ab4fa941ae49e3908342a7425681d15ea2c86aec78dde3ad7693c64ee5be51e7a40e47e3209dea867b8793419d2617a6312218eec408e6121fc1941 From 3e8b25c53c653df2768624df3457a54291bd8b54 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Thu, 28 Jun 2018 04:55:53 +0000 Subject: [PATCH 145/202] cri-o-2:1.11.0-25.gitf9f8a53 - autobuilt f9f8a53 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 38e63e3..f3c4043 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ /cri-o-a18f4ed.tar.gz /cri-o-f9ae39e.tar.gz /cri-o-953f837.tar.gz +/cri-o-f9f8a53.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 31630bf..4f29e29 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 953f837b6848f49f0413eaff45c229c92a116f73 +%global commit0 f9f8a53f1a0816c98e65606e674232d11319cc7f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 24.git%{shortcommit0}%{?dist} +Release: 25.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Jun 28 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-25.gitf9f8a53 +- autobuilt f9f8a53 + * Wed Jun 27 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-24.git953f837 - autobuilt 953f837 diff --git a/sources b/sources index f7e6c8e..31e918e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-953f837.tar.gz) = b55766c69ab4fa941ae49e3908342a7425681d15ea2c86aec78dde3ad7693c64ee5be51e7a40e47e3209dea867b8793419d2617a6312218eec408e6121fc1941 +SHA512 (cri-o-f9f8a53.tar.gz) = 5ac40279cd39f37b9725e220863cc58d6e0a012b6dd08d34ea857babd6300e6ba38739dd54aacec7bcc618cb615618243db0c9f1d7dfe1b66ba6b1ff7047a570 From f1f3ddf1cb8442b6684dd5dbf852a60ecf2159c8 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 29 Jun 2018 04:56:42 +0000 Subject: [PATCH 146/202] cri-o-2:1.11.0-26.git45ccf08 - autobuilt 45ccf08 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f3c4043..305740f 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /cri-o-f9ae39e.tar.gz /cri-o-953f837.tar.gz /cri-o-f9f8a53.tar.gz +/cri-o-45ccf08.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 4f29e29..195a1db 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 f9f8a53f1a0816c98e65606e674232d11319cc7f +%global commit0 45ccf0889e1219a788a80f314f89deb3a251d9ee %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 25.git%{shortcommit0}%{?dist} +Release: 26.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Jun 29 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-26.git45ccf08 +- autobuilt 45ccf08 + * Thu Jun 28 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-25.gitf9f8a53 - autobuilt f9f8a53 diff --git a/sources b/sources index 31e918e..2877f34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-f9f8a53.tar.gz) = 5ac40279cd39f37b9725e220863cc58d6e0a012b6dd08d34ea857babd6300e6ba38739dd54aacec7bcc618cb615618243db0c9f1d7dfe1b66ba6b1ff7047a570 +SHA512 (cri-o-45ccf08.tar.gz) = 43908aadf269b1bcefd3376bcad769ec0d193425aa9faab0fa1f3699d3901dd8203123eeebbcc4d85966660b214932023d7b443b433b118a1a390b4043eb33cb From f23576258f27592a83c821e07f271678411d47db Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sat, 30 Jun 2018 04:55:49 +0000 Subject: [PATCH 147/202] cri-o-2:1.11.0-27.git3b86cde - autobuilt 3b86cde Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 305740f..c2e8558 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ /cri-o-953f837.tar.gz /cri-o-f9f8a53.tar.gz /cri-o-45ccf08.tar.gz +/cri-o-3b86cde.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 195a1db..e50ab03 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 45ccf0889e1219a788a80f314f89deb3a251d9ee +%global commit0 3b86cde0359ed3bfc511fe03c97061202a09e713 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.11.0 -Release: 26.git%{shortcommit0}%{?dist} +Release: 27.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sat Jun 30 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-27.git3b86cde +- autobuilt 3b86cde + * Fri Jun 29 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-26.git45ccf08 - autobuilt 45ccf08 diff --git a/sources b/sources index 2877f34..46b464a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-45ccf08.tar.gz) = 43908aadf269b1bcefd3376bcad769ec0d193425aa9faab0fa1f3699d3901dd8203123eeebbcc4d85966660b214932023d7b443b433b118a1a390b4043eb33cb +SHA512 (cri-o-3b86cde.tar.gz) = 2abb67ac74a26bb6f9b8b42b4e321190be69af78db20b5754c424e545c6fcc60cfdbd151a3df6dfb9f138dbae027851e6d0c12293dbb69ac73b94ee249fc10f4 From 26947381ca3bf7b6f75cbcbdf9fd84d04c9c840c Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 4 Jul 2018 04:57:40 +0000 Subject: [PATCH 148/202] cri-o-2:1.12.0-1.git9a46eba - bump to 1.12.0 - autobuilt 9a46eba Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c2e8558..ca82a1b 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ /cri-o-f9f8a53.tar.gz /cri-o-45ccf08.tar.gz /cri-o-3b86cde.tar.gz +/cri-o-9a46eba.tar.gz diff --git a/cri-o.spec b/cri-o.spec index e50ab03..40db291 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 3b86cde0359ed3bfc511fe03c97061202a09e713 +%global commit0 9a46eba94f88f8019ee49095fa1376171f6b48e0 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -36,8 +36,8 @@ Name: cri-o %if 0%{?fedora} Epoch: 2 %endif -Version: 1.11.0 -Release: 27.git%{shortcommit0}%{?dist} +Version: 1.12.0 +Release: 1.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Jul 04 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-1.git9a46eba +- bump to 1.12.0 +- autobuilt 9a46eba + * Sat Jun 30 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-27.git3b86cde - autobuilt 3b86cde diff --git a/sources b/sources index 46b464a..9d256de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-3b86cde.tar.gz) = 2abb67ac74a26bb6f9b8b42b4e321190be69af78db20b5754c424e545c6fcc60cfdbd151a3df6dfb9f138dbae027851e6d0c12293dbb69ac73b94ee249fc10f4 +SHA512 (cri-o-9a46eba.tar.gz) = 8403d38aa25a225bc114fb9cc9c8991ffaa8c91850afc21085e54edc74a72a31aaf70d2faedfe29a3029389dc13c0b889846c6187805278a6664bb06255f7860 From 572f8aba645e98870364bf0f4968a4d2f6107165 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 6 Jul 2018 04:57:59 +0000 Subject: [PATCH 149/202] cri-o-2:1.12.0-2.git14c22de - autobuilt 14c22de Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ca82a1b..6ddede8 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ /cri-o-45ccf08.tar.gz /cri-o-3b86cde.tar.gz /cri-o-9a46eba.tar.gz +/cri-o-14c22de.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 40db291..d5c97bd 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 9a46eba94f88f8019ee49095fa1376171f6b48e0 +%global commit0 14c22defb39067363798b518a97ed5aca7903905 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.12.0 -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Jul 06 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-2.git14c22de +- autobuilt 14c22de + * Wed Jul 04 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-1.git9a46eba - bump to 1.12.0 - autobuilt 9a46eba diff --git a/sources b/sources index 9d256de..fb9ce07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-9a46eba.tar.gz) = 8403d38aa25a225bc114fb9cc9c8991ffaa8c91850afc21085e54edc74a72a31aaf70d2faedfe29a3029389dc13c0b889846c6187805278a6664bb06255f7860 +SHA512 (cri-o-14c22de.tar.gz) = 8d509e38b4791115220552e181a6c67b2076e5ea40db21741f38042e081942a912792098589f2edfd8f85f83b8cb95d7e8383912ee20707ca012ca3d08790f16 From f5e63146f3d046a705b0aef52d62acda9ec3fa06 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sat, 7 Jul 2018 04:58:31 +0000 Subject: [PATCH 150/202] cri-o-2:1.12.0-3.git3374df8 - autobuilt 3374df8 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6ddede8..f75cd4b 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ /cri-o-3b86cde.tar.gz /cri-o-9a46eba.tar.gz /cri-o-14c22de.tar.gz +/cri-o-3374df8.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d5c97bd..a767e05 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 14c22defb39067363798b518a97ed5aca7903905 +%global commit0 3374df83c1dc85852dd581b56c2c88dcc1552ad6 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.12.0 -Release: 2.git%{shortcommit0}%{?dist} +Release: 3.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sat Jul 07 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-3.git3374df8 +- autobuilt 3374df8 + * Fri Jul 06 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-2.git14c22de - autobuilt 14c22de diff --git a/sources b/sources index fb9ce07..a0066f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-14c22de.tar.gz) = 8d509e38b4791115220552e181a6c67b2076e5ea40db21741f38042e081942a912792098589f2edfd8f85f83b8cb95d7e8383912ee20707ca012ca3d08790f16 +SHA512 (cri-o-3374df8.tar.gz) = 1c8d4174cb9032a078bf8f696cc30acec2fad5add5805ad24b60faca6f6c19fdd4d949bbeeeaf86c08d05ec16e6b4f2f445c47ba2cb365fa62defca3dea2226e From c0926fc41b08a9275f6c4b1e613186f04127ecaa Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Sun, 8 Jul 2018 04:59:32 +0000 Subject: [PATCH 151/202] cri-o-2:1.12.0-4.gitb68ada4 - autobuilt b68ada4 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f75cd4b..2db0163 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ /cri-o-9a46eba.tar.gz /cri-o-14c22de.tar.gz /cri-o-3374df8.tar.gz +/cri-o-b68ada4.tar.gz diff --git a/cri-o.spec b/cri-o.spec index a767e05..d678558 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 3374df83c1dc85852dd581b56c2c88dcc1552ad6 +%global commit0 b68ada45311cd26a415053db97f004b92c72bb6a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.12.0 -Release: 3.git%{shortcommit0}%{?dist} +Release: 4.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sun Jul 08 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-4.gitb68ada4 +- autobuilt b68ada4 + * Sat Jul 07 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-3.git3374df8 - autobuilt 3374df8 diff --git a/sources b/sources index a0066f0..6dab5fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-3374df8.tar.gz) = 1c8d4174cb9032a078bf8f696cc30acec2fad5add5805ad24b60faca6f6c19fdd4d949bbeeeaf86c08d05ec16e6b4f2f445c47ba2cb365fa62defca3dea2226e +SHA512 (cri-o-b68ada4.tar.gz) = 88fae535cdb0bf65e76b38f69fb893d49e2a7975c17ec496ac43415d03ed2c24de707abfe22cdcb753b54f63b911d6d1ca4bd1b7c9a88ee5bd98472179ce7632 From 3aaeb32c89b0bba8c7fa9df0d3a1ff13463f8c93 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Mon, 9 Jul 2018 15:19:07 +0000 Subject: [PATCH 152/202] cri-o-2:1.12.0-5.git1af50d7 - autobuilt 1af50d7 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2db0163..d8b0618 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ /cri-o-14c22de.tar.gz /cri-o-3374df8.tar.gz /cri-o-b68ada4.tar.gz +/cri-o-1af50d7.tar.gz diff --git a/cri-o.spec b/cri-o.spec index d678558..c553fd7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 b68ada45311cd26a415053db97f004b92c72bb6a +%global commit0 1af50d7dc5fdd462a217b8996c08c65c50c1a9d5 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.12.0 -Release: 4.git%{shortcommit0}%{?dist} +Release: 5.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Mon Jul 09 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-5.git1af50d7 +- autobuilt 1af50d7 + * Sun Jul 08 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-4.gitb68ada4 - autobuilt b68ada4 diff --git a/sources b/sources index 6dab5fd..b100e35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-b68ada4.tar.gz) = 88fae535cdb0bf65e76b38f69fb893d49e2a7975c17ec496ac43415d03ed2c24de707abfe22cdcb753b54f63b911d6d1ca4bd1b7c9a88ee5bd98472179ce7632 +SHA512 (cri-o-1af50d7.tar.gz) = 3300a0b16c13b6c93a43f0fce6767eaa2a67b7deabd355bac47c304026bfd41811770edf655f33b856224cc1bc2b2f75c4178a07d09cd62b2c128ce1a832c362 From 83e38e93da8ae55c5b624a17eefe757a4712ade9 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Mon, 9 Jul 2018 12:01:44 -0400 Subject: [PATCH 153/202] update release tag to reflect unreleased status 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 c553fd7..e100b81 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.12.0 -Release: 5.git%{shortcommit0}%{?dist} +Release: 5.dev.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} From 47d26c75afc148ff4eccbef7cf35f0a55799a97d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 22:20:43 +0000 Subject: [PATCH 154/202] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index e100b81..401dbc8 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Name: cri-o Epoch: 2 %endif Version: 1.12.0 -Release: 5.dev.git%{shortcommit0}%{?dist} +Release: 6.dev.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -508,6 +508,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2:1.12.0-6.dev.git1af50d7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jul 09 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-5.git1af50d7 - autobuilt 1af50d7 From 47eb2b6ece4d78bf6bd04ee8db98e3571028ec7a Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 17 Jul 2018 19:42:01 -0400 Subject: [PATCH 155/202] cri-o-2:1.12.0-7.dev.git1af50d7 - make debuginfo delve debugger friendly - use containers-common instead of skopeo-containers (just a name change) - disable debuginfo for f29 Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 401dbc8..4c65459 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,16 +1,16 @@ -%global with_debug 1 %global with_devel 0 %global with_unit_test 0 - -%if 0%{?fedora} || 0%{?centos} %global with_check 1 %global with_integration_tests 1 + +%if 0%{?fedora} > 28 +%global with_debug 0 %else -%global with_check 0 -%global with_integration_tests 0 +%global with_debug 1 %endif %if 0%{?with_debug} +%global _find_debuginfo_dwz_opts %{nil} %global _dwz_low_mem_die_limit 0 %else %global debug_package %{nil} @@ -33,11 +33,9 @@ %global service_name crio Name: cri-o -%if 0%{?fedora} Epoch: 2 -%endif Version: 1.12.0 -Release: 6.dev.git%{shortcommit0}%{?dist} +Release: 7.dev.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -72,7 +70,7 @@ Provides: ocid = %{epoch}:%{version}-%{release} %else BuildRequires: libseccomp-devel Requires: runc >= 1.0.0-15 -Requires: skopeo-containers >= 1:0.1.24-6 +Requires: containers-common >= 1:0.1.24-6 Requires: containernetworking-plugins >= 0.5.2-7 Provides: %{service_name} = %{version}-%{release} Provides: ocid = %{version}-%{release} @@ -508,6 +506,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Tue Jul 17 2018 Lokesh Mandvekar - 2:1.12.0-7.dev.git1af50d7 +- make debuginfo delve debugger friendly +- use containers-common instead of skopeo-containers (just a name change) +- disable debuginfo for f29 + * Thu Jul 12 2018 Fedora Release Engineering - 2:1.12.0-6.dev.git1af50d7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 900a60eb1b7a9b3594d5c89e560adff254c94525 Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 18 Jul 2018 00:40:14 +0000 Subject: [PATCH 156/202] cri-o-2:1.12.0-8.dev.git57c4053 - autobuilt 57c4053 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d8b0618..d22fa2b 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /cri-o-3374df8.tar.gz /cri-o-b68ada4.tar.gz /cri-o-1af50d7.tar.gz +/cri-o-57c4053.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 4c65459..21bf617 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 1af50d7dc5fdd462a217b8996c08c65c50c1a9d5 +%global commit0 57c405363df2ac0d8c8f8557eef4f27ad073de7e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -35,7 +35,7 @@ Name: cri-o Epoch: 2 Version: 1.12.0 -Release: 7.dev.git%{shortcommit0}%{?dist} +Release: 8.dev.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -506,6 +506,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Jul 18 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-8.dev.git57c4053 +- autobuilt 57c4053 + * Tue Jul 17 2018 Lokesh Mandvekar - 2:1.12.0-7.dev.git1af50d7 - make debuginfo delve debugger friendly - use containers-common instead of skopeo-containers (just a name change) diff --git a/sources b/sources index b100e35..92f4d66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1af50d7.tar.gz) = 3300a0b16c13b6c93a43f0fce6767eaa2a67b7deabd355bac47c304026bfd41811770edf655f33b856224cc1bc2b2f75c4178a07d09cd62b2c128ce1a832c362 +SHA512 (cri-o-57c4053.tar.gz) = 5f38051119cca1a9700d65479e724a599bdb763e0a994ab1f694e989509f7a57381738d444c133cddb515e2adc5fdd0388a2935d0fe158c16fcd76c8e1193a5f From cba0cc05cb9f1b5fea02365429eb6968a7a979dc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 24 Jul 2018 20:33:55 -0400 Subject: [PATCH 157/202] remove centos conditionals Signed-off-by: Lokesh Mandvekar --- cri-o.spec | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 21bf617..492215d 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -60,21 +60,12 @@ Requires: socat Requires: iptables Requires: iproute Requires: conmon -%if 0%{?fedora} BuildRequires: libseccomp-static Requires: runc >= 2:1.0.0-15 Requires: skopeo-containers >= 0.1.24-6 Recommends: containernetworking-plugins >= 0.5.2-7 Provides: %{service_name} = %{epoch}:%{version}-%{release} Provides: ocid = %{epoch}:%{version}-%{release} -%else -BuildRequires: libseccomp-devel -Requires: runc >= 1.0.0-15 -Requires: containers-common >= 1:0.1.24-6 -Requires: containernetworking-plugins >= 0.5.2-7 -Provides: %{service_name} = %{version}-%{release} -Provides: ocid = %{version}-%{release} -%endif Obsoletes: ocid <= 0.3 %description @@ -361,9 +352,6 @@ BUILDTAGS=$BUILDTAGS make bin/conmon bin/pause docs --conmon /usr/libexec/%{service_name}/conmon \ --cni-plugin-dir /usr/libexec/cni \ --default-mounts /usr/share/rhel/secrets:/run/secrets \ -%if 0%{?centos} - --storage-opt overlay.override_kernel_check=1 \ -%endif --cgroup-manager=systemd config > %{service_name}.conf%{?dist} %if 0%{?with_integration_tests} From 5cb4173b93a8f3c91bafaf54e5df49f89be9db2f Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 25 Jul 2018 13:20:27 +0000 Subject: [PATCH 158/202] cri-o-2:1.12.0-9.dev.git59f9418 - autobuilt 59f9418 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d22fa2b..e429500 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ /cri-o-b68ada4.tar.gz /cri-o-1af50d7.tar.gz /cri-o-57c4053.tar.gz +/cri-o-59f9418.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 492215d..21199ca 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 57c405363df2ac0d8c8f8557eef4f27ad073de7e +%global commit0 59f94186f8e75d430390545a2c3baa76ee408d7a %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -35,7 +35,7 @@ Name: cri-o Epoch: 2 Version: 1.12.0 -Release: 8.dev.git%{shortcommit0}%{?dist} +Release: 9.dev.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -494,6 +494,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Jul 25 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-9.dev.git59f9418 +- autobuilt 59f9418 + * Wed Jul 18 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-8.dev.git57c4053 - autobuilt 57c4053 diff --git a/sources b/sources index 92f4d66..b8909f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-57c4053.tar.gz) = 5f38051119cca1a9700d65479e724a599bdb763e0a994ab1f694e989509f7a57381738d444c133cddb515e2adc5fdd0388a2935d0fe158c16fcd76c8e1193a5f +SHA512 (cri-o-59f9418.tar.gz) = d2885ac9dbf86a0a300a59b3b3f81aa903edc6d248edfd6be09c8affe63e0d786817a6f03b4fc44d583a3f2860794839c84f7f769407aa2c51c5276267f260de From 8b0d3fa88cfc13e7549b003639c8adbbee4c7b4f Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Fri, 27 Jul 2018 05:11:27 +0000 Subject: [PATCH 159/202] cri-o-2:1.12.0-10.dev.git3961eb3 - autobuilt 3961eb3 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e429500..7866969 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ /cri-o-1af50d7.tar.gz /cri-o-57c4053.tar.gz /cri-o-59f9418.tar.gz +/cri-o-3961eb3.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 21199ca..8bdbd07 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 59f94186f8e75d430390545a2c3baa76ee408d7a +%global commit0 3961eb3959b3391ac4c00ae658d30667cdc30c5f %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -35,7 +35,7 @@ Name: cri-o Epoch: 2 Version: 1.12.0 -Release: 9.dev.git%{shortcommit0}%{?dist} +Release: 10.dev.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -494,6 +494,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Fri Jul 27 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-10.dev.git3961eb3 +- autobuilt 3961eb3 + * Wed Jul 25 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-9.dev.git59f9418 - autobuilt 59f9418 diff --git a/sources b/sources index b8909f7..4c0b52a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-59f9418.tar.gz) = d2885ac9dbf86a0a300a59b3b3f81aa903edc6d248edfd6be09c8affe63e0d786817a6f03b4fc44d583a3f2860794839c84f7f769407aa2c51c5276267f260de +SHA512 (cri-o-3961eb3.tar.gz) = 3d39835d4db973655c9cbd6ece322be52832e35b2090250fc34b3e60cc0a57234aa7811aa9576dfb342f80368e9547d390fce56766bad353a92e9c54ec8a0f50 From e1584e4b3b244492e50a11d07842818d900438ac Mon Sep 17 00:00:00 2001 From: "Lokesh Mandvekar (Bot)" Date: Wed, 1 Aug 2018 05:12:03 +0000 Subject: [PATCH 160/202] cri-o-2:1.12.0-11.dev.git4c587e6 - autobuilt 4c587e6 Signed-off-by: Lokesh Mandvekar (Bot) --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7866969..367ec04 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ /cri-o-57c4053.tar.gz /cri-o-59f9418.tar.gz /cri-o-3961eb3.tar.gz +/cri-o-4c587e6.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 8bdbd07..77c3ed5 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -27,7 +27,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 3961eb3959b3391ac4c00ae658d30667cdc30c5f +%global commit0 4c587e6b24443d7446db6ae32c409b058ad600af %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -35,7 +35,7 @@ Name: cri-o Epoch: 2 Version: 1.12.0 -Release: 10.dev.git%{shortcommit0}%{?dist} +Release: 11.dev.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -494,6 +494,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Aug 01 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-11.dev.git4c587e6 +- autobuilt 4c587e6 + * Fri Jul 27 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-10.dev.git3961eb3 - autobuilt 3961eb3 diff --git a/sources b/sources index 4c0b52a..3498805 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-3961eb3.tar.gz) = 3d39835d4db973655c9cbd6ece322be52832e35b2090250fc34b3e60cc0a57234aa7811aa9576dfb342f80368e9547d390fce56766bad353a92e9c54ec8a0f50 +SHA512 (cri-o-4c587e6.tar.gz) = 5848e334276ab3c101660d5b53e4ffb253c7b1a89bb7bd305fd074792fdffcfeed14ce173c1c0d4679f281e60b24df68fd35ce88995faeae2a9e7827e70e5e94 From ec961715444e6b888ee1819ef0ad200632f9dbe5 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Sat, 11 Aug 2018 23:54:56 -0400 Subject: [PATCH 161/202] cri-o-2:1.12.0-12.dev.gitc4f232a - use default %%gobuild - built c4f232a - enable debuginfo for rawhide Signed-off-by: Lokesh Mandvekar --- .gitignore | 1 + cri-o.spec | 442 ++++++++++++++++++++++++++--------------------------- sources | 2 +- 3 files changed, 221 insertions(+), 224 deletions(-) diff --git a/.gitignore b/.gitignore index 367ec04..a7c8599 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ /cri-o-59f9418.tar.gz /cri-o-3961eb3.tar.gz /cri-o-4c587e6.tar.gz +/cri-o-c4f232a.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 77c3ed5..887fe8f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -2,12 +2,7 @@ %global with_unit_test 0 %global with_check 1 %global with_integration_tests 1 - -%if 0%{?fedora} > 28 -%global with_debug 0 -%else %global with_debug 1 -%endif %if 0%{?with_debug} %global _find_debuginfo_dwz_opts %{nil} @@ -16,10 +11,6 @@ %global debug_package %{nil} %endif -#%%if ! 0%%{?gobuild:1} -%define gobuild(o:) go build -tags="$BUILDTAGS rpm_crashtraceback" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; -#%%endif - %global provider github %global provider_tld com %global project kubernetes-incubator @@ -27,7 +18,7 @@ # https://github.com/kubernetes-incubator/cri-o %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit0 4c587e6b24443d7446db6ae32c409b058ad600af +%global commit0 c4f232a57ec42fe03c376a39e17c15300298ad78 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global service_name crio @@ -35,7 +26,7 @@ Name: cri-o Epoch: 2 Version: 1.12.0 -Release: 11.dev.git%{shortcommit0}%{?dist} +Release: 12.dev.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -62,7 +53,7 @@ Requires: iproute Requires: conmon BuildRequires: libseccomp-static Requires: runc >= 2:1.0.0-15 -Requires: skopeo-containers >= 0.1.24-6 +Requires: containers-common >= 0.1.24-6 Recommends: containernetworking-plugins >= 0.5.2-7 Provides: %{service_name} = %{epoch}:%{version}-%{release} Provides: ocid = %{epoch}:%{version}-%{release} @@ -73,214 +64,214 @@ Obsoletes: ocid <= 0.3 %if 0%{?with_devel} %package devel -Summary: %{summary} -BuildArch: noarch -Requires: golang(github.com/BurntSushi/toml) -Requires: golang(github.com/Microsoft/go-winio) -Requires: golang(github.com/Sirupsen/logrus) -Requires: golang(github.com/containernetworking/cni/libcni) -Requires: golang(github.com/containernetworking/cni/pkg/invoke) -Requires: golang(github.com/containernetworking/cni/pkg/types) -Requires: golang(github.com/containernetworking/cni/pkg/version) -Requires: golang(github.com/containers/image/directory) -Requires: golang(github.com/containers/image/directory/explicitfilepath) -Requires: golang(github.com/containers/image/docker) -Requires: golang(github.com/containers/image/docker/policyconfiguration) -Requires: golang(github.com/containers/image/image) -Requires: golang(github.com/containers/image/manifest) -Requires: golang(github.com/containers/image/oci/layout) -Requires: golang(github.com/containers/image/openshift) -Requires: golang(github.com/containers/image/transports) -Requires: golang(github.com/containers/image/types) -Requires: golang(github.com/containers/image/version) -Requires: golang(github.com/docker/distribution) -Requires: golang(github.com/docker/distribution/context) -Requires: golang(github.com/docker/distribution/digest) -Requires: golang(github.com/docker/distribution/reference) -Requires: golang(github.com/docker/distribution/uuid) -Requires: golang(github.com/docker/docker/api/types/blkiodev) -Requires: golang(github.com/docker/docker/api/types/container) -Requires: golang(github.com/docker/docker/api/types/mount) -Requires: golang(github.com/docker/docker/api/types/strslice) -Requires: golang(github.com/docker/docker/api/types/versions) -Requires: golang(github.com/docker/docker/daemon/graphdriver) -Requires: golang(github.com/docker/docker/image) -Requires: golang(github.com/docker/docker/image/v1) -Requires: golang(github.com/docker/docker/layer) -Requires: golang(github.com/docker/docker/pkg/archive) -Requires: golang(github.com/docker/docker/pkg/chrootarchive) -Requires: golang(github.com/docker/docker/pkg/fileutils) -Requires: golang(github.com/docker/docker/pkg/homedir) -Requires: golang(github.com/docker/docker/pkg/idtools) -Requires: golang(github.com/docker/docker/pkg/ioutils) -Requires: golang(github.com/docker/docker/pkg/longpath) -Requires: golang(github.com/docker/docker/pkg/mount) -Requires: golang(github.com/docker/docker/pkg/plugins) -Requires: golang(github.com/docker/docker/pkg/plugins/transport) -Requires: golang(github.com/docker/docker/pkg/pools) -Requires: golang(github.com/docker/docker/pkg/promise) -Requires: golang(github.com/docker/docker/pkg/random) -Requires: golang(github.com/docker/docker/pkg/reexec) -Requires: golang(github.com/docker/docker/pkg/registrar) -Requires: golang(github.com/docker/docker/pkg/stringid) -Requires: golang(github.com/docker/docker/pkg/system) -Requires: golang(github.com/docker/docker/pkg/truncindex) -Requires: golang(github.com/docker/docker/plugin/getter) -Requires: golang(github.com/docker/docker/reference) -Requires: golang(github.com/docker/go-connections/nat) -Requires: golang(github.com/docker/go-connections/sockets) -Requires: golang(github.com/docker/go-connections/tlsconfig) -Requires: golang(github.com/docker/go-units) -Requires: golang(github.com/docker/libtrust) -Requires: golang(github.com/ghodss/yaml) -Requires: golang(github.com/gogo/protobuf/proto) -Requires: golang(github.com/golang/glog) -Requires: golang(github.com/golang/protobuf/proto) -Requires: golang(github.com/gorilla/context) -Requires: golang(github.com/gorilla/mux) -Requires: golang(github.com/imdario/mergo) -Requires: golang(github.com/opencontainers/image-spec/specs-go) -Requires: golang(github.com/opencontainers/image-spec/specs-go/v1) -Requires: golang(github.com/opencontainers/runc/libcontainer/label) -Requires: golang(github.com/opencontainers/runc/libcontainer/selinux) -Requires: golang(github.com/opencontainers/runc/libcontainer/system) -Requires: golang(github.com/opencontainers/runc/libcontainer/user) -Requires: golang(github.com/opencontainers/runtime-spec/specs-go) -Requires: golang(github.com/opencontainers/runtime-tools/generate) -Requires: golang(github.com/rajatchopra/ocicni) -Requires: golang(github.com/syndtr/gocapability/capability) -Requires: golang(github.com/tchap/go-patricia/patricia) -Requires: golang(github.com/vbatts/tar-split/archive/tar) -Requires: golang(github.com/vbatts/tar-split/tar/asm) -Requires: golang(github.com/vbatts/tar-split/tar/storage) -Requires: golang(golang.org/x/net/context) -Requires: golang(golang.org/x/net/http2) -Requires: golang(golang.org/x/net/http2/hpack) -Requires: golang(golang.org/x/net/internal/timeseries) -Requires: golang(golang.org/x/net/proxy) -Requires: golang(golang.org/x/net/trace) -Requires: golang(golang.org/x/sys/unix) -Requires: golang(google.golang.org/grpc) -Requires: golang(google.golang.org/grpc/codes) -Requires: golang(google.golang.org/grpc/credentials) -Requires: golang(google.golang.org/grpc/grpclog) -Requires: golang(google.golang.org/grpc/internal) -Requires: golang(google.golang.org/grpc/metadata) -Requires: golang(google.golang.org/grpc/naming) -Requires: golang(google.golang.org/grpc/peer) -Requires: golang(google.golang.org/grpc/transport) -Requires: golang(gopkg.in/yaml.v2) -Requires: golang(k8s.io/kubernetes/pkg/fields) -Requires: golang(k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime) -Requires: golang(k8s.io/kubernetes/pkg/selection) -Requires: golang(k8s.io/kubernetes/pkg/util/errors) -Requires: golang(k8s.io/kubernetes/pkg/util/homedir) -Requires: golang(k8s.io/kubernetes/pkg/util/net) -Requires: golang(k8s.io/kubernetes/pkg/util/sets) +Summary: %{summary} +BuildArch: noarch +Requires: golang(github.com/BurntSushi/toml) +Requires: golang(github.com/Microsoft/go-winio) +Requires:golang(github.com/Sirupsen/logrus) +Requires:golang(github.com/containernetworking/cni/libcni) +Requires:golang(github.com/containernetworking/cni/pkg/invoke) +Requires:golang(github.com/containernetworking/cni/pkg/types) +Requires:golang(github.com/containernetworking/cni/pkg/version) +Requires:golang(github.com/containers/image/directory) +Requires:golang(github.com/containers/image/directory/explicitfilepath) +Requires:golang(github.com/containers/image/docker) +Requires:golang(github.com/containers/image/docker/policyconfiguration) +Requires:golang(github.com/containers/image/image) +Requires:golang(github.com/containers/image/manifest) +Requires:golang(github.com/containers/image/oci/layout) +Requires:golang(github.com/containers/image/openshift) +Requires:golang(github.com/containers/image/transports) +Requires:golang(github.com/containers/image/types) +Requires:golang(github.com/containers/image/version) +Requires:golang(github.com/docker/distribution) +Requires:golang(github.com/docker/distribution/context) +Requires:golang(github.com/docker/distribution/digest) +Requires:golang(github.com/docker/distribution/reference) +Requires:golang(github.com/docker/distribution/uuid) +Requires:golang(github.com/docker/docker/api/types/blkiodev) +Requires:golang(github.com/docker/docker/api/types/container) +Requires:golang(github.com/docker/docker/api/types/mount) +Requires:golang(github.com/docker/docker/api/types/strslice) +Requires:golang(github.com/docker/docker/api/types/versions) +Requires:golang(github.com/docker/docker/daemon/graphdriver) +Requires:golang(github.com/docker/docker/image) +Requires:golang(github.com/docker/docker/image/v1) +Requires:golang(github.com/docker/docker/layer) +Requires:golang(github.com/docker/docker/pkg/archive) +Requires:golang(github.com/docker/docker/pkg/chrootarchive) +Requires:golang(github.com/docker/docker/pkg/fileutils) +Requires:golang(github.com/docker/docker/pkg/homedir) +Requires:golang(github.com/docker/docker/pkg/idtools) +Requires:golang(github.com/docker/docker/pkg/ioutils) +Requires:golang(github.com/docker/docker/pkg/longpath) +Requires:golang(github.com/docker/docker/pkg/mount) +Requires:golang(github.com/docker/docker/pkg/plugins) +Requires:golang(github.com/docker/docker/pkg/plugins/transport) +Requires:golang(github.com/docker/docker/pkg/pools) +Requires:golang(github.com/docker/docker/pkg/promise) +Requires:golang(github.com/docker/docker/pkg/random) +Requires:golang(github.com/docker/docker/pkg/reexec) +Requires:golang(github.com/docker/docker/pkg/registrar) +Requires:golang(github.com/docker/docker/pkg/stringid) +Requires:golang(github.com/docker/docker/pkg/system) +Requires:golang(github.com/docker/docker/pkg/truncindex) +Requires:golang(github.com/docker/docker/plugin/getter) +Requires:golang(github.com/docker/docker/reference) +Requires:golang(github.com/docker/go-connections/nat) +Requires:golang(github.com/docker/go-connections/sockets) +Requires:golang(github.com/docker/go-connections/tlsconfig) +Requires:golang(github.com/docker/go-units) +Requires:golang(github.com/docker/libtrust) +Requires:golang(github.com/ghodss/yaml) +Requires:golang(github.com/gogo/protobuf/proto) +Requires:golang(github.com/golang/glog) +Requires:golang(github.com/golang/protobuf/proto) +Requires:golang(github.com/gorilla/context) +Requires:golang(github.com/gorilla/mux) +Requires:golang(github.com/imdario/mergo) +Requires:golang(github.com/opencontainers/image-spec/specs-go) +Requires:golang(github.com/opencontainers/image-spec/specs-go/v1) +Requires:golang(github.com/opencontainers/runc/libcontainer/label) +Requires:golang(github.com/opencontainers/runc/libcontainer/selinux) +Requires:golang(github.com/opencontainers/runc/libcontainer/system) +Requires:golang(github.com/opencontainers/runc/libcontainer/user) +Requires:golang(github.com/opencontainers/runtime-spec/specs-go) +Requires:golang(github.com/opencontainers/runtime-tools/generate) +Requires:golang(github.com/rajatchopra/ocicni) +Requires:golang(github.com/syndtr/gocapability/capability) +Requires:golang(github.com/tchap/go-patricia/patricia) +Requires:golang(github.com/vbatts/tar-split/archive/tar) +Requires:golang(github.com/vbatts/tar-split/tar/asm) +Requires:golang(github.com/vbatts/tar-split/tar/storage) +Requires:golang(golang.org/x/net/context) +Requires:golang(golang.org/x/net/http2) +Requires:golang(golang.org/x/net/http2/hpack) +Requires:golang(golang.org/x/net/internal/timeseries) +Requires:golang(golang.org/x/net/proxy) +Requires:golang(golang.org/x/net/trace) +Requires:golang(golang.org/x/sys/unix) +Requires:golang(google.golang.org/grpc) +Requires:golang(google.golang.org/grpc/codes) +Requires:golang(google.golang.org/grpc/credentials) +Requires:golang(google.golang.org/grpc/grpclog) +Requires:golang(google.golang.org/grpc/internal) +Requires:golang(google.golang.org/grpc/metadata) +Requires:golang(google.golang.org/grpc/naming) +Requires:golang(google.golang.org/grpc/peer) +Requires:golang(google.golang.org/grpc/transport) +Requires:golang(gopkg.in/yaml.v2) +Requires:golang(k8s.io/kubernetes/pkg/fields) +Requires:golang(k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime) +Requires:golang(k8s.io/kubernetes/pkg/selection) +Requires:golang(k8s.io/kubernetes/pkg/util/errors) +Requires:golang(k8s.io/kubernetes/pkg/util/homedir) +Requires:golang(k8s.io/kubernetes/pkg/util/net) +Requires:golang(k8s.io/kubernetes/pkg/util/sets) -Provides: golang(%{import_path}/oci) = %{version}-%{release} -Provides: golang(%{import_path}/server) = %{version}-%{release} -Provides: golang(%{import_path}/utils) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/BurntSushi/toml)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/Sirupsen/logrus)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/libcni)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/invoke)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/types)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/version)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory/explicitfilepath)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker/policyconfiguration)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/image)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/manifest)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/oci/layout)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/openshift)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/transports)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/types)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/version)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/coreos/go-systemd/daemon)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/context)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/digest)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/reference)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/uuid)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/blkiodev)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/container)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/mount)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/strslice)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/versions)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/daemon/graphdriver)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image/v1)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/layer)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/archive)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/chrootarchive)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/fileutils)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/homedir)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/idtools)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/ioutils)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/mount)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins/transport)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/pools)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/promise)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/random)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/reexec)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/registrar)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/stringid)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/system)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/truncindex)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/plugin/getter)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/reference)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/nat)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/sockets)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/tlsconfig)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-units)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/libtrust)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/ghodss/yaml)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/gogo/protobuf/proto)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/glog)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/protobuf/proto)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/context)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/mux)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/imdario/mergo)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go/v1)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/label)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/selinux)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/system)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/user)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-spec/specs-go)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-tools/generate)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/rajatchopra/ocicni)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/syndtr/gocapability/capability)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/tchap/go-patricia/patricia)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/urfave/cli)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/archive/tar)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/asm)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/storage)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/context)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2/hpack)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/proxy)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/trace)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/sys/unix)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/codes)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/credentials)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/grpclog)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/metadata)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/naming)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/peer)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/transport)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/gopkg.in/yaml.v2)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/fields)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/selection)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/errors)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/homedir)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/net)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/sets)) = %{version}-%{release} +Provides: golang(%{import_path}/oci) = %{version}-%{release} +Provides: golang(%{import_path}/server) = %{version}-%{release} +Provides: golang(%{import_path}/utils)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/BurntSushi/toml)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/Sirupsen/logrus)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/libcni)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/invoke)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/types)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/version)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory/explicitfilepath)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker/policyconfiguration)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/image)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/manifest)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/oci/layout)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/openshift)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/transports)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/types)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/version)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/coreos/go-systemd/daemon)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/context)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/digest)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/reference)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/uuid)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/blkiodev)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/container)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/mount)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/strslice)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/versions)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/daemon/graphdriver)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image/v1)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/layer)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/archive)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/chrootarchive)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/fileutils)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/homedir)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/idtools)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/ioutils)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/mount)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins/transport)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/pools)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/promise)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/random)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/reexec)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/registrar)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/stringid)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/system)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/truncindex)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/plugin/getter)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/reference)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/nat)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/sockets)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/tlsconfig)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-units)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/libtrust)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/ghodss/yaml)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/gogo/protobuf/proto)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/glog)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/protobuf/proto)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/context)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/mux)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/imdario/mergo)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go/v1)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/label)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/selinux)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/system)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/user)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-spec/specs-go)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-tools/generate)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/rajatchopra/ocicni)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/syndtr/gocapability/capability)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/tchap/go-patricia/patricia)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/urfave/cli)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/archive/tar)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/asm)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/storage)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/context)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2/hpack)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/proxy)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/trace)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/sys/unix)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/codes)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/credentials)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/grpclog)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/metadata)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/naming)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/peer)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/transport)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/gopkg.in/yaml.v2)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/fields)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/selection)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/errors)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/homedir)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/net)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/sets)) = %{version}-%{release} %description devel %{summary} @@ -292,14 +283,14 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test-devel -Summary: Unit tests for %{name} package +Summary: Unit tests for %{name} package %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests #in %%check section need for running %endif # test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} %description unit-test-devel %{summary} @@ -342,8 +333,8 @@ ln -s vendor src export GOPATH=$(pwd)/_output:$(pwd):%{gopath} export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.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 \ @@ -494,6 +485,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Sat Aug 11 2018 Lokesh Mandvekar - 2:1.12.0-12.dev.gitc4f232a +- use default %%gobuild +- built c4f232a +- enable debuginfo for rawhide + * Wed Aug 01 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-11.dev.git4c587e6 - autobuilt 4c587e6 diff --git a/sources b/sources index 3498805..e46d04e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-4c587e6.tar.gz) = 5848e334276ab3c101660d5b53e4ffb253c7b1a89bb7bd305fd074792fdffcfeed14ce173c1c0d4679f281e60b24df68fd35ce88995faeae2a9e7827e70e5e94 +SHA512 (cri-o-c4f232a.tar.gz) = 86cfbeefcf7f18baf3d05135043b9919d25a8bc6ca2dd0d87587d26088e4514dbb44de4a9d6546b8d229a1980f1c8ffb5bc794687c1a8656ad05b42ab1d49956 From 97dc2869abfbc866e86546bf16d0d114cd0b1905 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 16:25:00 +0000 Subject: [PATCH 162/202] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 887fe8f..5867ede 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -26,7 +26,7 @@ Name: cri-o Epoch: 2 Version: 1.12.0 -Release: 12.dev.git%{shortcommit0}%{?dist} +Release: 13.dev.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -485,6 +485,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2:1.12.0-13.dev.gitc4f232a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Aug 11 2018 Lokesh Mandvekar - 2:1.12.0-12.dev.gitc4f232a - use default %%gobuild - built c4f232a From 486f8184bbf0ff4c04de2aa72f438210844c45ee Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 22 Feb 2019 15:10:35 +0530 Subject: [PATCH 163/202] shipped in the cri-o module, use versioned branches --- .gitignore | 91 ---- cri-o.spec | 981 ----------------------------------------- crio-network.sysconfig | 3 - crio-storage.sysconfig | 2 - dead.package | 1 + sources | 1 - tests/test_crio.sh | 53 --- tests/test_crio.yml | 36 -- tests/tests.yml | 1 - 9 files changed, 1 insertion(+), 1168 deletions(-) delete mode 100644 .gitignore delete mode 100644 cri-o.spec delete mode 100644 crio-network.sysconfig delete mode 100644 crio-storage.sysconfig create mode 100644 dead.package delete mode 100644 sources delete mode 100755 tests/test_crio.sh delete mode 100644 tests/test_crio.yml delete mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a7c8599..0000000 --- a/.gitignore +++ /dev/null @@ -1,91 +0,0 @@ -/cri-o-c0fb3d9.tar.gz -/runc-67bd2ab.tar.gz -/cri-o-5dcbdc0.tar.gz -/plugins-dcf7368.tar.gz -/cri-o-91977d3.tar.gz -/cri-o-fa25b38.tar.gz -/cri-o-66d96e7.tar.gz -/cri-o-f9387ac.tar.gz -/cri-o-bb1da97.tar.gz -/cri-o-0fc411d.tar.gz -/cri-o-6784a66.tar.gz -/cri-o-a8ea146.tar.gz -/cri-o-d2c6f64.tar.gz -/cri-o-cd1bac5.tar.gz -/cri-o-a636972.tar.gz -/cri-o-64a30e1.tar.gz -/cri-o-748bc46.tar.gz -/cri-o-17bcfb4.tar.gz -/cri-o-80f54bc.tar.gz -/cri-o-32d1708.tar.gz -/cri-o-3de7ab4.tar.gz -/cri-o-d9922a9.tar.gz -/cri-o-0ab5e80.tar.gz -/cri-o-a85ea60.tar.gz -/cri-o-814c6ab.tar.gz -/cri-o-b066a83.tar.gz -/cri-o-63ea1dd.tar.gz -/cri-o-f09b2d3.tar.gz -/cri-o-28c7dee.tar.gz -/cri-o-125ec8a.tar.gz -/cri-o-5e48c92.tar.gz -/cri-o-a98f9c9.tar.gz -/cri-o-7d9d2aa.tar.gz -/cri-o-4d7e7dc.tar.gz -/cri-o-8723732.tar.gz -/cri-o-c956614.tar.gz -/cri-o-b0f6d98.tar.gz -/cri-o-623b502.tar.gz -/cri-o-86b61d4.tar.gz -/cri-o-d0dbfe0.tar.gz -/cri-o-1eec122.tar.gz -/cri-o-c24e0d9.tar.gz -/cri-o-596d052.tar.gz -/cri-o-733d791.tar.gz -/cri-o-c971f7b.tar.gz -/cri-o-a221a5d.tar.gz -/cri-o-4e4f1e2.tar.gz -/cri-o-4e6919c.tar.gz -/cri-o-6db7ef8.tar.gz -/cri-o-0489381.tar.gz -/cri-o-4e54603.tar.gz -/cri-o-5eb8c3b.tar.gz -/cri-o-52d0f53.tar.gz -/cri-o-728df92.tar.gz -/cri-o-55a3daa.tar.gz -/cri-o-72cb448.tar.gz -/cri-o-d4e89bd.tar.gz -/cri-o-97d2efd.tar.gz -/cri-o-19e97f2.tar.gz -/cri-o-dbcff37.tar.gz -/cri-o-e2fdb46.tar.gz -/cri-o-7910f24.tar.gz -/cri-o-1c0c3b0.tar.gz -/cri-o-055eb1e.tar.gz -/cri-o-540ebd6.tar.gz -/cri-o-54478a2.tar.gz -/cri-o-fcdc2c9.tar.gz -/cri-o-f64f5b8.tar.gz -/cri-o-be2c579.tar.gz -/cri-o-bac65b4.tar.gz -/cri-o-5a890d8.tar.gz -/cri-o-46e04a6.tar.gz -/cri-o-51dfd19.tar.gz -/cri-o-bd1dec3.tar.gz -/cri-o-fc6bebf.tar.gz -/cri-o-a18f4ed.tar.gz -/cri-o-f9ae39e.tar.gz -/cri-o-953f837.tar.gz -/cri-o-f9f8a53.tar.gz -/cri-o-45ccf08.tar.gz -/cri-o-3b86cde.tar.gz -/cri-o-9a46eba.tar.gz -/cri-o-14c22de.tar.gz -/cri-o-3374df8.tar.gz -/cri-o-b68ada4.tar.gz -/cri-o-1af50d7.tar.gz -/cri-o-57c4053.tar.gz -/cri-o-59f9418.tar.gz -/cri-o-3961eb3.tar.gz -/cri-o-4c587e6.tar.gz -/cri-o-c4f232a.tar.gz diff --git a/cri-o.spec b/cri-o.spec deleted file mode 100644 index 5867ede..0000000 --- a/cri-o.spec +++ /dev/null @@ -1,981 +0,0 @@ -%global with_devel 0 -%global with_unit_test 0 -%global with_check 1 -%global with_integration_tests 1 -%global with_debug 1 - -%if 0%{?with_debug} -%global _find_debuginfo_dwz_opts %{nil} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%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 c4f232a57ec42fe03c376a39e17c15300298ad78 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) - -%global service_name crio - -Name: cri-o -Epoch: 2 -Version: 1.12.0 -Release: 13.dev.git%{shortcommit0}%{?dist} -Summary: Kubernetes Container Runtime Interface for OCI-based containers -License: ASL 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz -Source3: %{service_name}-network.sysconfig -Source4: %{service_name}-storage.sysconfig -ExcludeArch: ppc64 -# 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: pkgconfig(systemd) -BuildRequires: device-mapper-devel -BuildRequires: make -Requires(pre): container-selinux -Requires: socat -Requires: iptables -Requires: iproute -Requires: conmon -BuildRequires: libseccomp-static -Requires: runc >= 2:1.0.0-15 -Requires: containers-common >= 0.1.24-6 -Recommends: containernetworking-plugins >= 0.5.2-7 -Provides: %{service_name} = %{epoch}:%{version}-%{release} -Provides: ocid = %{epoch}:%{version}-%{release} -Obsoletes: ocid <= 0.3 - -%description -%{summary} - -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch -Requires: golang(github.com/BurntSushi/toml) -Requires: golang(github.com/Microsoft/go-winio) -Requires:golang(github.com/Sirupsen/logrus) -Requires:golang(github.com/containernetworking/cni/libcni) -Requires:golang(github.com/containernetworking/cni/pkg/invoke) -Requires:golang(github.com/containernetworking/cni/pkg/types) -Requires:golang(github.com/containernetworking/cni/pkg/version) -Requires:golang(github.com/containers/image/directory) -Requires:golang(github.com/containers/image/directory/explicitfilepath) -Requires:golang(github.com/containers/image/docker) -Requires:golang(github.com/containers/image/docker/policyconfiguration) -Requires:golang(github.com/containers/image/image) -Requires:golang(github.com/containers/image/manifest) -Requires:golang(github.com/containers/image/oci/layout) -Requires:golang(github.com/containers/image/openshift) -Requires:golang(github.com/containers/image/transports) -Requires:golang(github.com/containers/image/types) -Requires:golang(github.com/containers/image/version) -Requires:golang(github.com/docker/distribution) -Requires:golang(github.com/docker/distribution/context) -Requires:golang(github.com/docker/distribution/digest) -Requires:golang(github.com/docker/distribution/reference) -Requires:golang(github.com/docker/distribution/uuid) -Requires:golang(github.com/docker/docker/api/types/blkiodev) -Requires:golang(github.com/docker/docker/api/types/container) -Requires:golang(github.com/docker/docker/api/types/mount) -Requires:golang(github.com/docker/docker/api/types/strslice) -Requires:golang(github.com/docker/docker/api/types/versions) -Requires:golang(github.com/docker/docker/daemon/graphdriver) -Requires:golang(github.com/docker/docker/image) -Requires:golang(github.com/docker/docker/image/v1) -Requires:golang(github.com/docker/docker/layer) -Requires:golang(github.com/docker/docker/pkg/archive) -Requires:golang(github.com/docker/docker/pkg/chrootarchive) -Requires:golang(github.com/docker/docker/pkg/fileutils) -Requires:golang(github.com/docker/docker/pkg/homedir) -Requires:golang(github.com/docker/docker/pkg/idtools) -Requires:golang(github.com/docker/docker/pkg/ioutils) -Requires:golang(github.com/docker/docker/pkg/longpath) -Requires:golang(github.com/docker/docker/pkg/mount) -Requires:golang(github.com/docker/docker/pkg/plugins) -Requires:golang(github.com/docker/docker/pkg/plugins/transport) -Requires:golang(github.com/docker/docker/pkg/pools) -Requires:golang(github.com/docker/docker/pkg/promise) -Requires:golang(github.com/docker/docker/pkg/random) -Requires:golang(github.com/docker/docker/pkg/reexec) -Requires:golang(github.com/docker/docker/pkg/registrar) -Requires:golang(github.com/docker/docker/pkg/stringid) -Requires:golang(github.com/docker/docker/pkg/system) -Requires:golang(github.com/docker/docker/pkg/truncindex) -Requires:golang(github.com/docker/docker/plugin/getter) -Requires:golang(github.com/docker/docker/reference) -Requires:golang(github.com/docker/go-connections/nat) -Requires:golang(github.com/docker/go-connections/sockets) -Requires:golang(github.com/docker/go-connections/tlsconfig) -Requires:golang(github.com/docker/go-units) -Requires:golang(github.com/docker/libtrust) -Requires:golang(github.com/ghodss/yaml) -Requires:golang(github.com/gogo/protobuf/proto) -Requires:golang(github.com/golang/glog) -Requires:golang(github.com/golang/protobuf/proto) -Requires:golang(github.com/gorilla/context) -Requires:golang(github.com/gorilla/mux) -Requires:golang(github.com/imdario/mergo) -Requires:golang(github.com/opencontainers/image-spec/specs-go) -Requires:golang(github.com/opencontainers/image-spec/specs-go/v1) -Requires:golang(github.com/opencontainers/runc/libcontainer/label) -Requires:golang(github.com/opencontainers/runc/libcontainer/selinux) -Requires:golang(github.com/opencontainers/runc/libcontainer/system) -Requires:golang(github.com/opencontainers/runc/libcontainer/user) -Requires:golang(github.com/opencontainers/runtime-spec/specs-go) -Requires:golang(github.com/opencontainers/runtime-tools/generate) -Requires:golang(github.com/rajatchopra/ocicni) -Requires:golang(github.com/syndtr/gocapability/capability) -Requires:golang(github.com/tchap/go-patricia/patricia) -Requires:golang(github.com/vbatts/tar-split/archive/tar) -Requires:golang(github.com/vbatts/tar-split/tar/asm) -Requires:golang(github.com/vbatts/tar-split/tar/storage) -Requires:golang(golang.org/x/net/context) -Requires:golang(golang.org/x/net/http2) -Requires:golang(golang.org/x/net/http2/hpack) -Requires:golang(golang.org/x/net/internal/timeseries) -Requires:golang(golang.org/x/net/proxy) -Requires:golang(golang.org/x/net/trace) -Requires:golang(golang.org/x/sys/unix) -Requires:golang(google.golang.org/grpc) -Requires:golang(google.golang.org/grpc/codes) -Requires:golang(google.golang.org/grpc/credentials) -Requires:golang(google.golang.org/grpc/grpclog) -Requires:golang(google.golang.org/grpc/internal) -Requires:golang(google.golang.org/grpc/metadata) -Requires:golang(google.golang.org/grpc/naming) -Requires:golang(google.golang.org/grpc/peer) -Requires:golang(google.golang.org/grpc/transport) -Requires:golang(gopkg.in/yaml.v2) -Requires:golang(k8s.io/kubernetes/pkg/fields) -Requires:golang(k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime) -Requires:golang(k8s.io/kubernetes/pkg/selection) -Requires:golang(k8s.io/kubernetes/pkg/util/errors) -Requires:golang(k8s.io/kubernetes/pkg/util/homedir) -Requires:golang(k8s.io/kubernetes/pkg/util/net) -Requires:golang(k8s.io/kubernetes/pkg/util/sets) - -Provides: golang(%{import_path}/oci) = %{version}-%{release} -Provides: golang(%{import_path}/server) = %{version}-%{release} -Provides: golang(%{import_path}/utils)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/BurntSushi/toml)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/Sirupsen/logrus)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/libcni)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/invoke)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/types)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/version)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory/explicitfilepath)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker/policyconfiguration)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/image)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/manifest)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/oci/layout)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/openshift)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/transports)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/types)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/version)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/coreos/go-systemd/daemon)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/context)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/digest)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/reference)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/uuid)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/blkiodev)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/container)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/mount)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/strslice)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/versions)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/daemon/graphdriver)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image/v1)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/layer)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/archive)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/chrootarchive)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/fileutils)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/homedir)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/idtools)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/ioutils)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/mount)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins/transport)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/pools)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/promise)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/random)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/reexec)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/registrar)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/stringid)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/system)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/truncindex)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/plugin/getter)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/reference)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/nat)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/sockets)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/tlsconfig)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-units)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/libtrust)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/ghodss/yaml)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/gogo/protobuf/proto)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/glog)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/protobuf/proto)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/context)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/mux)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/imdario/mergo)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go/v1)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/label)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/selinux)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/system)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/user)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-spec/specs-go)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-tools/generate)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/rajatchopra/ocicni)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/syndtr/gocapability/capability)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/tchap/go-patricia/patricia)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/urfave/cli)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/archive/tar)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/asm)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/storage)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/context)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2/hpack)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/proxy)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/trace)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/sys/unix)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/codes)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/credentials)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/grpclog)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/metadata)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/naming)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/peer)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/transport)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/gopkg.in/yaml.v2)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/fields)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/selection)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/errors)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/homedir)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/net)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/sets)) = %{version}-%{release} - -%description devel -%{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif - -%package -n conmon -Summary: OCI container runtime monitor - -%description -n conmon -conmon is an OCI container runtime monitor. - -%if 0%{?with_integration_tests} -%package integration-tests -Summary: Integration tests for %{name} -Requires: %{service_name} = %{epoch}:%{version}-%{release} -Requires: bats -Requires: containernetworking-cni -Requires: nmap-ncat -Requires: socat - -%description integration-tests -%{summary} -%endif - -%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):%{gopath} -export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) containers_image_ostree_stub" - -%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 \ - --cgroup-manager=systemd \ - --conmon /usr/libexec/%{service_name}/conmon \ - --cni-plugin-dir /usr/libexec/cni \ - --default-mounts /usr/share/rhel/secrets:/run/secrets \ - --cgroup-manager=systemd config > %{service_name}.conf%{?dist} - -%if 0%{?with_integration_tests} -export GOPATH=$(pwd)/_output -for i in bin2img copyimg checkseccomp; do - GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o test/$i/$i %{provider_prefix}/test/$i -done -%endif - -%install -sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/%{service_name}.service -make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd - -# 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 config -install -p -m 644 %{service_name}.conf%{?dist} %{buildroot}%{_sysconfdir}/%{service_name}/%{service_name}.conf - -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 - -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test.file-list -for file in $(find . -iname "*_test.go"); do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list -done -%endif - -%if 0%{?with_integration_tests} -install -d -p %{buildroot}/%{_datadir}/%{name}/test -cp -r test %{buildroot}/%{_datadir}/%{name}/ - -install -d -p %{buildroot}/etc/containers/registries.d -cp test/redhat_sigstore.yaml %{buildroot}/etc/containers/registries.d/registry.access.redhat.com.yaml -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - -%check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -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} - -%if 0%{?with_devel} -%files devel -f devel.file-list -%license LICENSE -%doc README.md code-of-conduct.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md code-of-conduct.md -%endif - -%if 0%{?with_integration_tests} -%files integration-tests -%license LICENSE -%doc README.md -%{_datadir}/%{name}/test/* -/etc/containers/registries.d/registry.access.redhat.com.yaml -%endif - -%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}/pause -%{_unitdir}/%{service_name}.service -%{_unitdir}/cri-o.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 - -%files -n conmon -%license LICENSE -%doc README.md -%{_libexecdir}/%{service_name}/conmon - -%changelog -* Thu Jan 31 2019 Fedora Release Engineering - 2:1.12.0-13.dev.gitc4f232a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Aug 11 2018 Lokesh Mandvekar - 2:1.12.0-12.dev.gitc4f232a -- use default %%gobuild -- built c4f232a -- enable debuginfo for rawhide - -* Wed Aug 01 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-11.dev.git4c587e6 -- autobuilt 4c587e6 - -* Fri Jul 27 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-10.dev.git3961eb3 -- autobuilt 3961eb3 - -* Wed Jul 25 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-9.dev.git59f9418 -- autobuilt 59f9418 - -* Wed Jul 18 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-8.dev.git57c4053 -- autobuilt 57c4053 - -* Tue Jul 17 2018 Lokesh Mandvekar - 2:1.12.0-7.dev.git1af50d7 -- make debuginfo delve debugger friendly -- use containers-common instead of skopeo-containers (just a name change) -- disable debuginfo for f29 - -* Thu Jul 12 2018 Fedora Release Engineering - 2:1.12.0-6.dev.git1af50d7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 09 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-5.git1af50d7 -- autobuilt 1af50d7 - -* Sun Jul 08 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-4.gitb68ada4 -- autobuilt b68ada4 - -* Sat Jul 07 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-3.git3374df8 -- autobuilt 3374df8 - -* Fri Jul 06 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-2.git14c22de -- autobuilt 14c22de - -* Wed Jul 04 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-1.git9a46eba -- bump to 1.12.0 -- autobuilt 9a46eba - -* Sat Jun 30 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-27.git3b86cde -- autobuilt 3b86cde - -* Fri Jun 29 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-26.git45ccf08 -- autobuilt 45ccf08 - -* Thu Jun 28 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-25.gitf9f8a53 -- autobuilt f9f8a53 - -* Wed Jun 27 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-24.git953f837 -- autobuilt 953f837 - -* Tue Jun 26 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-23.gitf9ae39e -- autobuilt f9ae39e - -* Sat Jun 23 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-22.gita18f4ed -- autobuilt a18f4ed - -* Thu Jun 21 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-21.gitfc6bebf -- autobuilt fc6bebf - -* Tue Jun 19 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-20.gitbd1dec3 -- autobuilt bd1dec3 - -* Mon Jun 18 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-19.git51dfd19 -- autobuilt 51dfd19 - -* Sat Jun 16 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-18.git46e04a6 -- autobuilt 46e04a6 - -* Fri Jun 15 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-17.git5a890d8 -- autobuilt 5a890d8 - -* Thu Jun 14 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-16.gitbac65b4 -- autobuilt bac65b4 - -* Wed Jun 13 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-15.gitbe2c579 -- autobuilt be2c579 - -* Tue Jun 12 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-14.gitf64f5b8 -- autobuilt f64f5b8 - -* Sun Jun 10 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-13.gitfcdc2c9 -- autobuilt fcdc2c9 - -* Thu Jun 07 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-12.git54478a2 -- autobuilt 54478a2 - -* Wed Jun 06 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-11.git540ebd6 -- autobuilt 540ebd6 - -* Tue Jun 05 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-10.git055eb1e -- autobuilt 055eb1e - -* Sun Jun 03 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-9.git1c0c3b0 -- autobuilt 1c0c3b0 - -* Fri Jun 01 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-8.git7910f24 -- autobuilt 7910f24 - -* Thu May 31 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-7.gite2fdb46 -- autobuilt e2fdb46 - -* Wed May 30 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-6.gitdbcff37 -- autobuilt dbcff37 - -* Fri May 25 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-5.git19e97f2 -- autobuilt 19e97f2 - -* Fri May 18 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-4.git97d2efd -- autobuilt 97d2efd - -* Thu May 17 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-3.gitd4e89bd -- autobuilt d4e89bd - -* Wed May 16 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-2.git72cb448 -- autobuilt 72cb448 - -* Fri May 11 2018 Lokesh Mandvekar - 2:1.11.0-1.git55a3daa -- bump to v1.11.0 -- built commit 55a3daa - -* Tue May 8 2018 Dan Walsh - 2:1.10.1-1.git728df92 -- bump to v1.10.1 - -* Tue May 08 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-37.git52d0f53 -- autobuilt 52d0f53 - -* Mon May 07 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-36.git5eb8c3b -- autobuilt 5eb8c3b - -* Sun May 06 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-35.git4e54603 -- autobuilt 4e54603 - -* Sat May 05 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-34.git0489381 -- autobuilt 0489381 - -* Fri May 04 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-33.git6db7ef8 -- autobuilt 6db7ef8 - -* Wed May 02 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-32.git4e6919c -- autobuilt commit 4e6919c - -* Wed May 02 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-31.git4e4f1e2 -- autobuilt commit 4e4f1e2 - -* Mon Apr 30 2018 Dan Walsh - 2:1.10.0-30.gita221a5d -- Fix crio.conf to use correct path to conmon and systemd for cgroup management - -* Mon Apr 30 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-28.gita221a5d -- autobuilt commit a221a5d - -* Fri Apr 27 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-27.gitc971f7b -- autobuilt commit c971f7b - -* Thu Apr 26 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-26.git733d791 -- autobuilt commit 733d791 - -* Tue Apr 24 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-25.git596d052 -- autobuilt commit 596d052 - -* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-24.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-23.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-22.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-21.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-20.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-19.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Sun Apr 15 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-18.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Sat Apr 14 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-17.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Fri Apr 13 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-16.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Thu Apr 12 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-15.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Wed Apr 11 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-14.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-13.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-12.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-11.git1eec122 -- autobuilt commit 1eec122 - -* Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-10.git1eec122 -- autobuilt commit 1eec122 - -* Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-9.git1eec122 -- autobuilt commit 1eec122 - -* Sun Apr 08 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-8.gitd0dbfe0 -- autobuilt commit d0dbfe0 - -* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-7.gitd0dbfe0 -- autobuilt commit d0dbfe0 - -* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-6.gitd0dbfe0 -- autobuilt commit d0dbfe0 - -* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-5.git86b61d4 -- built commit 86b61d4 - -* Fri Mar 30 2018 Dan Walsh - 2:1.10.0-4 -- Release of v1.10.0 - -* Mon Mar 26 2018 Lokesh Mandvekar - 2:1.10.0-3.gitb0f6d98 -- built commit b0f6d98 - -* Fri Mar 16 2018 Dan Walsh - 2:1.10.0-beta.1 -- bump to v1.10.0-beta.1 - -* 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 - -* Thu Mar 01 2018 Lokesh Mandvekar - 2:1.9.8-1.git7d9d2aa -- bump to v1.9.8 -- enable integration tests for centos - -* Fri Feb 23 2018 Lokesh Mandvekar - 2:1.9.7-2.gita98f9c9 -- make sure correct version in changelog - -* 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 Feb 07 2018 Fedora Release Engineering - 2:1.9.1-2.gitb066a83 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 24 2018 Dan Walsh - 2:1.9.1-1.gitb066a8 -- Final Release 1.9.1 - -* Mon Dec 18 2017 Lokesh Mandvekar - 2:1.9.0-4.gita85ea60 -- need runc >= 2:1.0.0-15 - -* Fri Dec 15 2017 Dan Walsh - 2:1.9.0-3.gita85ea60 -- Final Release 1.9.0 - -* Mon Dec 11 2017 Dan Walsh - 2:1.9.0-1.beta.1.gita85ea60 -- Update to kubernetes 1.9.0 beta 2 cri requirements -- container_exec: fix terminal true process json -- lib: sandbox: refactor to memory store - -* Sun Dec 10 2017 Dan Walsh - 2:1.9.0-1.beta.1.git0ab5e80 -- Update to kubernetes 1.9.0 beta 1 cri requirements - -* Sun Dec 10 2017 Dan Walsh - 2:1.8.3-1.gitd9922a9 -- container_create: fix apparmor from container config -- container_create: correctly set image and kube envs -- oci: do not append conmon env to container process -- container_exec: use process file with runc exec - -* Thu Nov 30 2017 Lokesh Mandvekar - 2:1.8.2-3.git3de7ab4c -- cri-o should require conmon and not the other way around - -* Wed Nov 29 2017 Lokesh Mandvekar - 2:1.8.2-2.git3de7ab4c -- add additional deps -- From: Antonio Murdaca - -* Wed Nov 29 2017 Lokesh Mandvekar - 2:1.8.2-1.git3de7ab4c -- bump to v1.8.2 - -* Tue Nov 28 2017 Lokesh Mandvekar - 2:1.8.1-2.git32d1708d -- separate conmon into a separate subpackage - -* Wed Nov 22 2017 Dan Walsh - 1.8.1-1.git32d1708d -- Add /proc/scsi to masked paths - -* Mon Nov 13 2017 Dan Walsh - 1.8.0-1.git80f54bc1 -- bump v1.8.0 -- Add support for Kubernetes v1.8 -- kpod support moved to the kpod package. - -* Thu Nov 09 2017 Lokesh Mandvekar - 1.0.3-1.git17bcfb4 -- bump to v1.0.3 - -* 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 - -* Mon Oct 16 2017 Dan Walsh - 1.0.0-6.gita636972 -- Add epoch to make sure that this installs - -* Mon Oct 16 2017 Dan Walsh - 1.0.0-5.gita636972 -- Get the correct checksum - -* Fri Oct 13 2017 Dan Walsh - 1.0.0-4.gitcd1bac5 -- Release v1.0.0 -- Performance improvements -- Add secrets patch to default mount directories from the host into containers -- Add kpod login/logout -- Change debug flag to log-level, allows admin to specify the loggin level -- Bump to kube v1.7.8 -- Build with go 1.8.4 - -* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-3.rc3.gitd2c6f64 -- build v1.0.0-rc3 tag - -* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-2.rc3.dev.gita8ea146 -- adjust runc dep for CentOS Virt SIG builds - -* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-1.rc3.dev.gita8ea146 -- bump to 1.0.0-rc3.dev -- built commit a8ea146 - -* Wed Sep 20 2017 Lokesh Mandvekar - 1.0.0-1.rc2.git6784a66 -- bump to v1.0.0-rc2 - -* Tue Sep 12 2017 Dan Walsh - 1.0.0.rc1-2.gitbb1da97 -- Change default storage to overlay not overlay2, which shoulf fix issues with kpod working out of the box. - -* Fri Sep 8 2017 Dan Walsh - 1.0.0.rc1-1.gitbb1da97 -- Bugs, stability and performance fixes -- Moved from kubernetes 1.6 to 1.7 -- cadvisor isupport -- Full kube e2e tests coverage. We are now gating pull requests on kube e2e (we were gating them just on node-e2e). -- Continue working on kpod -- kpod cp -- kpod diff -- kpod export -- kpod logs -- kpod mount -- kpod ps -- kpod rename -- kpod stats -- kpod umount - -* Tue Sep 5 2017 Lokesh Mandvekar - 1.0.0.beta.0-3.gitf9387ac -- btrfs_noversion in BUILDTAGS for previous build was in error - -* Tue Sep 5 2017 Lokesh Mandvekar - 1.0.0.beta.0-2.gitf9387ac -- bump to latest master -- use runc >= 2:1.0.0-10 - -* 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 - -* Wed Aug 02 2017 Fedora Release Engineering - 1.0.0.alpha.0-5.gitfa25b38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.0.0.alpha.0-4.gitfa25b38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jul 13 2017 Lokesh Mandvekar - 1.0.0.alpha.0-3.gitfa25b38 -- enable all arches except ppc64 because it's been removed from goarches - -* Thu Jul 13 2017 Lokesh Mandvekar - 1.0.0.alpha.0-2.gitfa25b38 -- built commit fa25b38 -- Provides: crio - -* 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) -- skip s390x build (rhbz#1466865) - -* 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 deleted file mode 100644 index 7c47f86..0000000 --- a/crio-network.sysconfig +++ /dev/null @@ -1,3 +0,0 @@ -# /etc/sysconfig/crio-network - -CRIO_NETWORK_OPTIONS= diff --git a/crio-storage.sysconfig b/crio-storage.sysconfig deleted file mode 100644 index fbc68c5..0000000 --- a/crio-storage.sysconfig +++ /dev/null @@ -1,2 +0,0 @@ -# /etc/sysconfig/crio-storage -CRIO_STORAGE_OPTIONS= diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5932d43 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +shipped in the cri-o module, use versioned branches diff --git a/sources b/sources deleted file mode 100644 index e46d04e..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (cri-o-c4f232a.tar.gz) = 86cfbeefcf7f18baf3d05135043b9919d25a8bc6ca2dd0d87587d26088e4514dbb44de4a9d6546b8d229a1980f1c8ffb5bc794687c1a8656ad05b42ab1d49956 diff --git a/tests/test_crio.sh b/tests/test_crio.sh deleted file mode 100755 index fd1a9ae..0000000 --- a/tests/test_crio.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/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 deleted file mode 100644 index 42a7f3a..0000000 --- a/tests/test_crio.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- 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 deleted file mode 100644 index 7c259f4..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1 +0,0 @@ -- import_playbook: test_crio.yml From 5ec366ab35a809bbfb7c386adf49b1831172e9a3 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Fri, 22 Feb 2019 15:13:38 +0530 Subject: [PATCH 164/202] update dead.package text Signed-off-by: Lokesh Mandvekar --- dead.package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dead.package b/dead.package index 5932d43..2cd972c 100644 --- a/dead.package +++ b/dead.package @@ -1 +1 @@ -shipped in the cri-o module, use versioned branches +shipped in the cri-o module, see versioned branches instead From 8a8c1bc6b22327efc373f550c42201882c33b8c6 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Wed, 18 Aug 2021 10:31:34 +0200 Subject: [PATCH 165/202] Revert "update dead.package text" This reverts commit 5ec366ab35a809bbfb7c386adf49b1831172e9a3. Unretirement request: https://pagure.io/releng/issue/10273 Signed-off-by: Tomas Hrcka --- dead.package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dead.package b/dead.package index 2cd972c..5932d43 100644 --- a/dead.package +++ b/dead.package @@ -1 +1 @@ -shipped in the cri-o module, see versioned branches instead +shipped in the cri-o module, use versioned branches From 6b5d63550a794d9d062714f5dc3779fc6012a437 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Mon, 6 Dec 2021 16:30:26 +0100 Subject: [PATCH 166/202] Revert "shipped in the cri-o module, use versioned branches" This reverts commit 486f8184bbf0ff4c04de2aa72f438210844c45ee. Unretiremetnrequest: https://pagure.io/releng/issue/10273 Signed-off-by: Tomas Hrcka --- .gitignore | 91 ++++ cri-o.spec | 981 +++++++++++++++++++++++++++++++++++++++++ crio-network.sysconfig | 3 + crio-storage.sysconfig | 2 + dead.package | 1 - sources | 1 + tests/test_crio.sh | 53 +++ tests/test_crio.yml | 36 ++ tests/tests.yml | 1 + 9 files changed, 1168 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 cri-o.spec create mode 100644 crio-network.sysconfig create mode 100644 crio-storage.sysconfig delete mode 100644 dead.package create mode 100644 sources create mode 100755 tests/test_crio.sh create mode 100644 tests/test_crio.yml create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a7c8599 --- /dev/null +++ b/.gitignore @@ -0,0 +1,91 @@ +/cri-o-c0fb3d9.tar.gz +/runc-67bd2ab.tar.gz +/cri-o-5dcbdc0.tar.gz +/plugins-dcf7368.tar.gz +/cri-o-91977d3.tar.gz +/cri-o-fa25b38.tar.gz +/cri-o-66d96e7.tar.gz +/cri-o-f9387ac.tar.gz +/cri-o-bb1da97.tar.gz +/cri-o-0fc411d.tar.gz +/cri-o-6784a66.tar.gz +/cri-o-a8ea146.tar.gz +/cri-o-d2c6f64.tar.gz +/cri-o-cd1bac5.tar.gz +/cri-o-a636972.tar.gz +/cri-o-64a30e1.tar.gz +/cri-o-748bc46.tar.gz +/cri-o-17bcfb4.tar.gz +/cri-o-80f54bc.tar.gz +/cri-o-32d1708.tar.gz +/cri-o-3de7ab4.tar.gz +/cri-o-d9922a9.tar.gz +/cri-o-0ab5e80.tar.gz +/cri-o-a85ea60.tar.gz +/cri-o-814c6ab.tar.gz +/cri-o-b066a83.tar.gz +/cri-o-63ea1dd.tar.gz +/cri-o-f09b2d3.tar.gz +/cri-o-28c7dee.tar.gz +/cri-o-125ec8a.tar.gz +/cri-o-5e48c92.tar.gz +/cri-o-a98f9c9.tar.gz +/cri-o-7d9d2aa.tar.gz +/cri-o-4d7e7dc.tar.gz +/cri-o-8723732.tar.gz +/cri-o-c956614.tar.gz +/cri-o-b0f6d98.tar.gz +/cri-o-623b502.tar.gz +/cri-o-86b61d4.tar.gz +/cri-o-d0dbfe0.tar.gz +/cri-o-1eec122.tar.gz +/cri-o-c24e0d9.tar.gz +/cri-o-596d052.tar.gz +/cri-o-733d791.tar.gz +/cri-o-c971f7b.tar.gz +/cri-o-a221a5d.tar.gz +/cri-o-4e4f1e2.tar.gz +/cri-o-4e6919c.tar.gz +/cri-o-6db7ef8.tar.gz +/cri-o-0489381.tar.gz +/cri-o-4e54603.tar.gz +/cri-o-5eb8c3b.tar.gz +/cri-o-52d0f53.tar.gz +/cri-o-728df92.tar.gz +/cri-o-55a3daa.tar.gz +/cri-o-72cb448.tar.gz +/cri-o-d4e89bd.tar.gz +/cri-o-97d2efd.tar.gz +/cri-o-19e97f2.tar.gz +/cri-o-dbcff37.tar.gz +/cri-o-e2fdb46.tar.gz +/cri-o-7910f24.tar.gz +/cri-o-1c0c3b0.tar.gz +/cri-o-055eb1e.tar.gz +/cri-o-540ebd6.tar.gz +/cri-o-54478a2.tar.gz +/cri-o-fcdc2c9.tar.gz +/cri-o-f64f5b8.tar.gz +/cri-o-be2c579.tar.gz +/cri-o-bac65b4.tar.gz +/cri-o-5a890d8.tar.gz +/cri-o-46e04a6.tar.gz +/cri-o-51dfd19.tar.gz +/cri-o-bd1dec3.tar.gz +/cri-o-fc6bebf.tar.gz +/cri-o-a18f4ed.tar.gz +/cri-o-f9ae39e.tar.gz +/cri-o-953f837.tar.gz +/cri-o-f9f8a53.tar.gz +/cri-o-45ccf08.tar.gz +/cri-o-3b86cde.tar.gz +/cri-o-9a46eba.tar.gz +/cri-o-14c22de.tar.gz +/cri-o-3374df8.tar.gz +/cri-o-b68ada4.tar.gz +/cri-o-1af50d7.tar.gz +/cri-o-57c4053.tar.gz +/cri-o-59f9418.tar.gz +/cri-o-3961eb3.tar.gz +/cri-o-4c587e6.tar.gz +/cri-o-c4f232a.tar.gz diff --git a/cri-o.spec b/cri-o.spec new file mode 100644 index 0000000..5867ede --- /dev/null +++ b/cri-o.spec @@ -0,0 +1,981 @@ +%global with_devel 0 +%global with_unit_test 0 +%global with_check 1 +%global with_integration_tests 1 +%global with_debug 1 + +%if 0%{?with_debug} +%global _find_debuginfo_dwz_opts %{nil} +%global _dwz_low_mem_die_limit 0 +%else +%global debug_package %{nil} +%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 c4f232a57ec42fe03c376a39e17c15300298ad78 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) + +%global service_name crio + +Name: cri-o +Epoch: 2 +Version: 1.12.0 +Release: 13.dev.git%{shortcommit0}%{?dist} +Summary: Kubernetes Container Runtime Interface for OCI-based containers +License: ASL 2.0 +URL: https://%{provider_prefix} +Source0: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Source3: %{service_name}-network.sysconfig +Source4: %{service_name}-storage.sysconfig +ExcludeArch: ppc64 +# 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: pkgconfig(systemd) +BuildRequires: device-mapper-devel +BuildRequires: make +Requires(pre): container-selinux +Requires: socat +Requires: iptables +Requires: iproute +Requires: conmon +BuildRequires: libseccomp-static +Requires: runc >= 2:1.0.0-15 +Requires: containers-common >= 0.1.24-6 +Recommends: containernetworking-plugins >= 0.5.2-7 +Provides: %{service_name} = %{epoch}:%{version}-%{release} +Provides: ocid = %{epoch}:%{version}-%{release} +Obsoletes: ocid <= 0.3 + +%description +%{summary} + +%if 0%{?with_devel} +%package devel +Summary: %{summary} +BuildArch: noarch +Requires: golang(github.com/BurntSushi/toml) +Requires: golang(github.com/Microsoft/go-winio) +Requires:golang(github.com/Sirupsen/logrus) +Requires:golang(github.com/containernetworking/cni/libcni) +Requires:golang(github.com/containernetworking/cni/pkg/invoke) +Requires:golang(github.com/containernetworking/cni/pkg/types) +Requires:golang(github.com/containernetworking/cni/pkg/version) +Requires:golang(github.com/containers/image/directory) +Requires:golang(github.com/containers/image/directory/explicitfilepath) +Requires:golang(github.com/containers/image/docker) +Requires:golang(github.com/containers/image/docker/policyconfiguration) +Requires:golang(github.com/containers/image/image) +Requires:golang(github.com/containers/image/manifest) +Requires:golang(github.com/containers/image/oci/layout) +Requires:golang(github.com/containers/image/openshift) +Requires:golang(github.com/containers/image/transports) +Requires:golang(github.com/containers/image/types) +Requires:golang(github.com/containers/image/version) +Requires:golang(github.com/docker/distribution) +Requires:golang(github.com/docker/distribution/context) +Requires:golang(github.com/docker/distribution/digest) +Requires:golang(github.com/docker/distribution/reference) +Requires:golang(github.com/docker/distribution/uuid) +Requires:golang(github.com/docker/docker/api/types/blkiodev) +Requires:golang(github.com/docker/docker/api/types/container) +Requires:golang(github.com/docker/docker/api/types/mount) +Requires:golang(github.com/docker/docker/api/types/strslice) +Requires:golang(github.com/docker/docker/api/types/versions) +Requires:golang(github.com/docker/docker/daemon/graphdriver) +Requires:golang(github.com/docker/docker/image) +Requires:golang(github.com/docker/docker/image/v1) +Requires:golang(github.com/docker/docker/layer) +Requires:golang(github.com/docker/docker/pkg/archive) +Requires:golang(github.com/docker/docker/pkg/chrootarchive) +Requires:golang(github.com/docker/docker/pkg/fileutils) +Requires:golang(github.com/docker/docker/pkg/homedir) +Requires:golang(github.com/docker/docker/pkg/idtools) +Requires:golang(github.com/docker/docker/pkg/ioutils) +Requires:golang(github.com/docker/docker/pkg/longpath) +Requires:golang(github.com/docker/docker/pkg/mount) +Requires:golang(github.com/docker/docker/pkg/plugins) +Requires:golang(github.com/docker/docker/pkg/plugins/transport) +Requires:golang(github.com/docker/docker/pkg/pools) +Requires:golang(github.com/docker/docker/pkg/promise) +Requires:golang(github.com/docker/docker/pkg/random) +Requires:golang(github.com/docker/docker/pkg/reexec) +Requires:golang(github.com/docker/docker/pkg/registrar) +Requires:golang(github.com/docker/docker/pkg/stringid) +Requires:golang(github.com/docker/docker/pkg/system) +Requires:golang(github.com/docker/docker/pkg/truncindex) +Requires:golang(github.com/docker/docker/plugin/getter) +Requires:golang(github.com/docker/docker/reference) +Requires:golang(github.com/docker/go-connections/nat) +Requires:golang(github.com/docker/go-connections/sockets) +Requires:golang(github.com/docker/go-connections/tlsconfig) +Requires:golang(github.com/docker/go-units) +Requires:golang(github.com/docker/libtrust) +Requires:golang(github.com/ghodss/yaml) +Requires:golang(github.com/gogo/protobuf/proto) +Requires:golang(github.com/golang/glog) +Requires:golang(github.com/golang/protobuf/proto) +Requires:golang(github.com/gorilla/context) +Requires:golang(github.com/gorilla/mux) +Requires:golang(github.com/imdario/mergo) +Requires:golang(github.com/opencontainers/image-spec/specs-go) +Requires:golang(github.com/opencontainers/image-spec/specs-go/v1) +Requires:golang(github.com/opencontainers/runc/libcontainer/label) +Requires:golang(github.com/opencontainers/runc/libcontainer/selinux) +Requires:golang(github.com/opencontainers/runc/libcontainer/system) +Requires:golang(github.com/opencontainers/runc/libcontainer/user) +Requires:golang(github.com/opencontainers/runtime-spec/specs-go) +Requires:golang(github.com/opencontainers/runtime-tools/generate) +Requires:golang(github.com/rajatchopra/ocicni) +Requires:golang(github.com/syndtr/gocapability/capability) +Requires:golang(github.com/tchap/go-patricia/patricia) +Requires:golang(github.com/vbatts/tar-split/archive/tar) +Requires:golang(github.com/vbatts/tar-split/tar/asm) +Requires:golang(github.com/vbatts/tar-split/tar/storage) +Requires:golang(golang.org/x/net/context) +Requires:golang(golang.org/x/net/http2) +Requires:golang(golang.org/x/net/http2/hpack) +Requires:golang(golang.org/x/net/internal/timeseries) +Requires:golang(golang.org/x/net/proxy) +Requires:golang(golang.org/x/net/trace) +Requires:golang(golang.org/x/sys/unix) +Requires:golang(google.golang.org/grpc) +Requires:golang(google.golang.org/grpc/codes) +Requires:golang(google.golang.org/grpc/credentials) +Requires:golang(google.golang.org/grpc/grpclog) +Requires:golang(google.golang.org/grpc/internal) +Requires:golang(google.golang.org/grpc/metadata) +Requires:golang(google.golang.org/grpc/naming) +Requires:golang(google.golang.org/grpc/peer) +Requires:golang(google.golang.org/grpc/transport) +Requires:golang(gopkg.in/yaml.v2) +Requires:golang(k8s.io/kubernetes/pkg/fields) +Requires:golang(k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime) +Requires:golang(k8s.io/kubernetes/pkg/selection) +Requires:golang(k8s.io/kubernetes/pkg/util/errors) +Requires:golang(k8s.io/kubernetes/pkg/util/homedir) +Requires:golang(k8s.io/kubernetes/pkg/util/net) +Requires:golang(k8s.io/kubernetes/pkg/util/sets) + +Provides: golang(%{import_path}/oci) = %{version}-%{release} +Provides: golang(%{import_path}/server) = %{version}-%{release} +Provides: golang(%{import_path}/utils)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/BurntSushi/toml)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/Sirupsen/logrus)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/libcni)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/invoke)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/types)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/version)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory/explicitfilepath)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker/policyconfiguration)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/image)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/manifest)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/oci/layout)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/openshift)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/transports)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/types)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/version)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/coreos/go-systemd/daemon)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/context)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/digest)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/reference)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/uuid)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/blkiodev)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/container)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/mount)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/strslice)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/versions)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/daemon/graphdriver)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image/v1)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/layer)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/archive)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/chrootarchive)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/fileutils)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/homedir)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/idtools)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/ioutils)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/mount)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins/transport)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/pools)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/promise)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/random)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/reexec)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/registrar)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/stringid)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/system)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/truncindex)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/plugin/getter)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/reference)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/nat)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/sockets)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/tlsconfig)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-units)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/libtrust)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/ghodss/yaml)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/gogo/protobuf/proto)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/glog)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/protobuf/proto)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/context)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/mux)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/imdario/mergo)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go/v1)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/label)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/selinux)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/system)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/user)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-spec/specs-go)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-tools/generate)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/rajatchopra/ocicni)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/syndtr/gocapability/capability)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/tchap/go-patricia/patricia)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/urfave/cli)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/archive/tar)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/asm)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/storage)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/context)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2/hpack)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/proxy)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/trace)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/sys/unix)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/codes)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/credentials)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/grpclog)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/metadata)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/naming)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/peer)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/transport)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/gopkg.in/yaml.v2)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/fields)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/selection)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/errors)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/homedir)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/net)) = %{version}-%{release} +Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/sets)) = %{version}-%{release} + +%description devel +%{summary} + +This package contains library source intended for +building other packages which use import path with +%{import_path} prefix. +%endif + +%if 0%{?with_unit_test} && 0%{?with_devel} +%package unit-test-devel +Summary: Unit tests for %{name} package +%if 0%{?with_check} +#Here comes all BuildRequires: PACKAGE the unit tests +#in %%check section need for running +%endif + +# test subpackage tests code from devel subpackage +Requires: %{name}-devel = %{version}-%{release} + +%description unit-test-devel +%{summary} + +This package contains unit tests for project +providing packages with %{import_path} prefix. +%endif + +%package -n conmon +Summary: OCI container runtime monitor + +%description -n conmon +conmon is an OCI container runtime monitor. + +%if 0%{?with_integration_tests} +%package integration-tests +Summary: Integration tests for %{name} +Requires: %{service_name} = %{epoch}:%{version}-%{release} +Requires: bats +Requires: containernetworking-cni +Requires: nmap-ncat +Requires: socat + +%description integration-tests +%{summary} +%endif + +%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):%{gopath} +export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) containers_image_ostree_stub" + +%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 \ + --cgroup-manager=systemd \ + --conmon /usr/libexec/%{service_name}/conmon \ + --cni-plugin-dir /usr/libexec/cni \ + --default-mounts /usr/share/rhel/secrets:/run/secrets \ + --cgroup-manager=systemd config > %{service_name}.conf%{?dist} + +%if 0%{?with_integration_tests} +export GOPATH=$(pwd)/_output +for i in bin2img copyimg checkseccomp; do + GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o test/$i/$i %{provider_prefix}/test/$i +done +%endif + +%install +sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/%{service_name}.service +make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd + +# 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 config +install -p -m 644 %{service_name}.conf%{?dist} %{buildroot}%{_sysconfdir}/%{service_name}/%{service_name}.conf + +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 + +# source codes for building projects +%if 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list +# find all *.go but no *_test.go files and generate devel.file-list +for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do + echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list +done +%endif + +# testing files for this project +%if 0%{?with_unit_test} && 0%{?with_devel} +install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ +# find all *_test.go files and generate unit-test.file-list +for file in $(find . -iname "*_test.go"); do + echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list + install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file + echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list +done +%endif + +%if 0%{?with_integration_tests} +install -d -p %{buildroot}/%{_datadir}/%{name}/test +cp -r test %{buildroot}/%{_datadir}/%{name}/ + +install -d -p %{buildroot}/etc/containers/registries.d +cp test/redhat_sigstore.yaml %{buildroot}/etc/containers/registries.d/registry.access.redhat.com.yaml +%endif + +%if 0%{?with_devel} +sort -u -o devel.file-list devel.file-list +%endif + +%check +%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} +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} + +%if 0%{?with_devel} +%files devel -f devel.file-list +%license LICENSE +%doc README.md code-of-conduct.md +%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} +%endif + +%if 0%{?with_unit_test} && 0%{?with_devel} +%files unit-test-devel -f unit-test-devel.file-list +%license LICENSE +%doc README.md code-of-conduct.md +%endif + +%if 0%{?with_integration_tests} +%files integration-tests +%license LICENSE +%doc README.md +%{_datadir}/%{name}/test/* +/etc/containers/registries.d/registry.access.redhat.com.yaml +%endif + +%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}/pause +%{_unitdir}/%{service_name}.service +%{_unitdir}/cri-o.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 + +%files -n conmon +%license LICENSE +%doc README.md +%{_libexecdir}/%{service_name}/conmon + +%changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2:1.12.0-13.dev.gitc4f232a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Aug 11 2018 Lokesh Mandvekar - 2:1.12.0-12.dev.gitc4f232a +- use default %%gobuild +- built c4f232a +- enable debuginfo for rawhide + +* Wed Aug 01 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-11.dev.git4c587e6 +- autobuilt 4c587e6 + +* Fri Jul 27 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-10.dev.git3961eb3 +- autobuilt 3961eb3 + +* Wed Jul 25 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-9.dev.git59f9418 +- autobuilt 59f9418 + +* Wed Jul 18 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-8.dev.git57c4053 +- autobuilt 57c4053 + +* Tue Jul 17 2018 Lokesh Mandvekar - 2:1.12.0-7.dev.git1af50d7 +- make debuginfo delve debugger friendly +- use containers-common instead of skopeo-containers (just a name change) +- disable debuginfo for f29 + +* Thu Jul 12 2018 Fedora Release Engineering - 2:1.12.0-6.dev.git1af50d7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 09 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-5.git1af50d7 +- autobuilt 1af50d7 + +* Sun Jul 08 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-4.gitb68ada4 +- autobuilt b68ada4 + +* Sat Jul 07 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-3.git3374df8 +- autobuilt 3374df8 + +* Fri Jul 06 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-2.git14c22de +- autobuilt 14c22de + +* Wed Jul 04 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-1.git9a46eba +- bump to 1.12.0 +- autobuilt 9a46eba + +* Sat Jun 30 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-27.git3b86cde +- autobuilt 3b86cde + +* Fri Jun 29 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-26.git45ccf08 +- autobuilt 45ccf08 + +* Thu Jun 28 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-25.gitf9f8a53 +- autobuilt f9f8a53 + +* Wed Jun 27 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-24.git953f837 +- autobuilt 953f837 + +* Tue Jun 26 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-23.gitf9ae39e +- autobuilt f9ae39e + +* Sat Jun 23 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-22.gita18f4ed +- autobuilt a18f4ed + +* Thu Jun 21 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-21.gitfc6bebf +- autobuilt fc6bebf + +* Tue Jun 19 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-20.gitbd1dec3 +- autobuilt bd1dec3 + +* Mon Jun 18 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-19.git51dfd19 +- autobuilt 51dfd19 + +* Sat Jun 16 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-18.git46e04a6 +- autobuilt 46e04a6 + +* Fri Jun 15 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-17.git5a890d8 +- autobuilt 5a890d8 + +* Thu Jun 14 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-16.gitbac65b4 +- autobuilt bac65b4 + +* Wed Jun 13 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-15.gitbe2c579 +- autobuilt be2c579 + +* Tue Jun 12 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-14.gitf64f5b8 +- autobuilt f64f5b8 + +* Sun Jun 10 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-13.gitfcdc2c9 +- autobuilt fcdc2c9 + +* Thu Jun 07 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-12.git54478a2 +- autobuilt 54478a2 + +* Wed Jun 06 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-11.git540ebd6 +- autobuilt 540ebd6 + +* Tue Jun 05 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-10.git055eb1e +- autobuilt 055eb1e + +* Sun Jun 03 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-9.git1c0c3b0 +- autobuilt 1c0c3b0 + +* Fri Jun 01 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-8.git7910f24 +- autobuilt 7910f24 + +* Thu May 31 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-7.gite2fdb46 +- autobuilt e2fdb46 + +* Wed May 30 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-6.gitdbcff37 +- autobuilt dbcff37 + +* Fri May 25 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-5.git19e97f2 +- autobuilt 19e97f2 + +* Fri May 18 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-4.git97d2efd +- autobuilt 97d2efd + +* Thu May 17 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-3.gitd4e89bd +- autobuilt d4e89bd + +* Wed May 16 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-2.git72cb448 +- autobuilt 72cb448 + +* Fri May 11 2018 Lokesh Mandvekar - 2:1.11.0-1.git55a3daa +- bump to v1.11.0 +- built commit 55a3daa + +* Tue May 8 2018 Dan Walsh - 2:1.10.1-1.git728df92 +- bump to v1.10.1 + +* Tue May 08 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-37.git52d0f53 +- autobuilt 52d0f53 + +* Mon May 07 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-36.git5eb8c3b +- autobuilt 5eb8c3b + +* Sun May 06 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-35.git4e54603 +- autobuilt 4e54603 + +* Sat May 05 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-34.git0489381 +- autobuilt 0489381 + +* Fri May 04 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-33.git6db7ef8 +- autobuilt 6db7ef8 + +* Wed May 02 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-32.git4e6919c +- autobuilt commit 4e6919c + +* Wed May 02 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-31.git4e4f1e2 +- autobuilt commit 4e4f1e2 + +* Mon Apr 30 2018 Dan Walsh - 2:1.10.0-30.gita221a5d +- Fix crio.conf to use correct path to conmon and systemd for cgroup management + +* Mon Apr 30 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-28.gita221a5d +- autobuilt commit a221a5d + +* Fri Apr 27 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-27.gitc971f7b +- autobuilt commit c971f7b + +* Thu Apr 26 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-26.git733d791 +- autobuilt commit 733d791 + +* Tue Apr 24 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-25.git596d052 +- autobuilt commit 596d052 + +* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-24.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-23.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-22.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-21.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-20.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-19.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Sun Apr 15 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-18.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Sat Apr 14 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-17.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Fri Apr 13 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-16.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Thu Apr 12 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-15.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Wed Apr 11 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-14.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-13.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-12.gitc24e0d9 +- autobuilt commit c24e0d9 + +* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-11.git1eec122 +- autobuilt commit 1eec122 + +* Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-10.git1eec122 +- autobuilt commit 1eec122 + +* Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-9.git1eec122 +- autobuilt commit 1eec122 + +* Sun Apr 08 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-8.gitd0dbfe0 +- autobuilt commit d0dbfe0 + +* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-7.gitd0dbfe0 +- autobuilt commit d0dbfe0 + +* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-6.gitd0dbfe0 +- autobuilt commit d0dbfe0 + +* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-5.git86b61d4 +- built commit 86b61d4 + +* Fri Mar 30 2018 Dan Walsh - 2:1.10.0-4 +- Release of v1.10.0 + +* Mon Mar 26 2018 Lokesh Mandvekar - 2:1.10.0-3.gitb0f6d98 +- built commit b0f6d98 + +* Fri Mar 16 2018 Dan Walsh - 2:1.10.0-beta.1 +- bump to v1.10.0-beta.1 + +* 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 + +* Thu Mar 01 2018 Lokesh Mandvekar - 2:1.9.8-1.git7d9d2aa +- bump to v1.9.8 +- enable integration tests for centos + +* Fri Feb 23 2018 Lokesh Mandvekar - 2:1.9.7-2.gita98f9c9 +- make sure correct version in changelog + +* 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 Feb 07 2018 Fedora Release Engineering - 2:1.9.1-2.gitb066a83 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 24 2018 Dan Walsh - 2:1.9.1-1.gitb066a8 +- Final Release 1.9.1 + +* Mon Dec 18 2017 Lokesh Mandvekar - 2:1.9.0-4.gita85ea60 +- need runc >= 2:1.0.0-15 + +* Fri Dec 15 2017 Dan Walsh - 2:1.9.0-3.gita85ea60 +- Final Release 1.9.0 + +* Mon Dec 11 2017 Dan Walsh - 2:1.9.0-1.beta.1.gita85ea60 +- Update to kubernetes 1.9.0 beta 2 cri requirements +- container_exec: fix terminal true process json +- lib: sandbox: refactor to memory store + +* Sun Dec 10 2017 Dan Walsh - 2:1.9.0-1.beta.1.git0ab5e80 +- Update to kubernetes 1.9.0 beta 1 cri requirements + +* Sun Dec 10 2017 Dan Walsh - 2:1.8.3-1.gitd9922a9 +- container_create: fix apparmor from container config +- container_create: correctly set image and kube envs +- oci: do not append conmon env to container process +- container_exec: use process file with runc exec + +* Thu Nov 30 2017 Lokesh Mandvekar - 2:1.8.2-3.git3de7ab4c +- cri-o should require conmon and not the other way around + +* Wed Nov 29 2017 Lokesh Mandvekar - 2:1.8.2-2.git3de7ab4c +- add additional deps +- From: Antonio Murdaca + +* Wed Nov 29 2017 Lokesh Mandvekar - 2:1.8.2-1.git3de7ab4c +- bump to v1.8.2 + +* Tue Nov 28 2017 Lokesh Mandvekar - 2:1.8.1-2.git32d1708d +- separate conmon into a separate subpackage + +* Wed Nov 22 2017 Dan Walsh - 1.8.1-1.git32d1708d +- Add /proc/scsi to masked paths + +* Mon Nov 13 2017 Dan Walsh - 1.8.0-1.git80f54bc1 +- bump v1.8.0 +- Add support for Kubernetes v1.8 +- kpod support moved to the kpod package. + +* Thu Nov 09 2017 Lokesh Mandvekar - 1.0.3-1.git17bcfb4 +- bump to v1.0.3 + +* 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 + +* Mon Oct 16 2017 Dan Walsh - 1.0.0-6.gita636972 +- Add epoch to make sure that this installs + +* Mon Oct 16 2017 Dan Walsh - 1.0.0-5.gita636972 +- Get the correct checksum + +* Fri Oct 13 2017 Dan Walsh - 1.0.0-4.gitcd1bac5 +- Release v1.0.0 +- Performance improvements +- Add secrets patch to default mount directories from the host into containers +- Add kpod login/logout +- Change debug flag to log-level, allows admin to specify the loggin level +- Bump to kube v1.7.8 +- Build with go 1.8.4 + +* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-3.rc3.gitd2c6f64 +- build v1.0.0-rc3 tag + +* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-2.rc3.dev.gita8ea146 +- adjust runc dep for CentOS Virt SIG builds + +* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-1.rc3.dev.gita8ea146 +- bump to 1.0.0-rc3.dev +- built commit a8ea146 + +* Wed Sep 20 2017 Lokesh Mandvekar - 1.0.0-1.rc2.git6784a66 +- bump to v1.0.0-rc2 + +* Tue Sep 12 2017 Dan Walsh - 1.0.0.rc1-2.gitbb1da97 +- Change default storage to overlay not overlay2, which shoulf fix issues with kpod working out of the box. + +* Fri Sep 8 2017 Dan Walsh - 1.0.0.rc1-1.gitbb1da97 +- Bugs, stability and performance fixes +- Moved from kubernetes 1.6 to 1.7 +- cadvisor isupport +- Full kube e2e tests coverage. We are now gating pull requests on kube e2e (we were gating them just on node-e2e). +- Continue working on kpod +- kpod cp +- kpod diff +- kpod export +- kpod logs +- kpod mount +- kpod ps +- kpod rename +- kpod stats +- kpod umount + +* Tue Sep 5 2017 Lokesh Mandvekar - 1.0.0.beta.0-3.gitf9387ac +- btrfs_noversion in BUILDTAGS for previous build was in error + +* Tue Sep 5 2017 Lokesh Mandvekar - 1.0.0.beta.0-2.gitf9387ac +- bump to latest master +- use runc >= 2:1.0.0-10 + +* 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 + +* Wed Aug 02 2017 Fedora Release Engineering - 1.0.0.alpha.0-5.gitfa25b38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.0.0.alpha.0-4.gitfa25b38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jul 13 2017 Lokesh Mandvekar - 1.0.0.alpha.0-3.gitfa25b38 +- enable all arches except ppc64 because it's been removed from goarches + +* Thu Jul 13 2017 Lokesh Mandvekar - 1.0.0.alpha.0-2.gitfa25b38 +- built commit fa25b38 +- Provides: crio + +* 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) +- skip s390x build (rhbz#1466865) + +* 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/dead.package b/dead.package deleted file mode 100644 index 5932d43..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -shipped in the cri-o module, use versioned branches diff --git a/sources b/sources new file mode 100644 index 0000000..e46d04e --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (cri-o-c4f232a.tar.gz) = 86cfbeefcf7f18baf3d05135043b9919d25a8bc6ca2dd0d87587d26088e4514dbb44de4a9d6546b8d229a1980f1c8ffb5bc794687c1a8656ad05b42ab1d49956 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 d16ba5b200d71f99c09230b3fabd809681cf51f1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 23:59:44 +0000 Subject: [PATCH 167/202] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 5867ede..624906b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -26,7 +26,7 @@ Name: cri-o Epoch: 2 Version: 1.12.0 -Release: 13.dev.git%{shortcommit0}%{?dist} +Release: 14.dev.git%{shortcommit0}%{?dist} Summary: Kubernetes Container Runtime Interface for OCI-based containers License: ASL 2.0 URL: https://%{provider_prefix} @@ -485,6 +485,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %{_libexecdir}/%{service_name}/conmon %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 2:1.12.0-14.dev.gitc4f232a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2:1.12.0-13.dev.gitc4f232a - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 6c2d8b6f0a9f89df976faa6984ca762a53f7f638 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Mon, 21 Mar 2022 16:08:45 -0400 Subject: [PATCH 168/202] update to v1.23.2 Signed-off-by: Peter Hunt --- .gitignore | 129 ++--- cri-o.spec | 1129 ++++++++++++++-------------------------- crio-network.sysconfig | 3 - crio-storage.sysconfig | 2 - sources | 2 +- 5 files changed, 442 insertions(+), 823 deletions(-) delete mode 100644 crio-network.sysconfig delete mode 100644 crio-storage.sysconfig diff --git a/.gitignore b/.gitignore index a7c8599..0c67bde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,91 +1,38 @@ -/cri-o-c0fb3d9.tar.gz -/runc-67bd2ab.tar.gz -/cri-o-5dcbdc0.tar.gz -/plugins-dcf7368.tar.gz -/cri-o-91977d3.tar.gz -/cri-o-fa25b38.tar.gz -/cri-o-66d96e7.tar.gz -/cri-o-f9387ac.tar.gz -/cri-o-bb1da97.tar.gz -/cri-o-0fc411d.tar.gz -/cri-o-6784a66.tar.gz -/cri-o-a8ea146.tar.gz -/cri-o-d2c6f64.tar.gz -/cri-o-cd1bac5.tar.gz -/cri-o-a636972.tar.gz -/cri-o-64a30e1.tar.gz -/cri-o-748bc46.tar.gz -/cri-o-17bcfb4.tar.gz -/cri-o-80f54bc.tar.gz -/cri-o-32d1708.tar.gz -/cri-o-3de7ab4.tar.gz -/cri-o-d9922a9.tar.gz -/cri-o-0ab5e80.tar.gz -/cri-o-a85ea60.tar.gz -/cri-o-814c6ab.tar.gz -/cri-o-b066a83.tar.gz -/cri-o-63ea1dd.tar.gz -/cri-o-f09b2d3.tar.gz -/cri-o-28c7dee.tar.gz -/cri-o-125ec8a.tar.gz -/cri-o-5e48c92.tar.gz -/cri-o-a98f9c9.tar.gz -/cri-o-7d9d2aa.tar.gz -/cri-o-4d7e7dc.tar.gz -/cri-o-8723732.tar.gz -/cri-o-c956614.tar.gz -/cri-o-b0f6d98.tar.gz -/cri-o-623b502.tar.gz -/cri-o-86b61d4.tar.gz -/cri-o-d0dbfe0.tar.gz -/cri-o-1eec122.tar.gz -/cri-o-c24e0d9.tar.gz -/cri-o-596d052.tar.gz -/cri-o-733d791.tar.gz -/cri-o-c971f7b.tar.gz -/cri-o-a221a5d.tar.gz -/cri-o-4e4f1e2.tar.gz -/cri-o-4e6919c.tar.gz -/cri-o-6db7ef8.tar.gz -/cri-o-0489381.tar.gz -/cri-o-4e54603.tar.gz -/cri-o-5eb8c3b.tar.gz -/cri-o-52d0f53.tar.gz -/cri-o-728df92.tar.gz -/cri-o-55a3daa.tar.gz -/cri-o-72cb448.tar.gz -/cri-o-d4e89bd.tar.gz -/cri-o-97d2efd.tar.gz -/cri-o-19e97f2.tar.gz -/cri-o-dbcff37.tar.gz -/cri-o-e2fdb46.tar.gz -/cri-o-7910f24.tar.gz -/cri-o-1c0c3b0.tar.gz -/cri-o-055eb1e.tar.gz -/cri-o-540ebd6.tar.gz -/cri-o-54478a2.tar.gz -/cri-o-fcdc2c9.tar.gz -/cri-o-f64f5b8.tar.gz -/cri-o-be2c579.tar.gz -/cri-o-bac65b4.tar.gz -/cri-o-5a890d8.tar.gz -/cri-o-46e04a6.tar.gz -/cri-o-51dfd19.tar.gz -/cri-o-bd1dec3.tar.gz -/cri-o-fc6bebf.tar.gz -/cri-o-a18f4ed.tar.gz -/cri-o-f9ae39e.tar.gz -/cri-o-953f837.tar.gz -/cri-o-f9f8a53.tar.gz -/cri-o-45ccf08.tar.gz -/cri-o-3b86cde.tar.gz -/cri-o-9a46eba.tar.gz -/cri-o-14c22de.tar.gz -/cri-o-3374df8.tar.gz -/cri-o-b68ada4.tar.gz -/cri-o-1af50d7.tar.gz -/cri-o-57c4053.tar.gz -/cri-o-59f9418.tar.gz -/cri-o-3961eb3.tar.gz -/cri-o-4c587e6.tar.gz -/cri-o-c4f232a.tar.gz +/cri-o-441bd3d.tar.gz +/cri-o-3eac3b2.tar.gz +/cri-o-4fbb022.tar.gz +/cri-o-e0c89d8.tar.gz +/cri-o-71cc465.tar.gz +/cri-o-774a29e.tar.gz +/cri-o-18bc811.tar.gz +/cri-o-e8a2525.tar.gz +/cri-o-d70609a.tar.gz +/cri-o-b7644f6.tar.gz +/cri-o-485227d.tar.gz +/cri-o-f0827bb.tar.gz +/cri-o-b731670.tar.gz +/cri-o-6a4b481.tar.gz +/cri-o-a783f23.tar.gz +/cri-o-bf8fcf3.tar.gz +/cri-o-cd4b6ae.tar.gz +/cri-o-b89a5fc.tar.gz +/cri-o-6d0ffae.tar.gz +/cri-o-ee2de87.tar.gz +/v1.17.1.tar.gz +/v1.17.2.tar.gz +/v1.18.0-rc1.tar.gz +/v1.18.0.tar.gz +/v1.18.1.tar.gz +/v1.18.2.tar.gz +/v1.18.3.tar.gz +/v1.19.0.tar.gz +/v1.20.0.tar.gz +/v1.20.1.tar.gz +/v1.20.2.tar.gz +/cri-o-1.21.1.tar.gz +/cri-o-1.21.2.tar.gz +/cri-o-1.22.0.tar.gz +/cri-o-1.22.1.tar.gz +/cri-o-1.23.0.tar.gz +/cri-o-1.23.1.tar.gz +/cri-o-1.23.2.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 624906b..7b427ea 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,428 +1,190 @@ -%global with_devel 0 -%global with_unit_test 0 -%global with_check 1 -%global with_integration_tests 1 -%global with_debug 1 +# https://github.com/cri-o/cri-o +%global goipath github.com/cri-o/cri-o +Version: 1.23.2 -%if 0%{?with_debug} -%global _find_debuginfo_dwz_opts %{nil} -%global _dwz_low_mem_die_limit 0 +%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 -%global debug_package %{nil} +%gometa +%bcond_without check %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 c4f232a57ec42fe03c376a39e17c15300298ad78 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +# 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 "" +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%global built_tag v%{version} +%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%global crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') + +# Services %global service_name crio -Name: cri-o -Epoch: 2 -Version: 1.12.0 -Release: 14.dev.git%{shortcommit0}%{?dist} -Summary: Kubernetes Container Runtime Interface for OCI-based containers -License: ASL 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz -Source3: %{service_name}-network.sysconfig -Source4: %{service_name}-storage.sysconfig -ExcludeArch: ppc64 -# 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: pkgconfig(systemd) -BuildRequires: device-mapper-devel -BuildRequires: make -Requires(pre): container-selinux -Requires: socat -Requires: iptables -Requires: iproute -Requires: conmon -BuildRequires: libseccomp-static -Requires: runc >= 2:1.0.0-15 -Requires: containers-common >= 0.1.24-6 -Recommends: containernetworking-plugins >= 0.5.2-7 -Provides: %{service_name} = %{epoch}:%{version}-%{release} -Provides: ocid = %{epoch}:%{version}-%{release} -Obsoletes: ocid <= 0.3 +# Commit for the builds +%global commit0 c0b2474b80fd0844b883729bda88961bed7b472b + +Name: cri-o +Epoch: 0 +Release: 1%{?dist} +Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface + + +# Upstream license specification: Apache-2.0 +License: ASL 2.0 +URL: https://github.com/cri-o/cri-o +Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz + +%if 0%{?rhel} +BuildRequires: golang >= 1.17 +%endif +%if 0%{?rhel} && 0%{?rhel} <= 8 +# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required +ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} +%endif +%if 0%{?fedora} +BuildRequires: btrfs-progs-devel +BuildRequires: device-mapper-devel +BuildRequires: go-rpm-macros +%endif +BuildRequires: git-core +BuildRequires: glib2-devel +BuildRequires: glibc-static +BuildRequires: go-md2man +BuildRequires: gpgme-devel +BuildRequires: libassuan-devel +BuildRequires: libseccomp-devel +%if 0%{?rhel} && 0%{?rhel} < 8 +BuildRequires: systemd-devel +%else +BuildRequires: systemd-rpm-macros +%endif +BuildRequires: make +%if 0%{?fedora} +Requires(pre): container-selinux +%else +Requires: container-selinux +%endif +Requires: containers-common >= 1:0.1.31-14 +%if 0%{?rhel} && 0%{?rhel} < 8 +Requires: runc >= 1.0.0-16 +%else +Recommends: runc >= 1.0.0-16 +%endif +Requires: containernetworking-plugins >= 0.7.5-1 +Requires: conmon >= 2.0.2-1 +Requires: socat + +Obsoletes: ocid <= 0.3 +Provides: ocid = %{epoch}:%{version}-%{release} +Provides: %{service_name} = %{epoch}:%{version}-%{release} %description -%{summary} - -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch -Requires: golang(github.com/BurntSushi/toml) -Requires: golang(github.com/Microsoft/go-winio) -Requires:golang(github.com/Sirupsen/logrus) -Requires:golang(github.com/containernetworking/cni/libcni) -Requires:golang(github.com/containernetworking/cni/pkg/invoke) -Requires:golang(github.com/containernetworking/cni/pkg/types) -Requires:golang(github.com/containernetworking/cni/pkg/version) -Requires:golang(github.com/containers/image/directory) -Requires:golang(github.com/containers/image/directory/explicitfilepath) -Requires:golang(github.com/containers/image/docker) -Requires:golang(github.com/containers/image/docker/policyconfiguration) -Requires:golang(github.com/containers/image/image) -Requires:golang(github.com/containers/image/manifest) -Requires:golang(github.com/containers/image/oci/layout) -Requires:golang(github.com/containers/image/openshift) -Requires:golang(github.com/containers/image/transports) -Requires:golang(github.com/containers/image/types) -Requires:golang(github.com/containers/image/version) -Requires:golang(github.com/docker/distribution) -Requires:golang(github.com/docker/distribution/context) -Requires:golang(github.com/docker/distribution/digest) -Requires:golang(github.com/docker/distribution/reference) -Requires:golang(github.com/docker/distribution/uuid) -Requires:golang(github.com/docker/docker/api/types/blkiodev) -Requires:golang(github.com/docker/docker/api/types/container) -Requires:golang(github.com/docker/docker/api/types/mount) -Requires:golang(github.com/docker/docker/api/types/strslice) -Requires:golang(github.com/docker/docker/api/types/versions) -Requires:golang(github.com/docker/docker/daemon/graphdriver) -Requires:golang(github.com/docker/docker/image) -Requires:golang(github.com/docker/docker/image/v1) -Requires:golang(github.com/docker/docker/layer) -Requires:golang(github.com/docker/docker/pkg/archive) -Requires:golang(github.com/docker/docker/pkg/chrootarchive) -Requires:golang(github.com/docker/docker/pkg/fileutils) -Requires:golang(github.com/docker/docker/pkg/homedir) -Requires:golang(github.com/docker/docker/pkg/idtools) -Requires:golang(github.com/docker/docker/pkg/ioutils) -Requires:golang(github.com/docker/docker/pkg/longpath) -Requires:golang(github.com/docker/docker/pkg/mount) -Requires:golang(github.com/docker/docker/pkg/plugins) -Requires:golang(github.com/docker/docker/pkg/plugins/transport) -Requires:golang(github.com/docker/docker/pkg/pools) -Requires:golang(github.com/docker/docker/pkg/promise) -Requires:golang(github.com/docker/docker/pkg/random) -Requires:golang(github.com/docker/docker/pkg/reexec) -Requires:golang(github.com/docker/docker/pkg/registrar) -Requires:golang(github.com/docker/docker/pkg/stringid) -Requires:golang(github.com/docker/docker/pkg/system) -Requires:golang(github.com/docker/docker/pkg/truncindex) -Requires:golang(github.com/docker/docker/plugin/getter) -Requires:golang(github.com/docker/docker/reference) -Requires:golang(github.com/docker/go-connections/nat) -Requires:golang(github.com/docker/go-connections/sockets) -Requires:golang(github.com/docker/go-connections/tlsconfig) -Requires:golang(github.com/docker/go-units) -Requires:golang(github.com/docker/libtrust) -Requires:golang(github.com/ghodss/yaml) -Requires:golang(github.com/gogo/protobuf/proto) -Requires:golang(github.com/golang/glog) -Requires:golang(github.com/golang/protobuf/proto) -Requires:golang(github.com/gorilla/context) -Requires:golang(github.com/gorilla/mux) -Requires:golang(github.com/imdario/mergo) -Requires:golang(github.com/opencontainers/image-spec/specs-go) -Requires:golang(github.com/opencontainers/image-spec/specs-go/v1) -Requires:golang(github.com/opencontainers/runc/libcontainer/label) -Requires:golang(github.com/opencontainers/runc/libcontainer/selinux) -Requires:golang(github.com/opencontainers/runc/libcontainer/system) -Requires:golang(github.com/opencontainers/runc/libcontainer/user) -Requires:golang(github.com/opencontainers/runtime-spec/specs-go) -Requires:golang(github.com/opencontainers/runtime-tools/generate) -Requires:golang(github.com/rajatchopra/ocicni) -Requires:golang(github.com/syndtr/gocapability/capability) -Requires:golang(github.com/tchap/go-patricia/patricia) -Requires:golang(github.com/vbatts/tar-split/archive/tar) -Requires:golang(github.com/vbatts/tar-split/tar/asm) -Requires:golang(github.com/vbatts/tar-split/tar/storage) -Requires:golang(golang.org/x/net/context) -Requires:golang(golang.org/x/net/http2) -Requires:golang(golang.org/x/net/http2/hpack) -Requires:golang(golang.org/x/net/internal/timeseries) -Requires:golang(golang.org/x/net/proxy) -Requires:golang(golang.org/x/net/trace) -Requires:golang(golang.org/x/sys/unix) -Requires:golang(google.golang.org/grpc) -Requires:golang(google.golang.org/grpc/codes) -Requires:golang(google.golang.org/grpc/credentials) -Requires:golang(google.golang.org/grpc/grpclog) -Requires:golang(google.golang.org/grpc/internal) -Requires:golang(google.golang.org/grpc/metadata) -Requires:golang(google.golang.org/grpc/naming) -Requires:golang(google.golang.org/grpc/peer) -Requires:golang(google.golang.org/grpc/transport) -Requires:golang(gopkg.in/yaml.v2) -Requires:golang(k8s.io/kubernetes/pkg/fields) -Requires:golang(k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime) -Requires:golang(k8s.io/kubernetes/pkg/selection) -Requires:golang(k8s.io/kubernetes/pkg/util/errors) -Requires:golang(k8s.io/kubernetes/pkg/util/homedir) -Requires:golang(k8s.io/kubernetes/pkg/util/net) -Requires:golang(k8s.io/kubernetes/pkg/util/sets) - -Provides: golang(%{import_path}/oci) = %{version}-%{release} -Provides: golang(%{import_path}/server) = %{version}-%{release} -Provides: golang(%{import_path}/utils)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/BurntSushi/toml)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/Sirupsen/logrus)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/libcni)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/invoke)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/types)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containernetworking/cni/pkg/version)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/directory/explicitfilepath)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/docker/policyconfiguration)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/image)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/manifest)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/oci/layout)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/openshift)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/transports)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/types)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/containers/image/version)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/coreos/go-systemd/daemon)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/context)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/digest)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/reference)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/distribution/uuid)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/blkiodev)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/container)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/mount)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/strslice)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/api/types/versions)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/daemon/graphdriver)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/image/v1)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/layer)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/archive)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/chrootarchive)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/fileutils)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/homedir)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/idtools)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/ioutils)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/mount)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/plugins/transport)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/pools)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/promise)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/random)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/reexec)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/registrar)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/stringid)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/system)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/pkg/truncindex)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/plugin/getter)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/docker/reference)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/nat)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/sockets)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-connections/tlsconfig)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/go-units)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/docker/libtrust)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/ghodss/yaml)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/gogo/protobuf/proto)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/glog)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/golang/protobuf/proto)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/context)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/gorilla/mux)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/imdario/mergo)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/image-spec/specs-go/v1)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/label)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/selinux)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/system)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runc/libcontainer/user)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-spec/specs-go)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/opencontainers/runtime-tools/generate)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/rajatchopra/ocicni)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/syndtr/gocapability/capability)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/tchap/go-patricia/patricia)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/urfave/cli)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/archive/tar)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/asm)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/github.com/vbatts/tar-split/tar/storage)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/context)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/http2/hpack)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/proxy)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/net/trace)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/golang.org/x/sys/unix)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/codes)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/credentials)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/grpclog)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/metadata)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/naming)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/peer)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/google.golang.org/grpc/transport)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/gopkg.in/yaml.v2)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/fields)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/selection)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/errors)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/homedir)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/net)) = %{version}-%{release} -Provides: bundled(golang(%{import_path}/vendor/src/k8s.io/kubernetes/pkg/util/sets)) = %{version}-%{release} - -%description devel -%{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif - -%package -n conmon -Summary: OCI container runtime monitor - -%description -n conmon -conmon is an OCI container runtime monitor. - -%if 0%{?with_integration_tests} -%package integration-tests -Summary: Integration tests for %{name} -Requires: %{service_name} = %{epoch}:%{version}-%{release} -Requires: bats -Requires: containernetworking-cni -Requires: nmap-ncat -Requires: socat - -%description integration-tests -%{summary} -%endif +Open Container Initiative-based implementation of Kubernetes Container Runtime +Interface. %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):%{gopath} -export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_installed.sh) containers_image_ostree_stub" - -%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 \ - --cgroup-manager=systemd \ - --conmon /usr/libexec/%{service_name}/conmon \ - --cni-plugin-dir /usr/libexec/cni \ - --default-mounts /usr/share/rhel/secrets:/run/secrets \ - --cgroup-manager=systemd config > %{service_name}.conf%{?dist} - -%if 0%{?with_integration_tests} -export GOPATH=$(pwd)/_output -for i in bin2img copyimg checkseccomp; do - GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o test/$i/$i %{provider_prefix}/test/$i -done +%if 0%{?rhel} && 0%{?rhel} <= 8 +%autosetup -p1 -n %{name}-%{version} +%else +%goprep -k %endif +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 +sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service + +%build +export GO111MODULE=on +export GOFLAGS=-mod=vendor + +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 LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path} +-X %{goipath}/internal/version.buildDate=%{build_timestamp} +-X %{goipath}/internal/version.gitCommit=%{commit0} +-X %{goipath}/internal/version.version=%{version} +-X %{goipath}/internal/version.gitTreeState=%{git_tree_state} " + +for cmd in cmd/* ; do + %gobuild -o bin/$(basename $cmd) %{goipath}/$cmd +done + +%if 0%{?fedora} +%set_build_flags +%endif +export CFLAGS="$CFLAGS -std=c99" +%make_build bin/pinns +GO_MD2MAN=go-md2man make docs + %install -sed -i 's/\/usr\/local\/bin\/crio/\/usr\/bin\/crio/g' contrib/systemd/%{service_name}.service -make DESTDIR=%{buildroot} PREFIX=%{buildroot}%{_prefix} install.config install.systemd +sed -i 's/\/local//' contrib/systemd/%{service_name}.service +bin/%{service_name} \ + --selinux \ + --cni-plugin-dir /opt/cni/bin \ + --cni-plugin-dir "%{_libexecdir}/cni" \ + --enable-metrics \ + --metrics-port 9537 \ + 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 config -install -p -m 644 %{service_name}.conf%{?dist} %{buildroot}%{_sysconfdir}/%{service_name}/%{service_name}.conf +# 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}/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}%{_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}%{_mandir}/man{1,5,8} -install -m 644 docs/*.5 %{buildroot}%{_mandir}/man5 -install -m 644 docs/*.8 %{buildroot}%{_mandir}/man8 +%make_install PREFIX=%{buildroot}%{_prefix} \ + install.bin \ + install.completions \ + install.config \ + install.man \ + install.systemd -mkdir -p %{buildroot}%{_sharedstatedir}/containers - -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . -iname "*.go" \! -iname "*_test.go") ; do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list -done +%if 0%{?rhel} && 0%{?rhel} <= 7 +# https://bugzilla.redhat.com/show_bug.cgi?id=1823374#c17 +install -d -p %{buildroot}%{_prefix}/lib/sysctl.d +echo "fs.may_detach_mounts=1" > %{buildroot}%{_prefix}/lib/sysctl.d/99-cri-o.conf %endif -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test.file-list -for file in $(find . -iname "*_test.go"); do - echo "%%dir %%{gopath}/src/%%{import_path}/$(dirname $file)" >> devel.file-list - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$(dirname $file) - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list -done -%endif - -%if 0%{?with_integration_tests} -install -d -p %{buildroot}/%{_datadir}/%{name}/test -cp -r test %{buildroot}/%{_datadir}/%{name}/ - -install -d -p %{buildroot}/etc/containers/registries.d -cp test/redhat_sigstore.yaml %{buildroot}/etc/containers/registries.d/registry.access.redhat.com.yaml -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - -%check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} - -%endif +install -dp %{buildroot}%{_sharedstatedir}/containers %post +# Old verions of kernel do not recognize metacopy option. +# Reference: github.com/cri-o/cri-o/issues/3631 +%if 0%{?rhel} && 0%{?rhel} <= 7 +sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf +%sysctl_apply 99-cri-o.conf +%endif %systemd_post %{service_name} %preun @@ -431,296 +193,265 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} %postun %systemd_postun_with_restart %{service_name} -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%if 0%{?with_devel} -%files devel -f devel.file-list -%license LICENSE -%doc README.md code-of-conduct.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md code-of-conduct.md -%endif - -%if 0%{?with_integration_tests} -%files integration-tests -%license LICENSE -%doc README.md -%{_datadir}/%{name}/test/* -/etc/containers/registries.d/registry.access.redhat.com.yaml -%endif - %files %license LICENSE -%doc README.md +%doc docs code-of-conduct.md tutorial.md ADOPTERS.md CONTRIBUTING.md README.md +%doc awesome.md transfer.md %{_bindir}/%{service_name} -%{_mandir}/man5/%{service_name}.conf.5* -%{_mandir}/man8/%{service_name}.8* +%{_bindir}/%{service_name}-status +%{_bindir}/pinns +%{_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}/pause %{_unitdir}/%{service_name}.service -%{_unitdir}/cri-o.service -%{_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 - -%files -n conmon -%license LICENSE -%doc README.md -%{_libexecdir}/%{service_name}/conmon +%{_datadir}/bash-completion/completions/%{service_name}* +%{_datadir}/fish/completions/%{service_name}*.fish +%{_datadir}/zsh/site-functions/_%{service_name}* +%if 0%{?rhel} && 0%{?rhel} <= 7 +%{_prefix}/lib/sysctl.d/99-cri-o.conf +%endif %changelog -* Wed Jan 19 2022 Fedora Release Engineering - 2:1.12.0-14.dev.gitc4f232a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Tue Mar 15 2022 Peter Hunt - 0:1.23.2-1 +- bump to v1.23.2 -* Thu Jan 31 2019 Fedora Release Engineering - 2:1.12.0-13.dev.gitc4f232a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Tue Mar 15 2022 Peter Hunt - 0:1.23.2-1 +- bump to v1.23.2 -* Sat Aug 11 2018 Lokesh Mandvekar - 2:1.12.0-12.dev.gitc4f232a -- use default %%gobuild -- built c4f232a -- enable debuginfo for rawhide +* Fri Feb 11 2022 Peter Hunt - 0:1.23.1-1 +- bump to v1.23.1 -* Wed Aug 01 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-11.dev.git4c587e6 -- autobuilt 4c587e6 +* Fri Feb 11 2022 Peter Hunt - 0:1.23.1-1 +- bump to v1.23.1 -* Fri Jul 27 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-10.dev.git3961eb3 -- autobuilt 3961eb3 +* Fri Dec 17 2021 Peter Hunt - 0:1.23.0-1 +- bump to v1.23.0 -* Wed Jul 25 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-9.dev.git59f9418 -- autobuilt 59f9418 +* Fri Dec 03 2021 Peter Hunt - 0:1.22.1-2 +- fix bogus date -* Wed Jul 18 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-8.dev.git57c4053 -- autobuilt 57c4053 +* Thu Nov 11 2021 Peter Hunt - 0:1.22.1-1 +- bump to v1.22.1 -* Tue Jul 17 2018 Lokesh Mandvekar - 2:1.12.0-7.dev.git1af50d7 -- make debuginfo delve debugger friendly -- use containers-common instead of skopeo-containers (just a name change) -- disable debuginfo for f29 +* Mon Nov 08 2021 Peter Hunt - 0:1.22.0-4 +- update golang version -* Thu Jul 12 2018 Fedora Release Engineering - 2:1.12.0-6.dev.git1af50d7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Mon Sep 13 2021 Peter Hunt - 0:1.22.0-3 +- fix spec -* Mon Jul 09 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-5.git1af50d7 -- autobuilt 1af50d7 +* Wed Aug 25 2021 Peter Hunt - 0:1.22.0-2 +- bump to v1.22.0 -* Sun Jul 08 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-4.gitb68ada4 -- autobuilt b68ada4 +* Tue Jul 20 2021 Peter Hunt - 0:1.21.2-1 +- bump to v1.21.2 -* Sat Jul 07 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-3.git3374df8 -- autobuilt 3374df8 +* Mon Jul 19 2021 Peter Hunt - 0:1.21.1-1 +- bump to v1.21.1 -* Fri Jul 06 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-2.git14c22de -- autobuilt 14c22de +* Tue Jun 22 2021 Peter Hunt - 0:1.21.0-3 +- update spec to be more conformant for fedora -* Wed Jul 04 2018 Lokesh Mandvekar (Bot) - 2:1.12.0-1.git9a46eba -- bump to 1.12.0 -- autobuilt 9a46eba +* Wed Apr 14 2021 Peter Hunt - 0:1.21.0-2 +- Use crio config for metrics configuration +- drop systemd from crio configuration -* Sat Jun 30 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-27.git3b86cde -- autobuilt 3b86cde +* Wed Apr 14 2021 Peter Hunt - 0:1.21.0-1 +- Bump to v1.21.0 -* Fri Jun 29 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-26.git45ccf08 -- autobuilt 45ccf08 +* Wed Mar 24 2021 Peter Hunt - 0:1.20.2-1 +- Bump to v1.20.2 -* Thu Jun 28 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-25.gitf9f8a53 -- autobuilt f9f8a53 +* Fri Mar 12 2021 Peter Hunt - 0:1.20.1-1 +- Bump to v1.20.1 -* Wed Jun 27 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-24.git953f837 -- autobuilt 953f837 +* Mon Feb 15 2021 Peter Hunt - 0:1.20.0-5 +- Keep metacopy for fedora -* Tue Jun 26 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-23.gitf9ae39e -- autobuilt f9ae39e +* Tue Jan 12 2021 Peter Hunt - 0:1.20.0-4 +- add fs.may_detach_mounts sysctl for centos/rhel 7 -* Sat Jun 23 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-22.gita18f4ed -- autobuilt a18f4ed +* Thu Dec 17 2020 Peter Hunt - 0:1.20.0-3 +- Fix checksec for pinns -* Thu Jun 21 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-21.gitfc6bebf -- autobuilt fc6bebf +* Wed Dec 16 2020 Peter Hunt - 0:1.20.0-2 +- enable PIE mode for cri-o -* Tue Jun 19 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-20.gitbd1dec3 -- autobuilt bd1dec3 +* Fri Dec 11 2020 Peter Hunt - 0:1.20.0-1 +- Bump to v1.20.0 -* Mon Jun 18 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-19.git51dfd19 -- autobuilt 51dfd19 +* Thu Nov 19 2020 Peter Hunt - 2:1.19.0-4 +- fix timestamp for centos 7 -* Sat Jun 16 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-18.git46e04a6 -- autobuilt 46e04a6 +* Mon Nov 9 2020 Peter Hunt - 2:1.19.0-3 +- upstream#3879: fix symbolic link -* Fri Jun 15 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-17.git5a890d8 -- autobuilt 5a890d8 +* Mon Oct 05 2020 Peter Hunt - 2:1.19.0-2 +- update selinux dep to handle OBS -* Thu Jun 14 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-16.gitbac65b4 -- autobuilt bac65b4 +* Mon Oct 05 2020 Peter Hunt - 2:1.19.0-1 +- update go-md2man dependency to handle OBS -* Wed Jun 13 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-15.gitbe2c579 -- autobuilt be2c579 +* Mon Sep 14 2020 Peter Hunt - 2:1.19.0-0 +- bump to 1.19.0 -* Tue Jun 12 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-14.gitf64f5b8 -- autobuilt f64f5b8 +* Tue Aug 04 2020 Peter Hunt - 2:1.18.3-1 +- Github 3923: Make runc installation recommended -* Sun Jun 10 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-13.gitfcdc2c9 -- autobuilt fcdc2c9 +* Wed Jul 29 2020 Peter Hunt - 2:1.18.3-0 +- Bump to v1.18.3 -* Thu Jun 07 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-12.git54478a2 -- autobuilt 54478a2 +* Wed Jul 29 2020 Peter Hunt - 2:1.18.2-2 +- remove custom conmon path -* Wed Jun 06 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-11.git540ebd6 -- autobuilt 540ebd6 +* Tue Jun 23 2020 Douglas Schilling Landgraf - 2:1.18.2-1 +- Build 1.18.2 -* Tue Jun 05 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-10.git055eb1e -- autobuilt 055eb1e +* Fri Jun 05 2020 Douglas Schilling Landgraf - 2:1.18.1-2 +- Add --cni-plugin-dir /opt/cni/bin to cri-o conf file -* Sun Jun 03 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-9.git1c0c3b0 -- autobuilt 1c0c3b0 +* Thu May 14 2020 Douglas Schilling Landgraf - 2:1.18.1-1 +- Release 1.18.1 -* Fri Jun 01 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-8.git7910f24 -- autobuilt 7910f24 +* Thu Apr 23 2020 Douglas Schilling Landgraf - 2:1.18.0-2 +- Fix crio version - github.com/cri-o/cri-o/issues/3684 -* Thu May 31 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-7.gite2fdb46 -- autobuilt e2fdb46 +* Thu Apr 23 2020 Douglas Schilling Landgraf - 2:1.18.0-1 +- Bump for 1.18.0 release -* Wed May 30 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-6.gitdbcff37 -- autobuilt dbcff37 +* Wed Apr 15 2020 Douglas Schilling Landgraf - 2:1.18.0-0.1.rc1 +- Bump for 1.18 release candidate -* Fri May 25 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-5.git19e97f2 -- autobuilt 19e97f2 +* Tue Mar 31 2020 Lokesh Mandvekar - 2:1.17.2-2 +- use correct tag -* Fri May 18 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-4.git97d2efd -- autobuilt 97d2efd +* Tue Mar 31 2020 RH Container Bot - 2:1.17.2-1 +- autobuilt v1.17.2 -* Thu May 17 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-3.gitd4e89bd -- autobuilt d4e89bd +* 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 -* Wed May 16 2018 Lokesh Mandvekar (Bot) - 2:1.11.0-2.git72cb448 -- autobuilt 72cb448 +* Mon Mar 16 2020 RH Container Bot - 2:1.17.1-1 +- autobuilt v1.17.1 -* Fri May 11 2018 Lokesh Mandvekar - 2:1.11.0-1.git55a3daa +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 +- 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 + +* 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 + +* Mon Jul 2 2018 Dan Walsh - 2:1.11.0-1.rhaos3.11.git441bd3d - bump to v1.11.0 -- built commit 55a3daa -* Tue May 8 2018 Dan Walsh - 2:1.10.1-1.git728df92 +* 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 -* Tue May 08 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-37.git52d0f53 -- autobuilt 52d0f53 - -* Mon May 07 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-36.git5eb8c3b -- autobuilt 5eb8c3b - -* Sun May 06 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-35.git4e54603 -- autobuilt 4e54603 - -* Sat May 05 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-34.git0489381 -- autobuilt 0489381 - -* Fri May 04 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-33.git6db7ef8 -- autobuilt 6db7ef8 - -* Wed May 02 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-32.git4e6919c -- autobuilt commit 4e6919c - -* Wed May 02 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-31.git4e4f1e2 -- autobuilt commit 4e4f1e2 - -* Mon Apr 30 2018 Dan Walsh - 2:1.10.0-30.gita221a5d -- Fix crio.conf to use correct path to conmon and systemd for cgroup management - -* Mon Apr 30 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-28.gita221a5d -- autobuilt commit a221a5d - -* Fri Apr 27 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-27.gitc971f7b -- autobuilt commit c971f7b - -* Thu Apr 26 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-26.git733d791 -- autobuilt commit 733d791 - -* Tue Apr 24 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-25.git596d052 -- autobuilt commit 596d052 - -* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-24.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Tue Apr 17 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-23.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-22.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-21.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-20.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Mon Apr 16 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-19.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Sun Apr 15 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-18.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Sat Apr 14 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-17.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Fri Apr 13 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-16.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Thu Apr 12 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-15.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Wed Apr 11 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-14.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-13.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-12.gitc24e0d9 -- autobuilt commit c24e0d9 - -* Tue Apr 10 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-11.git1eec122 -- autobuilt commit 1eec122 - -* Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-10.git1eec122 -- autobuilt commit 1eec122 - -* Mon Apr 09 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-9.git1eec122 -- autobuilt commit 1eec122 - -* Sun Apr 08 2018 Lokesh Mandvekar (Bot) - 2:1.10.0-8.gitd0dbfe0 -- autobuilt commit d0dbfe0 - -* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-7.gitd0dbfe0 -- autobuilt commit d0dbfe0 - -* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-6.gitd0dbfe0 -- autobuilt commit d0dbfe0 - -* Sun Apr 08 2018 Lokesh Mandvekar - 2:1.10.0-5.git86b61d4 -- built commit 86b61d4 - -* Fri Mar 30 2018 Dan Walsh - 2:1.10.0-4 -- Release of v1.10.0 - -* Mon Mar 26 2018 Lokesh Mandvekar - 2:1.10.0-3.gitb0f6d98 -- built commit b0f6d98 - -* Fri Mar 16 2018 Dan Walsh - 2:1.10.0-beta.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 @@ -728,12 +459,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} * Fri Mar 09 2018 Dan Walsh - 2:1.9.9-1.git4d7e7dc - bump to v1.9.9 -* Thu Mar 01 2018 Lokesh Mandvekar - 2:1.9.8-1.git7d9d2aa +* Fri Feb 23 2018 Lokesh Mandvekar - 2:1.9.8-1.git7d9d2aa - bump to v1.9.8 -- enable integration tests for centos -* Fri Feb 23 2018 Lokesh Mandvekar - 2:1.9.7-2.gita98f9c9 -- make sure correct version in changelog +* 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 @@ -761,56 +491,45 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} - Adapt to recent containers/image API updates - container_create: only bind mount /etc/hosts if not provided by k8s -* Wed Feb 07 2018 Fedora Release Engineering - 2:1.9.1-2.gitb066a83 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Wed Jan 24 2018 Dan Walsh - 2:1.9.1-1.gitb066a8 - Final Release 1.9.1 -* Mon Dec 18 2017 Lokesh Mandvekar - 2:1.9.0-4.gita85ea60 -- need runc >= 2:1.0.0-15 +* 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 -* Fri Dec 15 2017 Dan Walsh - 2:1.9.0-3.gita85ea60 -- Final Release 1.9.0 +* Wed Jan 03 2018 Frantisek Kluknavsky - 2:1.8.4-3.gitdffb5c2 +- reversed to 1.8, epoch -* Mon Dec 11 2017 Dan Walsh - 2:1.9.0-1.beta.1.gita85ea60 -- Update to kubernetes 1.9.0 beta 2 cri requirements -- container_exec: fix terminal true process json -- lib: sandbox: refactor to memory store +* Mon Dec 18 2017 Lokesh Mandvekar - 1.9.0-1.git814c6ab +- bump to v1.9.0 -* Sun Dec 10 2017 Dan Walsh - 2:1.9.0-1.beta.1.git0ab5e80 -- Update to kubernetes 1.9.0 beta 1 cri requirements +* Fri Dec 15 2017 Dan Walsh - 1.8.4-1.gitdffb5c2 +- bump to v1.8.4 -* Sun Dec 10 2017 Dan Walsh - 2:1.8.3-1.gitd9922a9 -- container_create: fix apparmor from container config -- container_create: correctly set image and kube envs -- oci: do not append conmon env to container process -- container_exec: use process file with runc exec - -* Thu Nov 30 2017 Lokesh Mandvekar - 2:1.8.2-3.git3de7ab4c -- cri-o should require conmon and not the other way around - -* Wed Nov 29 2017 Lokesh Mandvekar - 2:1.8.2-2.git3de7ab4c -- add additional deps -- From: Antonio Murdaca - -* Wed Nov 29 2017 Lokesh Mandvekar - 2:1.8.2-1.git3de7ab4c +* Wed Nov 29 2017 Lokesh Mandvekar - 1.8.2-1.git3de7ab4 - bump to v1.8.2 -* Tue Nov 28 2017 Lokesh Mandvekar - 2:1.8.1-2.git32d1708d -- separate conmon into a separate subpackage +* Mon Nov 20 2017 Lokesh Mandvekar - 1.8.0-1.git80f54bc +- bump to v1.8.0 -* Wed Nov 22 2017 Dan Walsh - 1.8.1-1.git32d1708d -- Add /proc/scsi to masked paths +* Wed Nov 15 2017 Dan Walsh - 1.0.4-2.git4aceedee +- Fix script error in kpod completions. -* Mon Nov 13 2017 Dan Walsh - 1.8.0-1.git80f54bc1 -- bump v1.8.0 -- Add support for Kubernetes v1.8 -- kpod support moved to the kpod package. +* 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 -* Thu Nov 09 2017 Lokesh Mandvekar - 1.0.3-1.git17bcfb4 +* 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 @@ -819,59 +538,33 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} - 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 -- Add epoch to make sure that this installs - -* Mon Oct 16 2017 Dan Walsh - 1.0.0-5.gita636972 - Get the correct checksum +- Setup storage-opt to override kernel check -* Fri Oct 13 2017 Dan Walsh - 1.0.0-4.gitcd1bac5 -- Release v1.0.0 -- Performance improvements -- Add secrets patch to default mount directories from the host into containers -- Add kpod login/logout -- Change debug flag to log-level, allows admin to specify the loggin level -- Bump to kube v1.7.8 -- Build with go 1.8.4 +* Fri Oct 13 2017 Lokesh Mandvekar - 1.0.0-2.gitcd1bac5 +- bump to v1.0.0 +- require containernetworking-plugins >= 0.5.2-3 -* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-3.rc3.gitd2c6f64 -- build v1.0.0-rc3 tag +* Wed Oct 11 2017 Lokesh Mandvekar - 1.0.0-1.rc3.gitd2c6f64 +- bump to v1.0.0-rc3 -* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-2.rc3.dev.gita8ea146 -- adjust runc dep for CentOS Virt SIG builds - -* Tue Oct 03 2017 Lokesh Mandvekar - 1.0.0-1.rc3.dev.gita8ea146 -- bump to 1.0.0-rc3.dev -- built commit a8ea146 - -* Wed Sep 20 2017 Lokesh Mandvekar - 1.0.0-1.rc2.git6784a66 +* Wed Sep 20 2017 Lokesh Mandvekar - 1.0.0-1.rc2.git6784a66 - bump to v1.0.0-rc2 -* Tue Sep 12 2017 Dan Walsh - 1.0.0.rc1-2.gitbb1da97 -- Change default storage to overlay not overlay2, which shoulf fix issues with kpod working out of the box. +* Mon Sep 18 2017 Lokesh Mandvekar - 1.0.0-2.rc1.gitbb1da97 +- bump release tag and build for extras -* Fri Sep 8 2017 Dan Walsh - 1.0.0.rc1-1.gitbb1da97 -- Bugs, stability and performance fixes -- Moved from kubernetes 1.6 to 1.7 -- cadvisor isupport -- Full kube e2e tests coverage. We are now gating pull requests on kube e2e (we were gating them just on node-e2e). -- Continue working on kpod -- kpod cp -- kpod diff -- kpod export -- kpod logs -- kpod mount -- kpod ps -- kpod rename -- kpod stats -- kpod umount - -* Tue Sep 5 2017 Lokesh Mandvekar - 1.0.0.beta.0-3.gitf9387ac -- btrfs_noversion in BUILDTAGS for previous build was in error - -* Tue Sep 5 2017 Lokesh Mandvekar - 1.0.0.beta.0-2.gitf9387ac -- bump to latest master -- use runc >= 2:1.0.0-10 +* 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 @@ -883,24 +576,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} - OCI 1.0 runtime support - Dropped internal runc, and now use systems runc -* Wed Aug 02 2017 Fedora Release Engineering - 1.0.0.alpha.0-5.gitfa25b38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.0.0.alpha.0-4.gitfa25b38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jul 13 2017 Lokesh Mandvekar - 1.0.0.alpha.0-3.gitfa25b38 -- enable all arches except ppc64 because it's been removed from goarches - -* Thu Jul 13 2017 Lokesh Mandvekar - 1.0.0.alpha.0-2.gitfa25b38 -- built commit fa25b38 -- Provides: crio - * 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) -- skip s390x build (rhbz#1466865) * Fri Jun 23 2017 Antonio Murdaca - 1.0.0.alpha.0-0.git5dcbdc0.3 - rebuilt to include cri-o-cni sub package @@ -980,5 +659,3 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace:%{gopath} * Tue Nov 08 2016 Lokesh Mandvekar - 0-0.1.gitc57530e - First package for Fedora - - diff --git a/crio-network.sysconfig b/crio-network.sysconfig deleted file mode 100644 index 7c47f86..0000000 --- a/crio-network.sysconfig +++ /dev/null @@ -1,3 +0,0 @@ -# /etc/sysconfig/crio-network - -CRIO_NETWORK_OPTIONS= diff --git a/crio-storage.sysconfig b/crio-storage.sysconfig deleted file mode 100644 index fbc68c5..0000000 --- a/crio-storage.sysconfig +++ /dev/null @@ -1,2 +0,0 @@ -# /etc/sysconfig/crio-storage -CRIO_STORAGE_OPTIONS= diff --git a/sources b/sources index e46d04e..bf51e66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-c4f232a.tar.gz) = 86cfbeefcf7f18baf3d05135043b9919d25a8bc6ca2dd0d87587d26088e4514dbb44de4a9d6546b8d229a1980f1c8ffb5bc794687c1a8656ad05b42ab1d49956 +SHA512 (cri-o-1.23.2.tar.gz) = 5080a0953c3b4e90a9e42606defe5f1e906533b9db66fa7daa823475e25a65040c442d06d591847ece3b1b7745a74cde938deac5c8bfd522dff25a2e76a07b1d From 104841304676f57f1a32eaa7788784266d1affe1 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Fri, 17 Jun 2022 11:35:40 -0400 Subject: [PATCH 169/202] bump to v1.24.1 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 21 ++++++++++++++------- sources | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0c67bde..ea8c755 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /cri-o-1.23.0.tar.gz /cri-o-1.23.1.tar.gz /cri-o-1.23.2.tar.gz +/cri-o-1.24.1.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 7b427ea..cbd14bd 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,15 +1,15 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -Version: 1.23.2 +Version: 1.24.1 %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 %{?**}; + go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${BASE_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 %{?**}; + go build -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${BASE_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 @@ -33,7 +33,7 @@ Version: 1.23.2 %global service_name crio # Commit for the builds -%global commit0 c0b2474b80fd0844b883729bda88961bed7b472b +%global commit0 a3bbde8a77c323aa6a485da9a9046299155c6016 Name: cri-o Epoch: 0 @@ -47,7 +47,7 @@ URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz %if 0%{?rhel} -BuildRequires: golang >= 1.17 +BuildRequires: golang >= 1.18 %endif %if 0%{?rhel} && 0%{?rhel} <= 8 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -79,10 +79,11 @@ Requires: container-selinux Requires: containers-common >= 1:0.1.31-14 %if 0%{?rhel} && 0%{?rhel} < 8 Requires: runc >= 1.0.0-16 +Requires: containernetworking-plugins >= 1.0.0-1 %else Recommends: runc >= 1.0.0-16 +Suggests: containernetworking-plugins >= 1.0.0-1 %endif -Requires: containernetworking-plugins >= 0.7.5-1 Requires: conmon >= 2.0.2-1 Requires: socat @@ -119,7 +120,7 @@ $(hack/libdm_no_deferred_remove_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)" -export LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path} +export BASE_LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path} -X %{goipath}/internal/version.buildDate=%{build_timestamp} -X %{goipath}/internal/version.gitCommit=%{commit0} -X %{goipath}/internal/version.version=%{version} @@ -225,6 +226,12 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Mon Jun 06 2022 Peter Hunt - 0:1.24.1-1 +- bump to v1.24.1 + +* Wed May 11 2022 Peter Hunt - 0:1.24.0-1 +- bump to v1.24.0 + * Tue Mar 15 2022 Peter Hunt - 0:1.23.2-1 - bump to v1.23.2 diff --git a/sources b/sources index bf51e66..969d488 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.23.2.tar.gz) = 5080a0953c3b4e90a9e42606defe5f1e906533b9db66fa7daa823475e25a65040c442d06d591847ece3b1b7745a74cde938deac5c8bfd522dff25a2e76a07b1d +SHA512 (cri-o-1.24.1.tar.gz) = 899efb61c70be3a0e950dc239245e1a4dca66e2130d8b355a7ad73c1e91088a2d42c6a4cc05f879cc6a1252d40294e9a8845fd2b110148a05a9d63f61077c498 From 0dfc3b9f8d0c39fd748b41f8634abef039608478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 17 Jun 2022 22:19:27 +0200 Subject: [PATCH 170/202] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 --- cri-o.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index cbd14bd..168cd1b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Version: 1.24.1 Name: cri-o Epoch: 0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -226,6 +226,10 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Fri Jun 17 2022 Robert-André Mauchin - 0:1.24.1-2 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629 + * Mon Jun 06 2022 Peter Hunt - 0:1.24.1-1 - bump to v1.24.1 From c41fd8553dfe94fb5e98901dbe994ec2eab8de27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 18 Jun 2022 10:53:48 +0200 Subject: [PATCH 171/202] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 From 59980bddfa8b246e38bd20ee96c3804e909df724 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 19 Jul 2022 13:54:50 -0500 Subject: [PATCH 172/202] Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang --- cri-o.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 168cd1b..1c12f58 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Version: 1.24.1 Name: cri-o Epoch: 0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -226,6 +226,10 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Tue Jul 19 2022 Maxwell G - 0:1.24.1-3 +- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in + golang + * Fri Jun 17 2022 Robert-André Mauchin - 0:1.24.1-2 - Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 From c84fc17596cbb880f88a8518a523817d9de621dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 23:44:54 +0000 Subject: [PATCH 173/202] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 1c12f58..c76b760 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Version: 1.24.1 Name: cri-o Epoch: 0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -226,6 +226,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0:1.24.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Tue Jul 19 2022 Maxwell G - 0:1.24.1-3 - Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in golang From 788e8d6eb49fd35af50adee14d4ef81d8dbcf189 Mon Sep 17 00:00:00 2001 From: Peter Hunt~ Date: Wed, 11 Jan 2023 16:03:06 -0500 Subject: [PATCH 174/202] bump to 1.26.1 Signed-off-by: Peter Hunt~ --- .gitignore | 1 + cri-o.spec | 39 +++++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index ea8c755..d02daef 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /cri-o-1.23.1.tar.gz /cri-o-1.23.2.tar.gz /cri-o-1.24.1.tar.gz +/cri-o-1.26.1.tar.gz diff --git a/cri-o.spec b/cri-o.spec index c76b760..79409bc 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,6 +1,6 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -Version: 1.24.1 +Version: 1.26.1 %if 0%{?rhel} && 0%{?rhel} <= 8 %define gobuild(o:) %{expand: @@ -33,11 +33,11 @@ Version: 1.24.1 %global service_name crio # Commit for the builds -%global commit0 a3bbde8a77c323aa6a485da9a9046299155c6016 +%global commit0 69945ab622a70ab01f4b0df10b107bc48e38dc9e Name: cri-o Epoch: 0 -Release: 4%{?dist} +Release: 0%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -47,7 +47,7 @@ URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz %if 0%{?rhel} -BuildRequires: golang >= 1.18 +BuildRequires: golang >= 1.19 %endif %if 0%{?rhel} && 0%{?rhel} <= 8 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -153,8 +153,8 @@ install -p -m 755 bin/%{service_name} %{buildroot}%{_bindir} # 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 -p -m 644 contrib/cni/10-crio-bridge.conflist %{buildroot}%{_sysconfdir}/cni/net.d/100-crio-bridge.conflist +install -p -m 644 contrib/cni/99-loopback.conflist %{buildroot}%{_sysconfdir}/cni/net.d/200-loopback.conflist install -dp %{buildroot}%{_sysconfdir}/%{service_name} install -dp %{buildroot}%{_datadir}/containers/oci/hooks.d @@ -205,8 +205,8 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %{_mandir}/man8/%{service_name}*.8* %dir %{_sysconfdir}/%{service_name} %config(noreplace) %{_sysconfdir}/%{service_name}/%{service_name}.conf -%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conf -%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conf +%config(noreplace) %{_sysconfdir}/cni/net.d/100-%{service_name}-bridge.conflist +%config(noreplace) %{_sysconfdir}/cni/net.d/200-loopback.conflist %config(noreplace) %{_sysconfdir}/crictl.yaml %dir %{_libexecdir}/%{service_name} %{_unitdir}/%{service_name}.service @@ -226,16 +226,23 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog -* Wed Jul 20 2022 Fedora Release Engineering - 0:1.24.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild +* Tue Jan 10 2023 Peter Hunt~ - 0:1.26.1-1 +- bump to v1.26.1 -* Tue Jul 19 2022 Maxwell G - 0:1.24.1-3 -- Rebuild for CVE-2022-{1705,32148,30631,30633,28131,30635,30632,30630,1962} in - golang +* Fri Dec 23 2022 Peter Hunt~ - 0:1.26.0-1 +- bump to v1.26.0 -* Fri Jun 17 2022 Robert-André Mauchin - 0:1.24.1-2 -- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, - CVE-2022-29526, CVE-2022-30629 +* Fri Oct 07 2022 Peter Hunt~ - 0:1.25.1-1 +- bump to v1.25.1 + +* Mon Aug 29 2022 Peter Hunt~ - 0:1.25.0-1 +- bump to v1.25.0 + +* Mon Aug 29 2022 Peter Hunt~ - 0:1.25.0-1 +- bump to v1.25.0 + +* Tue Aug 09 2022 Peter Hunt~ - 0:1.24.2-1 +- bump to v1.24.2 * Mon Jun 06 2022 Peter Hunt - 0:1.24.1-1 - bump to v1.24.1 diff --git a/sources b/sources index 969d488..e248043 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.24.1.tar.gz) = 899efb61c70be3a0e950dc239245e1a4dca66e2130d8b355a7ad73c1e91088a2d42c6a4cc05f879cc6a1252d40294e9a8845fd2b110148a05a9d63f61077c498 +SHA512 (cri-o-1.26.1.tar.gz) = c2608c73c47068bf51c6e32051c0122ed2350d211d473c0eabe349309cf903ac365fcf59cfaac5878f2818c4c9836833f377556823a67a3203a9f66a36f944c6 From 45210bdab14e077f25655f73da093b879d6bc296 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 00:40:15 +0000 Subject: [PATCH 175/202] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 79409bc..342c4e3 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Version: 1.26.1 Name: cri-o Epoch: 0 -Release: 0%{?dist} +Release: 1%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -226,6 +226,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0:1.26.1-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jan 10 2023 Peter Hunt~ - 0:1.26.1-1 - bump to v1.26.1 From 617e508896906257c20c484775575a20533d1b74 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 9 May 2023 13:38:09 -0400 Subject: [PATCH 176/202] bump to 1.27.0 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 19 +++++++++++++------ sources | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d02daef..4d314b6 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /cri-o-1.23.2.tar.gz /cri-o-1.24.1.tar.gz /cri-o-1.26.1.tar.gz +/cri-o-1.27.0.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 342c4e3..05d8ee1 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,8 +1,8 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -Version: 1.26.1 +Version: 1.27.0 -%if 0%{?rhel} && 0%{?rhel} <= 8 +%if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: # https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12 %global _dwz_low_mem_die_limit 0 @@ -33,7 +33,7 @@ Version: 1.26.1 %global service_name crio # Commit for the builds -%global commit0 69945ab622a70ab01f4b0df10b107bc48e38dc9e +%global commit0 11d8079ee81fb928b37fdef01882bd6977d68d3d Name: cri-o Epoch: 0 @@ -96,7 +96,7 @@ Open Container Initiative-based implementation of Kubernetes Container Runtime Interface. %prep -%if 0%{?rhel} && 0%{?rhel} <= 8 +%if 0%{?rhel} && 0%{?rhel} <= 9 %autosetup -p1 -n %{name}-%{version} %else %goprep -k @@ -120,6 +120,10 @@ $(hack/libdm_no_deferred_remove_tag.sh) $(hack/seccomp_tag.sh) $(hack/selinux_tag.sh)" +%if 0%{?rhel} && 0%{?rhel} <= 8 +BUILDTAGS="$BUILDTAGS containers_image_openpgp" +%endif + export BASE_LDFLAGS="-X %{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path} -X %{goipath}/internal/version.buildDate=%{build_timestamp} -X %{goipath}/internal/version.gitCommit=%{commit0} @@ -226,8 +230,11 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog -* Thu Jan 19 2023 Fedora Release Engineering - 0:1.26.1-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild +* Tue Apr 25 2023 Peter Hunt - 0:1.27.0-1 +- bump to v1.27.0 + +* Wed Jan 25 2023 Peter Hunt~ - 0:1.26.1-2 +- update for obs * Tue Jan 10 2023 Peter Hunt~ - 0:1.26.1-1 - bump to v1.26.1 diff --git a/sources b/sources index e248043..fda8382 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.26.1.tar.gz) = c2608c73c47068bf51c6e32051c0122ed2350d211d473c0eabe349309cf903ac365fcf59cfaac5878f2818c4c9836833f377556823a67a3203a9f66a36f944c6 +SHA512 (cri-o-1.27.0.tar.gz) = 5219c33e86af02e3a85c8da56ee2511f5cc6d8e29cf23e27ffa213a024a3b6ddead73028235b9091dc883afca27cec5fd048a28c80f3a9ad9211ebc8f60c66f2 From 5b10e3c19e17ea44e8d0c20160cd4e4c9120f5f6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 16:35:25 +0000 Subject: [PATCH 177/202] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 05d8ee1..18401a5 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Version: 1.27.0 Name: cri-o Epoch: 0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -230,6 +230,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0:1.27.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 25 2023 Peter Hunt - 0:1.27.0-1 - bump to v1.27.0 From f64e745fb55d4a56e0c97daab430d51362ddbf43 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 20 Jul 2023 15:43:38 -0400 Subject: [PATCH 178/202] bump to 1.27.1 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4d314b6..b80def5 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /cri-o-1.24.1.tar.gz /cri-o-1.26.1.tar.gz /cri-o-1.27.0.tar.gz +/cri-o-1.27.1.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 18401a5..028a4fa 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,6 +1,6 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -Version: 1.27.0 +Version: 1.27.1 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -33,7 +33,7 @@ Version: 1.27.0 %global service_name crio # Commit for the builds -%global commit0 11d8079ee81fb928b37fdef01882bd6977d68d3d +%global commit0 65a8134d7c4722e1c39d0e1c473532a17c240682 Name: cri-o Epoch: 0 @@ -230,6 +230,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Thu Jul 20 2023 T K Chandra Hasan - 0:1.27.1-1 +- bump to v1.27.1 + * Wed Jul 19 2023 Fedora Release Engineering - 0:1.27.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index fda8382..b05affb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.27.0.tar.gz) = 5219c33e86af02e3a85c8da56ee2511f5cc6d8e29cf23e27ffa213a024a3b6ddead73028235b9091dc883afca27cec5fd048a28c80f3a9ad9211ebc8f60c66f2 +SHA512 (cri-o-1.27.1.tar.gz) = 27fb79141dd60c1744df8761a4d43603256f7f06e32d2f9c76be62b95dcf62924c7501d0461efabb013ae397c16030b6a2b037eeaae7a5daec7c28943f71bc7e From d6ff87ba32663a2b5810639d8b537daa9f216442 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Tue, 5 Sep 2023 14:25:29 -0400 Subject: [PATCH 179/202] bump to v1.28.0 Signed-off-by: Peter Hunt --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b80def5..8b0be08 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /cri-o-1.26.1.tar.gz /cri-o-1.27.0.tar.gz /cri-o-1.27.1.tar.gz +/cri-o-1.28.0.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 028a4fa..171ecc0 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,6 +1,6 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -Version: 1.27.1 +Version: 1.28.0 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -37,7 +37,7 @@ Version: 1.27.1 Name: cri-o Epoch: 0 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -230,6 +230,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Thu Aug 24 2023 Peter Hunt - 0:1.28.0-1 +- bump to v1.28.0 + * Thu Jul 20 2023 T K Chandra Hasan - 0:1.27.1-1 - bump to v1.27.1 diff --git a/sources b/sources index b05affb..b4f9a76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.27.1.tar.gz) = 27fb79141dd60c1744df8761a4d43603256f7f06e32d2f9c76be62b95dcf62924c7501d0461efabb013ae397c16030b6a2b037eeaae7a5daec7c28943f71bc7e +SHA512 (cri-o-1.28.0.tar.gz) = 20726dee84a27bfa586a50d1e330da493d4d1f7bd80ba76206f6796696ec97b9d128fc8667ef13b703310a024ce8f37442dfeb66b9f43c85b5e81e128abb8968 From db43736e7dd4538de30159a93fc89af49f3be259 Mon Sep 17 00:00:00 2001 From: Christian Glombek Date: Mon, 4 Dec 2023 13:56:17 +0100 Subject: [PATCH 180/202] bump to v1.28.2 --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8b0be08..62d5c13 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /cri-o-1.27.0.tar.gz /cri-o-1.27.1.tar.gz /cri-o-1.28.0.tar.gz +/cri-o-1.28.2.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 171ecc0..532e095 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,6 +1,6 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -Version: 1.28.0 +Version: 1.28.2 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -33,7 +33,7 @@ Version: 1.28.0 %global service_name crio # Commit for the builds -%global commit0 65a8134d7c4722e1c39d0e1c473532a17c240682 +%global commit0 e7be4e160f3cc3810b3f6c9fbf225697d772a9ad Name: cri-o Epoch: 0 @@ -230,6 +230,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Mon Dec 04 2023 Christian Glombek - 0:1.28.2-1 +- bump to v1.28.2 + * Thu Aug 24 2023 Peter Hunt - 0:1.28.0-1 - bump to v1.28.0 diff --git a/sources b/sources index b4f9a76..c0beda2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.28.0.tar.gz) = 20726dee84a27bfa586a50d1e330da493d4d1f7bd80ba76206f6796696ec97b9d128fc8667ef13b703310a024ce8f37442dfeb66b9f43c85b5e81e128abb8968 +SHA512 (cri-o-1.28.2.tar.gz) = 687a9f8cda0ac21bce5e9911f76d18aff5acbd148e98c9bed418d20f47c002c47b5a797a24297c7c267f0c1caf2b55834376860ffdd81e6631940cf7e95d979b From 0c0f019cc7bb213fb44ce710760bb75147447827 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 16:21:50 +0000 Subject: [PATCH 181/202] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 532e095..7371844 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Version: 1.28.2 Name: cri-o Epoch: 0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -230,6 +230,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0:1.28.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 04 2023 Christian Glombek - 0:1.28.2-1 - bump to v1.28.2 From ed1ce845740e15f9eb029215df96084f4b2fe49f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 08:25:27 +0000 Subject: [PATCH 182/202] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 7371844..b8b2f22 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Version: 1.28.2 Name: cri-o Epoch: 0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -230,6 +230,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 0:1.28.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0:1.28.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 52078f228e36defa33d53d4c92d85d6fe291d338 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 11 Feb 2024 21:43:30 +0000 Subject: [PATCH 183/202] Rebuild for golang 1.22.0 --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index b8b2f22..4121900 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Version: 1.28.2 Name: cri-o Epoch: 0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -230,6 +230,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Sun Feb 11 2024 Maxwell G - 0:1.28.2-4 +- Rebuild for golang 1.22.0 + * Wed Jan 24 2024 Fedora Release Engineering - 0:1.28.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f25860a1c2287a7c6c9942158c6b9b994b087972 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 11 Feb 2024 21:59:47 +0000 Subject: [PATCH 184/202] Rebuild for golang 1.22.0 --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 4121900..3fd16b2 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -37,7 +37,7 @@ Version: 1.28.2 Name: cri-o Epoch: 0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -230,6 +230,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Sun Feb 11 2024 Maxwell G - 0:1.28.2-5 +- Rebuild for golang 1.22.0 + * Sun Feb 11 2024 Maxwell G - 0:1.28.2-4 - Rebuild for golang 1.22.0 From f0be83ef28873dec21b59d573bcfd3aad49c56c7 Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 21 Mar 2024 11:35:24 -0400 Subject: [PATCH 185/202] bump to 1.29.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 62d5c13..2fcd1e3 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /cri-o-1.27.1.tar.gz /cri-o-1.28.0.tar.gz /cri-o-1.28.2.tar.gz +/cri-o-1.29.2.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 3fd16b2..3ea4915 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,6 +1,6 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -Version: 1.28.2 +Version: 1.29.2 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -33,11 +33,11 @@ Version: 1.28.2 %global service_name crio # Commit for the builds -%global commit0 e7be4e160f3cc3810b3f6c9fbf225697d772a9ad +%global commit0 d317b5dc918bbfbc78481072a0d93e572aa8d0e8 Name: cri-o Epoch: 0 -Release: 5%{?dist} +Release: 1%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface @@ -230,6 +230,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Thu Mar 21 2024 Peter Hunt - 0:1.29.2-1 +- bump to v1.29.2 + * Sun Feb 11 2024 Maxwell G - 0:1.28.2-5 - Rebuild for golang 1.22.0 diff --git a/sources b/sources index c0beda2..126fa47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.28.2.tar.gz) = 687a9f8cda0ac21bce5e9911f76d18aff5acbd148e98c9bed418d20f47c002c47b5a797a24297c7c267f0c1caf2b55834376860ffdd81e6631940cf7e95d979b +SHA512 (cri-o-1.29.2.tar.gz) = dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c From 7d8c30ed3888d323a532dca999532e24c570a03d Mon Sep 17 00:00:00 2001 From: Peter Hunt Date: Thu, 21 Mar 2024 11:49:03 -0400 Subject: [PATCH 186/202] add otelttprc patch Signed-off-by: Peter Hunt --- cri-o.spec | 1 + otelttrpc.patch | 140 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+) create mode 100644 otelttrpc.patch diff --git a/cri-o.spec b/cri-o.spec index 3ea4915..a88db40 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -45,6 +45,7 @@ Summary: Open Container Initiative-based implementation of Kubernetes Con License: ASL 2.0 URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: otelttrpc.patch %if 0%{?rhel} BuildRequires: golang >= 1.19 diff --git a/otelttrpc.patch b/otelttrpc.patch new file mode 100644 index 0000000..f9d44c9 --- /dev/null +++ b/otelttrpc.patch @@ -0,0 +1,140 @@ +From 9bf89bf190f7462371640aa16ddfd4a11c73595b Mon Sep 17 00:00:00 2001 +From: Krisztian Litkey +Date: Tue, 5 Mar 2024 10:49:30 +0200 +Subject: [PATCH] deps: update otelttrpc to @latest and re-vendor. + +Update otelttrpc to latest HEAD to get rid of custom import +path checks which reportedly break RPM package builds. + +Signed-off-by: Krisztian Litkey +--- + go.mod | 2 +- + go.sum | 4 ++-- + vendor/github.com/containerd/otelttrpc/config.go | 2 +- + vendor/github.com/containerd/otelttrpc/interceptor.go | 2 +- + vendor/github.com/containerd/otelttrpc/internal/parse.go | 2 +- + vendor/github.com/containerd/otelttrpc/metadata_supplier.go | 2 +- + vendor/github.com/containerd/otelttrpc/semconv.go | 2 +- + vendor/github.com/containerd/otelttrpc/version.go | 2 +- + vendor/modules.txt | 2 +- + 9 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/go.mod b/go.mod +index fa9f1986d6a..ef48b581ba0 100644 +--- a/go.mod ++++ b/go.mod +@@ -13,7 +13,7 @@ require ( + github.com/containerd/cri-containerd v1.19.0 + github.com/containerd/fifo v1.1.0 + github.com/containerd/nri v0.6.0 +- github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 ++ github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 + github.com/containerd/ttrpc v1.2.3 + github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 + github.com/containernetworking/cni v1.1.2 +diff --git a/go.sum b/go.sum +index d6ec62bcb12..8cc4d36e87c 100644 +--- a/go.sum ++++ b/go.sum +@@ -846,8 +846,8 @@ github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oM + github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= + github.com/containerd/nri v0.6.0 h1:hdztxwL0gCS1CrCa9bvD1SoJiFN4jBuRQhplCvCPMj8= + github.com/containerd/nri v0.6.0/go.mod h1:F7OZfO4QTPqw5r87aq+syZJwiVvRYLIlHZiZDBV1W3A= +-github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 h1:DzBGiha+Gvc0INnf4Z2WztM2VSATX7PAJpSdsFEVd6o= +-github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1/go.mod h1:ZKzztepTSz/LKtbUSzfBNVwgqBEPABVZV9PQF/l53+Q= ++github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 h1:swk9KxrmARZjSMrHc1Lzb39XhcDwAhYpqkBhinCFLCQ= ++github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723/go.mod h1:ZKzztepTSz/LKtbUSzfBNVwgqBEPABVZV9PQF/l53+Q= + github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= + github.com/containerd/stargz-snapshotter/estargz v0.12.0/go.mod h1:AIQ59TewBFJ4GOPEQXujcrJ/EKxh5xXZegW1rkR1P/M= + github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G/ZW/0kEe2oEKCdS/ZxIyoCU= +diff --git a/vendor/github.com/containerd/otelttrpc/config.go b/vendor/github.com/containerd/otelttrpc/config.go +index a7768c3731d..186308a1eed 100644 +--- a/vendor/github.com/containerd/otelttrpc/config.go ++++ b/vendor/github.com/containerd/otelttrpc/config.go +@@ -30,7 +30,7 @@ + limitations under the License. + */ + +-package otelttrpc // import "github.com/containerd/otelttrpc" ++package otelttrpc + + import ( + "go.opentelemetry.io/otel" +diff --git a/vendor/github.com/containerd/otelttrpc/interceptor.go b/vendor/github.com/containerd/otelttrpc/interceptor.go +index 8ce9fd9af81..e0c05c07c5d 100644 +--- a/vendor/github.com/containerd/otelttrpc/interceptor.go ++++ b/vendor/github.com/containerd/otelttrpc/interceptor.go +@@ -30,7 +30,7 @@ + limitations under the License. + */ + +-package otelttrpc // import "github.com/containerd/otelttrpc" ++package otelttrpc + + import ( + "context" +diff --git a/vendor/github.com/containerd/otelttrpc/internal/parse.go b/vendor/github.com/containerd/otelttrpc/internal/parse.go +index 2520a129129..694aeba8015 100644 +--- a/vendor/github.com/containerd/otelttrpc/internal/parse.go ++++ b/vendor/github.com/containerd/otelttrpc/internal/parse.go +@@ -30,7 +30,7 @@ + limitations under the License. + */ + +-package internal // import "github.com/containerd/ttrpc/otelttrpc" ++package internal + + import ( + "strings" +diff --git a/vendor/github.com/containerd/otelttrpc/metadata_supplier.go b/vendor/github.com/containerd/otelttrpc/metadata_supplier.go +index 4bda57a1805..b2c3cab182e 100644 +--- a/vendor/github.com/containerd/otelttrpc/metadata_supplier.go ++++ b/vendor/github.com/containerd/otelttrpc/metadata_supplier.go +@@ -30,7 +30,7 @@ + limitations under the License. + */ + +-package otelttrpc // import "github.com/containerd/otelttrpc" ++package otelttrpc + + import ( + "context" +diff --git a/vendor/github.com/containerd/otelttrpc/semconv.go b/vendor/github.com/containerd/otelttrpc/semconv.go +index c0d5669cdfc..64f0fe8f30e 100644 +--- a/vendor/github.com/containerd/otelttrpc/semconv.go ++++ b/vendor/github.com/containerd/otelttrpc/semconv.go +@@ -30,7 +30,7 @@ + limitations under the License. + */ + +-package otelttrpc // import "github.com/containerd/otelttrpc" ++package otelttrpc + + import ( + "go.opentelemetry.io/otel/attribute" +diff --git a/vendor/github.com/containerd/otelttrpc/version.go b/vendor/github.com/containerd/otelttrpc/version.go +index c2e09a34f90..bbf2bbcc5e0 100644 +--- a/vendor/github.com/containerd/otelttrpc/version.go ++++ b/vendor/github.com/containerd/otelttrpc/version.go +@@ -30,7 +30,7 @@ + limitations under the License. + */ + +-package otelttrpc // import "github.com/containerd/otelttrpc" ++package otelttrpc + + // Version is the current release version of the ttRPC instrumentation. + func Version() string { +diff --git a/vendor/modules.txt b/vendor/modules.txt +index eb710af7602..4ee9f9753b3 100644 +--- a/vendor/modules.txt ++++ b/vendor/modules.txt +@@ -212,7 +212,7 @@ github.com/containerd/nri/pkg/net + github.com/containerd/nri/pkg/net/multiplex + github.com/containerd/nri/pkg/runtime-tools/generate + github.com/containerd/nri/pkg/stub +-# github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 ++# github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 + ## explicit; go 1.13 + github.com/containerd/otelttrpc + github.com/containerd/otelttrpc/internal From 5caa0f2b169fd7026e21ce670a17e10479bcf8a7 Mon Sep 17 00:00:00 2001 From: Christian Glombek Date: Fri, 22 Mar 2024 08:48:57 +0100 Subject: [PATCH 187/202] spec: Remove crio-status from files --- cri-o.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index a88db40..417242c 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -204,7 +204,6 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %doc docs code-of-conduct.md tutorial.md ADOPTERS.md CONTRIBUTING.md README.md %doc awesome.md transfer.md %{_bindir}/%{service_name} -%{_bindir}/%{service_name}-status %{_bindir}/pinns %{_mandir}/man5/%{service_name}.conf*5* %{_mandir}/man8/%{service_name}*.8* From d0f8519e4d45c1a8f6f6a2f35a874a10f5e0e8fd Mon Sep 17 00:00:00 2001 From: Christian Glombek Date: Fri, 22 Mar 2024 08:49:17 +0100 Subject: [PATCH 188/202] spec: minor cleanup Move Version and commit0 closer together --- cri-o.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 417242c..f5b4c08 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,6 +1,5 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o -Version: 1.29.2 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -23,12 +22,6 @@ Version: 1.29.2 %global git_tree_state clean %global criocli_path "" -# Used for comparing with latest upstream tag -# to decide whether to autobuild (non-rawhide only) -%global built_tag v%{version} -%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%global crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') - # Services %global service_name crio @@ -36,17 +29,23 @@ Version: 1.29.2 %global commit0 d317b5dc918bbfbc78481072a0d93e572aa8d0e8 Name: cri-o +Version: 1.29.2 Epoch: 0 Release: 1%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface - # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz Patch0: otelttrpc.patch +# Used for comparing with latest upstream tag +# to decide whether to autobuild (non-rawhide only) +%global built_tag v%{version} +%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) +%global crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') + %if 0%{?rhel} BuildRequires: golang >= 1.19 %endif From 998ffdad23e1a7bf8c03e8c48c12cb7a0b95a5af Mon Sep 17 00:00:00 2001 From: Christian Glombek Date: Fri, 22 Mar 2024 18:15:02 +0100 Subject: [PATCH 189/202] spec: Move RPM info to top of spec --- cri-o.spec | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index f5b4c08..96a85f9 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,6 +1,21 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o +# Commit for the builds +%global commit0 d317b5dc918bbfbc78481072a0d93e572aa8d0e8 + +Name: cri-o +Version: 1.29.2 +Epoch: 0 +Release: 1%{?dist} +Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface + +# Upstream license specification: Apache-2.0 +License: ASL 2.0 +URL: https://github.com/cri-o/cri-o +Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: otelttrpc.patch + %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: # https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12 @@ -25,21 +40,6 @@ # Services %global service_name crio -# Commit for the builds -%global commit0 d317b5dc918bbfbc78481072a0d93e572aa8d0e8 - -Name: cri-o -Version: 1.29.2 -Epoch: 0 -Release: 1%{?dist} -Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface - -# Upstream license specification: Apache-2.0 -License: ASL 2.0 -URL: https://github.com/cri-o/cri-o -Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: otelttrpc.patch - # Used for comparing with latest upstream tag # to decide whether to autobuild (non-rawhide only) %global built_tag v%{version} From 60b4a41ab77dc669495acd96aef238e584f59c7f Mon Sep 17 00:00:00 2001 From: Christian Glombek Date: Sat, 23 Mar 2024 03:13:40 +0100 Subject: [PATCH 190/202] spec: remove unused %global crio_release_tag and more shuffling --- cri-o.spec | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 96a85f9..1b1a11e 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -1,20 +1,13 @@ # https://github.com/cri-o/cri-o %global goipath github.com/cri-o/cri-o +%global service_name crio -# Commit for the builds -%global commit0 d317b5dc918bbfbc78481072a0d93e572aa8d0e8 +# 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 "" -Name: cri-o Version: 1.29.2 -Epoch: 0 -Release: 1%{?dist} -Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface - -# Upstream license specification: Apache-2.0 -License: ASL 2.0 -URL: https://github.com/cri-o/cri-o -Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: otelttrpc.patch %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -32,19 +25,19 @@ Patch0: otelttrpc.patch %bcond_without check %endif -# 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 "" +# Commit for the builds +%global commit0 d317b5dc918bbfbc78481072a0d93e572aa8d0e8 -# Services -%global service_name crio +Name: cri-o +Epoch: 0 +Release: 1%{?dist} +Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface -# Used for comparing with latest upstream tag -# to decide whether to autobuild (non-rawhide only) -%global built_tag v%{version} -%global built_tag_strip %(b=%{built_tag}; echo ${b:1}) -%global crio_release_tag %(echo %{built_tag_strip} | cut -f1,2 -d'.') +# Upstream license specification: Apache-2.0 +License: ASL 2.0 +URL: https://github.com/cri-o/cri-o +Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: otelttrpc.patch %if 0%{?rhel} BuildRequires: golang >= 1.19 From 715113b32b54c42e50760033169d21f9e4378c29 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 22 Apr 2024 16:16:06 -0700 Subject: [PATCH 191/202] Update to v1.29.3 Update to cri-o v1.29.3. This update resolves rpm build problem found in v1.29.2 among other fixes. Autogenerate bundled provides. The go-rpm-macros library includes a feature to autogenerate the list of bundled golang provides from libraries in ./vendor. This is enabled by changing '%license LICENSE' to '%license LICENSE vendor/modules.txt'. Remove otelttrpc.patch file and reference in spec file. Patch file was added to resolve rpm build problem that occurred in cri-o v1.29.2. v1.29.3 updates the otelrrprc vendor module which resolves the build problem. --- .gitignore | 1 + cri-o.spec | 14 +++-- otelttrpc.patch | 140 ------------------------------------------------ sources | 2 +- 4 files changed, 11 insertions(+), 146 deletions(-) delete mode 100644 otelttrpc.patch diff --git a/.gitignore b/.gitignore index 2fcd1e3..a2cfffa 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /cri-o-1.28.0.tar.gz /cri-o-1.28.2.tar.gz /cri-o-1.29.2.tar.gz +/cri-o-1.29.3.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 1b1a11e..450816f 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.29.2 +Version: 1.29.3 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.29.2 %endif # Commit for the builds -%global commit0 d317b5dc918bbfbc78481072a0d93e572aa8d0e8 +%global commit0 12c618780c42414d92d6a8dc8d09c16337668eb2 Name: cri-o Epoch: 0 @@ -37,7 +37,6 @@ Summary: Open Container Initiative-based implementation of Kubernetes Con License: ASL 2.0 URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: otelttrpc.patch %if 0%{?rhel} BuildRequires: golang >= 1.19 @@ -192,7 +191,7 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %systemd_postun_with_restart %{service_name} %files -%license LICENSE +%license LICENSE vendor/modules.txt %doc docs code-of-conduct.md tutorial.md ADOPTERS.md CONTRIBUTING.md README.md %doc awesome.md transfer.md %{_bindir}/%{service_name} @@ -222,6 +221,11 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Sat Apr 27 2024 Bradley G Smith - 0:1.29.3-1 +- Bump to v1.29.3 +- Add support for autogenerated bundled provides +- Remove otelttrpc patch added in v1.29.2 to fix rpm build error. No longer needed. + * Thu Mar 21 2024 Peter Hunt - 0:1.29.2-1 - bump to v1.29.2 @@ -628,7 +632,7 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf - Configurable image volume support - Bugs and Stability fixes - OCI 1.0 runtime support -- Dropped internal runc, and now use systems runc +- Dropped internal runc, and now use systems runc * Fri Jun 30 2017 Lokesh Mandvekar - 1.0.0.alpha.0-1.git91977d3 - built commit 91977d3 diff --git a/otelttrpc.patch b/otelttrpc.patch deleted file mode 100644 index f9d44c9..0000000 --- a/otelttrpc.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 9bf89bf190f7462371640aa16ddfd4a11c73595b Mon Sep 17 00:00:00 2001 -From: Krisztian Litkey -Date: Tue, 5 Mar 2024 10:49:30 +0200 -Subject: [PATCH] deps: update otelttrpc to @latest and re-vendor. - -Update otelttrpc to latest HEAD to get rid of custom import -path checks which reportedly break RPM package builds. - -Signed-off-by: Krisztian Litkey ---- - go.mod | 2 +- - go.sum | 4 ++-- - vendor/github.com/containerd/otelttrpc/config.go | 2 +- - vendor/github.com/containerd/otelttrpc/interceptor.go | 2 +- - vendor/github.com/containerd/otelttrpc/internal/parse.go | 2 +- - vendor/github.com/containerd/otelttrpc/metadata_supplier.go | 2 +- - vendor/github.com/containerd/otelttrpc/semconv.go | 2 +- - vendor/github.com/containerd/otelttrpc/version.go | 2 +- - vendor/modules.txt | 2 +- - 9 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/go.mod b/go.mod -index fa9f1986d6a..ef48b581ba0 100644 ---- a/go.mod -+++ b/go.mod -@@ -13,7 +13,7 @@ require ( - github.com/containerd/cri-containerd v1.19.0 - github.com/containerd/fifo v1.1.0 - github.com/containerd/nri v0.6.0 -- github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 -+ github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 - github.com/containerd/ttrpc v1.2.3 - github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 - github.com/containernetworking/cni v1.1.2 -diff --git a/go.sum b/go.sum -index d6ec62bcb12..8cc4d36e87c 100644 ---- a/go.sum -+++ b/go.sum -@@ -846,8 +846,8 @@ github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oM - github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= - github.com/containerd/nri v0.6.0 h1:hdztxwL0gCS1CrCa9bvD1SoJiFN4jBuRQhplCvCPMj8= - github.com/containerd/nri v0.6.0/go.mod h1:F7OZfO4QTPqw5r87aq+syZJwiVvRYLIlHZiZDBV1W3A= --github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 h1:DzBGiha+Gvc0INnf4Z2WztM2VSATX7PAJpSdsFEVd6o= --github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1/go.mod h1:ZKzztepTSz/LKtbUSzfBNVwgqBEPABVZV9PQF/l53+Q= -+github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 h1:swk9KxrmARZjSMrHc1Lzb39XhcDwAhYpqkBhinCFLCQ= -+github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723/go.mod h1:ZKzztepTSz/LKtbUSzfBNVwgqBEPABVZV9PQF/l53+Q= - github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= - github.com/containerd/stargz-snapshotter/estargz v0.12.0/go.mod h1:AIQ59TewBFJ4GOPEQXujcrJ/EKxh5xXZegW1rkR1P/M= - github.com/containerd/stargz-snapshotter/estargz v0.15.1 h1:eXJjw9RbkLFgioVaTG+G/ZW/0kEe2oEKCdS/ZxIyoCU= -diff --git a/vendor/github.com/containerd/otelttrpc/config.go b/vendor/github.com/containerd/otelttrpc/config.go -index a7768c3731d..186308a1eed 100644 ---- a/vendor/github.com/containerd/otelttrpc/config.go -+++ b/vendor/github.com/containerd/otelttrpc/config.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "go.opentelemetry.io/otel" -diff --git a/vendor/github.com/containerd/otelttrpc/interceptor.go b/vendor/github.com/containerd/otelttrpc/interceptor.go -index 8ce9fd9af81..e0c05c07c5d 100644 ---- a/vendor/github.com/containerd/otelttrpc/interceptor.go -+++ b/vendor/github.com/containerd/otelttrpc/interceptor.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "context" -diff --git a/vendor/github.com/containerd/otelttrpc/internal/parse.go b/vendor/github.com/containerd/otelttrpc/internal/parse.go -index 2520a129129..694aeba8015 100644 ---- a/vendor/github.com/containerd/otelttrpc/internal/parse.go -+++ b/vendor/github.com/containerd/otelttrpc/internal/parse.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package internal // import "github.com/containerd/ttrpc/otelttrpc" -+package internal - - import ( - "strings" -diff --git a/vendor/github.com/containerd/otelttrpc/metadata_supplier.go b/vendor/github.com/containerd/otelttrpc/metadata_supplier.go -index 4bda57a1805..b2c3cab182e 100644 ---- a/vendor/github.com/containerd/otelttrpc/metadata_supplier.go -+++ b/vendor/github.com/containerd/otelttrpc/metadata_supplier.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "context" -diff --git a/vendor/github.com/containerd/otelttrpc/semconv.go b/vendor/github.com/containerd/otelttrpc/semconv.go -index c0d5669cdfc..64f0fe8f30e 100644 ---- a/vendor/github.com/containerd/otelttrpc/semconv.go -+++ b/vendor/github.com/containerd/otelttrpc/semconv.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - import ( - "go.opentelemetry.io/otel/attribute" -diff --git a/vendor/github.com/containerd/otelttrpc/version.go b/vendor/github.com/containerd/otelttrpc/version.go -index c2e09a34f90..bbf2bbcc5e0 100644 ---- a/vendor/github.com/containerd/otelttrpc/version.go -+++ b/vendor/github.com/containerd/otelttrpc/version.go -@@ -30,7 +30,7 @@ - limitations under the License. - */ - --package otelttrpc // import "github.com/containerd/otelttrpc" -+package otelttrpc - - // Version is the current release version of the ttRPC instrumentation. - func Version() string { -diff --git a/vendor/modules.txt b/vendor/modules.txt -index eb710af7602..4ee9f9753b3 100644 ---- a/vendor/modules.txt -+++ b/vendor/modules.txt -@@ -212,7 +212,7 @@ github.com/containerd/nri/pkg/net - github.com/containerd/nri/pkg/net/multiplex - github.com/containerd/nri/pkg/runtime-tools/generate - github.com/containerd/nri/pkg/stub --# github.com/containerd/otelttrpc v0.0.0-20240115065405-5909713624e1 -+# github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 - ## explicit; go 1.13 - github.com/containerd/otelttrpc - github.com/containerd/otelttrpc/internal diff --git a/sources b/sources index 126fa47..4bbfbce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.29.2.tar.gz) = dd4105e0097a098b9009b00b59a8e8aeaad85b07177305e2e4b2c68a583a0c342e7a615f47a8cbcb7f179035f2c279573069f15aa1e91e491fe770eec1df326c +SHA512 (cri-o-1.29.3.tar.gz) = ed2e3d0342b0533cde26a5854447331503afb368fe4e56f87f33574c5b639bae780d58d0726d1f932fceae229f2c84500f5919aeedc3cb010fb6f271a97e3e55 From af9724800cacdb408b5e5de1a6cd912fed114460 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 30 Apr 2024 12:59:33 -0700 Subject: [PATCH 192/202] Update to v1.29.4 Resolves BZ2234350 in part. Fix CVE-2024-3154 , a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime. --- cri-o.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index 450816f..cdd381a 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.29.3 +Version: 1.29.4 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.29.3 %endif # Commit for the builds -%global commit0 12c618780c42414d92d6a8dc8d09c16337668eb2 +%global commit0 51ea93e0b9af5ad2cfa7f8071ec48d99bf39a3ec Name: cri-o Epoch: 0 @@ -221,6 +221,10 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Tue Apr 30 2024 Bradley G Smith - 0:1.29.4-1 +- Bump to v1.29.4 +- Resolves CVE-2024-3154, a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime. + * Sat Apr 27 2024 Bradley G Smith - 0:1.29.3-1 - Bump to v1.29.3 - Add support for autogenerated bundled provides From ac7db51ac5261bf02b11cd34c0977cd45bd0a5e3 Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 30 Apr 2024 13:42:56 -0700 Subject: [PATCH 193/202] Add source files --- .gitignore | 2 ++ sources | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a2cfffa..30453a0 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ /cri-o-1.28.2.tar.gz /cri-o-1.29.2.tar.gz /cri-o-1.29.3.tar.gz +/cri-o-1.29.4-1.fc41.src.rpm +/cri-o-1.29.4.tar.gz diff --git a/sources b/sources index 4bbfbce..f522956 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (cri-o-1.29.3.tar.gz) = ed2e3d0342b0533cde26a5854447331503afb368fe4e56f87f33574c5b639bae780d58d0726d1f932fceae229f2c84500f5919aeedc3cb010fb6f271a97e3e55 +SHA512 (cri-o-1.29.4-1.fc41.src.rpm) = 40bf07b4876e0ffea2cf7c04e506880a438f135edceace15b495427f97cdd2db675fb7cc72a6a2979b36ed0a87a66f68801444ddc02e17513dfb89a66bcf69b8 +SHA512 (cri-o-1.29.4.tar.gz) = 84c132662a726c829f1ddb7ef6722b4b201a74a4b7bcde23d56db9bfde550dd95c125b4f7f4c14e3024a5477087261c90bcbe0ea8492dba84c68cc40cb1a6314 From 183a7b1633b7294a21d5c33cf9092fae9246a41f Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Tue, 30 Apr 2024 13:54:13 -0700 Subject: [PATCH 194/202] Correct sources - remove src rpm --- .gitignore | 1 - sources | 1 - 2 files changed, 2 deletions(-) diff --git a/.gitignore b/.gitignore index 30453a0..bb9f63e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,5 +44,4 @@ /cri-o-1.28.2.tar.gz /cri-o-1.29.2.tar.gz /cri-o-1.29.3.tar.gz -/cri-o-1.29.4-1.fc41.src.rpm /cri-o-1.29.4.tar.gz diff --git a/sources b/sources index f522956..2fbbe6e 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (cri-o-1.29.4-1.fc41.src.rpm) = 40bf07b4876e0ffea2cf7c04e506880a438f135edceace15b495427f97cdd2db675fb7cc72a6a2979b36ed0a87a66f68801444ddc02e17513dfb89a66bcf69b8 SHA512 (cri-o-1.29.4.tar.gz) = 84c132662a726c829f1ddb7ef6722b4b201a74a4b7bcde23d56db9bfde550dd95c125b4f7f4c14e3024a5477087261c90bcbe0ea8492dba84c68cc40cb1a6314 From 00742958126dc225e8f3f815111ff4deef8b4a0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:11:55 +0000 Subject: [PATCH 195/202] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index cdd381a..aa7d13b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Version: 1.29.4 Name: cri-o Epoch: 0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -221,6 +221,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0:1.29.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Apr 30 2024 Bradley G Smith - 0:1.29.4-1 - Bump to v1.29.4 - Resolves CVE-2024-3154, a security flaw where CRI-O allowed users to specify annotations that changed specific fields in the runtime. From 789f35272e708a8cf06f4d73ad2a7a3ae9787a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 24 Jul 2024 15:30:44 +0200 Subject: [PATCH 196/202] convert ASL 2.0 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- cri-o.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cri-o.spec b/cri-o.spec index aa7d13b..2b06cd7 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,11 +30,12 @@ Version: 1.29.4 Name: cri-o Epoch: 0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 -License: ASL 2.0 +# Automatically converted from old format: ASL 2.0 - review is highly recommended. +License: Apache-2.0 URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz @@ -221,6 +222,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Wed Jul 24 2024 Miroslav Suchý - 0:1.29.4-3 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 0:1.29.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4c0b4c35e5b6c4debd9d70b5e9877649d58f29f2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 24 Oct 2024 19:44:08 -0500 Subject: [PATCH 197/202] update to 1.31.1 Signed-off-by: Dennis Gilmore --- .gitignore | 1 + cri-o.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bb9f63e..52315ff 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /cri-o-1.29.2.tar.gz /cri-o-1.29.3.tar.gz /cri-o-1.29.4.tar.gz +/cri-o-1.31.1.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 2b06cd7..0115f78 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.29.4 +Version: 1.31.1 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -30,7 +30,7 @@ Version: 1.29.4 Name: cri-o Epoch: 0 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -222,6 +222,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Thu Oct 24 2024 Dennis Gilmore - 0:1.31.1-1 +- update to 1.31.1 + * Wed Jul 24 2024 Miroslav Suchý - 0:1.29.4-3 - convert license to SPDX diff --git a/sources b/sources index 2fbbe6e..6359e0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.29.4.tar.gz) = 84c132662a726c829f1ddb7ef6722b4b201a74a4b7bcde23d56db9bfde550dd95c125b4f7f4c14e3024a5477087261c90bcbe0ea8492dba84c68cc40cb1a6314 +SHA512 (cri-o-1.31.1.tar.gz) = ebf83bf90d792ced458bbc321be14aa871ba5efcef212cf4777388916c5f35f9149aa65abf07c07de86834bbc23ac30035b2bff8cca74aac875c41b10ba76def From b69e768862ad5d6ea2e976a3ad48db464621863b Mon Sep 17 00:00:00 2001 From: Bradley G Smith Date: Mon, 23 Dec 2024 08:10:33 -0800 Subject: [PATCH 198/202] Update to release v1.32.0 - Resolves rhbz#2333357 - Resolves https://github.com/cri-o/cri-o/issues/8860 - Amends buildtags to current upstream values --- .gitignore | 1 + cri-o.spec | 23 +++++++++++++++-------- sources | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 52315ff..839e3bb 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /cri-o-1.29.3.tar.gz /cri-o-1.29.4.tar.gz /cri-o-1.31.1.tar.gz +/cri-o-1.32.0.tar.gz diff --git a/cri-o.spec b/cri-o.spec index 0115f78..a913baf 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -7,7 +7,7 @@ %global git_tree_state clean %global criocli_path "" -Version: 1.31.1 +Version: 1.32.0 %if 0%{?rhel} && 0%{?rhel} <= 9 %define gobuild(o:) %{expand: @@ -26,7 +26,7 @@ Version: 1.31.1 %endif # Commit for the builds -%global commit0 51ea93e0b9af5ad2cfa7f8071ec48d99bf39a3ec +%global commit0 b7f3c240bcbda6fae8d43561694d18317e09e167 Name: cri-o Epoch: 0 @@ -40,7 +40,7 @@ URL: https://github.com/cri-o/cri-o Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz %if 0%{?rhel} -BuildRequires: golang >= 1.19 +BuildRequires: golang >= 1.23 %endif %if 0%{?rhel} && 0%{?rhel} <= 8 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required @@ -104,14 +104,16 @@ sed -i 's/\/local//' contrib/systemd/%{service_name}.service sed -i 's/\/local//' contrib/systemd/%{service_name}-wipe.service %build +%global __golang_extldflags -Wl,-z,undefs + export GO111MODULE=on export GOFLAGS=-mod=vendor -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 BUILDTAGS="containers_image_ostree_stub +$(hack/btrfs_installed_tag.sh) +$(hack/btrfs_tag.sh) $(hack/openpgp_tag.sh) +$(hack/seccomp_tag.sh) $(hack/selinux_tag.sh) +$(hack/libsubid_tag.sh) exclude_graphdriver_devicemapper" %if 0%{?rhel} && 0%{?rhel} <= 8 BUILDTAGS="$BUILDTAGS containers_image_openpgp" @@ -222,6 +224,11 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Mon Dec 23 2024 Bradley G Smith - 0:1.32.0-1 +- Bump to v1.32.0 +- Add -Wl,-z,undefs linker flags to resolve https://github.com/cri-o/cri-o/issues/8860 +- Update BUILDTAGS to conform to upstream + * Thu Oct 24 2024 Dennis Gilmore - 0:1.31.1-1 - update to 1.31.1 diff --git a/sources b/sources index 6359e0a..9249c0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cri-o-1.31.1.tar.gz) = ebf83bf90d792ced458bbc321be14aa871ba5efcef212cf4777388916c5f35f9149aa65abf07c07de86834bbc23ac30035b2bff8cca74aac875c41b10ba76def +SHA512 (cri-o-1.32.0.tar.gz) = 800091f74a3176edfee207cdb85b207913d9433d3d6fa5f5ba971d026fd5d5a5daaee646cb8f983bceea5c4f75cb75a0093ae835b77cca2567de00819d400f96 From dc89cebb475dd545b48d85763ea116e75574587d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 14:50:18 +0000 Subject: [PATCH 199/202] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index a913baf..95bffe8 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Version: 1.32.0 Name: cri-o Epoch: 0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -224,6 +224,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0:1.32.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Dec 23 2024 Bradley G Smith - 0:1.32.0-1 - Bump to v1.32.0 - Add -Wl,-z,undefs linker flags to resolve https://github.com/cri-o/cri-o/issues/8860 From 3d7a891f95a356d1551db664cbe3b816c3a5b10d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:49:04 +0000 Subject: [PATCH 200/202] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index 95bffe8..e7e13ac 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Version: 1.32.0 Name: cri-o Epoch: 0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -224,6 +224,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0:1.32.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 0:1.32.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3850bfc863206c9024a61d01b2f354cb6f15be47 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 14:26:48 -0500 Subject: [PATCH 201/202] Rebuild for golang-1.25.0 --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index e7e13ac..c749244 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Version: 1.32.0 Name: cri-o Epoch: 0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -224,6 +224,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Fri Aug 15 2025 Maxwell G - 0:1.32.0-4 +- Rebuild for golang-1.25.0 + * Wed Jul 23 2025 Fedora Release Engineering - 0:1.32.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 87d92a0ec4698be20464d7c5051af9e7b286a79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 13:11:13 +0200 Subject: [PATCH 202/202] rebuild --- cri-o.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cri-o.spec b/cri-o.spec index c749244..6f0a55b 100644 --- a/cri-o.spec +++ b/cri-o.spec @@ -30,7 +30,7 @@ Version: 1.32.0 Name: cri-o Epoch: 0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open Container Initiative-based implementation of Kubernetes Container Runtime Interface # Upstream license specification: Apache-2.0 @@ -224,6 +224,9 @@ sed -i -e 's/,metacopy=on//g' /etc/containers/storage.conf %endif %changelog +* Fri Oct 10 2025 Alejandro Sáez - 0:1.32.0-5 +- rebuild + * Fri Aug 15 2025 Maxwell G - 0:1.32.0-4 - Rebuild for golang-1.25.0