Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ceph-csi for openSUSE:Factory checked in at 2021-03-12 13:30:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ceph-csi (Old) and /work/SRC/openSUSE:Factory/.ceph-csi.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph-csi" Fri Mar 12 13:30:24 2021 rev:10 rq:878148 version:3.2.0+git0.997f9283f Changes: -------- --- /work/SRC/openSUSE:Factory/ceph-csi/ceph-csi.changes 2020-10-08 13:12:25.835185818 +0200 +++ /work/SRC/openSUSE:Factory/.ceph-csi.new.2401/ceph-csi.changes 2021-03-12 13:30:38.750100811 +0100 @@ -1,0 +2,51 @@ +Thu Mar 4 11:06:45 UTC 2021 - Stefan Haas <[email protected]> + +- Removed Patch use_attacher_v2.1.0.patch as we use upstream + version patterns now +- Removed Patch csi-images-SUSE.patch as we use upstream + version patterns now + +- Update to 3.2.0 + * Add new controller sidecar for omap regeneration + * Add support for map options in RBD Storageclass + * Add support for unmap options in RBD Storageclass + * Update Kubernetes sidecars to latest releases + * Update go-ceph to the latest release + * Implement ceph fs CLI calls with go-ceph + * Use libopenstorage/secrets API for Hashicorp Vault + * Use luks2 for RBD encryption + * Standardize error logs in CephFS + * Add pod anti-affinity for provisioner Deployment + * Make kubelet path configurable for the helm charts + * Make CSI log level configurable for the helm charts + +------------------------------------------------------------------- +Tue Nov 24 14:14:16 UTC 2020 - Mike Latimer <[email protected]> + +- Use csi-attacher sidecar version v2.1.0 in helm charts due to + build challenges with v2.1.1. (No loss of functionality with this + change.) + +------------------------------------------------------------------- +Wed Nov 18 02:53:20 UTC 2020 - Mike Latimer <[email protected]> + +- Use upstream default CSI and sidecar versions in the helm charts +- Add examples directory into cephfs and rbd helm charts + +------------------------------------------------------------------- +Mon Oct 26 23:09:28 UTC 2020 - Mike Latimer <[email protected]> + +- Update helm charts to use appropriate version prefix for the final + registry destination (e.g. registry.suse.com or registry.opensuse.org) + +------------------------------------------------------------------- +Mon Oct 19 22:42:53 UTC 2020 - Mike Latimer <[email protected]> + +- Add 'latest' and appVersion tags to helm charts + +------------------------------------------------------------------- +Tue Oct 6 21:00:02 UTC 2020 - Mike Latimer <[email protected]> + +- Minor fix to helm charts to ensure SemVer formatting + +------------------------------------------------------------------- Old: ---- ceph-csi-3.1.1+git0.22b631e99.obscpio ceph-csi-3.1.1+git0.22b631e99.tar.gz csi-images-SUSE.patch New: ---- ceph-csi-3.2.0+git0.997f9283f.obscpio ceph-csi-3.2.0+git0.997f9283f.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-csi.spec ++++++ --- /var/tmp/diff_new_pack.lLTTVM/_old 2021-03-12 13:30:40.526103302 +0100 +++ /var/tmp/diff_new_pack.lLTTVM/_new 2021-03-12 13:30:40.526103302 +0100 @@ -1,7 +1,7 @@ # # spec file for package ceph-csi # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: ceph-csi -Version: 3.1.1+git0.22b631e99 +Version: 3.2.0+git0.997f9283f Release: 0 Summary: Container Storage Interface driver for Ceph block and file License: Apache-2.0 @@ -31,12 +31,9 @@ Source1: vendor.tar.gz Source98: README -# Change CSI images to SUSE specific values. -Patch0: csi-images-SUSE.patch - %if 0%{?suse_version} # _insert_obs_source_lines_here -ExclusiveArch: x86_64 aarch64 ppc64 ppc64le +ExclusiveArch: x86_64 aarch64 %endif # Go and spec requirements @@ -47,13 +44,6 @@ BuildRequires: librados-devel BuildRequires: librbd-devel -# csi sidecars are needed to update versions in charts -BuildRequires: csi-external-attacher -BuildRequires: csi-external-provisioner -BuildRequires: csi-external-resizer -BuildRequires: csi-external-snapshotter -BuildRequires: csi-node-driver-registrar - # Rook runtime requirements - referenced from packages installed in Rook images # From Ceph base container: github.com/ceph/ceph-container/src/daemon-base/... Requires: pattern() = ceph_base @@ -77,7 +67,7 @@ Helm charts for CephFS and RBD access through ceph-csi. ################################################################################ -# The tasty, meaty build section +# Build section ################################################################################ %prep @@ -86,9 +76,7 @@ rm -rf vendor/ %setup -q -T -D -a 1 -%patch0 -p1 - -# Set chart registry source depending on the base os type +# Set registry source depending on the base os type %if 0%{?is_opensuse} %define registry registry.opensuse.org/opensuse %else # is SES @@ -101,8 +89,10 @@ %define cephfs_values_yaml "charts/ceph-csi-cephfs/values.yaml" %define rbd_values_yaml "charts/ceph-csi-rbd/values.yaml" -sed -i -e "s|\(.*\)SUSE_REGISTRY\(.*\)|\1%{registry}\2|" %{cephfs_values_yaml} -sed -i -e "s|\(.*\)SUSE_REGISTRY\(.*\)|\1%{registry}\2|" %{rbd_values_yaml} +for file in %{cephfs_values_yaml} %{rbd_values_yaml}; do +sed -i -e "s|\(.*\)quay.io.*\/\(.*\)|\1%{registry}/cephcsi/\2|" $file +sed -i -e "s|\(.*\)k8s.gcr.io.*\/\(.*\)|\1%{registry}/cephcsi/\2|" $file +done %build @@ -126,20 +116,27 @@ # Set versions for helm charts helm_appVersion=`echo %{version} | cut -d '+' -f 1` -helm_version="${helm_appVersion}_%{RELEASE}" +helm_version="${helm_appVersion}-%{RELEASE}" +# Set chart registry prefix for BuildTag +registry_prefix=%{registry} +registry_prefix=${registry_prefix#*/}/charts # Install the helm charts %define cephfs_chart_yaml "%{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-cephfs/Chart.yaml" %define cephfs_values_yaml "%{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-cephfs/values.yaml" %define rbd_chart_yaml "%{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-rbd/Chart.yaml" %define rbd_values_yaml "%{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-rbd/values.yaml" -mkdir -p %{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-{cephfs,rbd} +mkdir -p %{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-{cephfs,rbd}/examples cp -pr charts/ceph-csi-cephfs/* %{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-cephfs +cp -pr examples/cephfs/* %{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-cephfs/examples cp -pr charts/ceph-csi-rbd/* %{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-rbd +cp -pr examples/rbd/* %{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-rbd/examples # Set SUSE required values -sed -i -e "1 i\#!BuildTag: ceph-csi-cephfs:"${helm_version} %{cephfs_chart_yaml} -sed -i -e "1 i\#!BuildTag: ceph-csi-rbd:"${helm_version} %{rbd_chart_yaml} +for tag in latest ${helm_appVersion} ${helm_version}; do +sed -i -e "1 i\#!BuildTag: ${registry_prefix}/ceph-csi-cephfs:"${tag} %{cephfs_chart_yaml} +sed -i -e "1 i\#!BuildTag: ${registry_prefix}/ceph-csi-rbd:"${tag} %{rbd_chart_yaml} +done sed -i -e "s|\(appVersion: \).*|\1v${helm_appVersion}|" %{cephfs_chart_yaml} sed -i -e "s|\(appVersion: \).*|\1v${helm_appVersion}|" %{rbd_chart_yaml} sed -i -e "s|\(version: \).*|\1${helm_version}|" %{cephfs_chart_yaml} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.lLTTVM/_old 2021-03-12 13:30:40.570103364 +0100 +++ /var/tmp/diff_new_pack.lLTTVM/_new 2021-03-12 13:30:40.570103364 +0100 @@ -6,7 +6,7 @@ <!-- see https://github.com/openSUSE/obs-service-tar_scm/blob/master/tar_scm.service.in for hints --> <param name="versionformat">@PARENT_TAG@+git@TAG_OFFSET@.%h</param> <param name="versionrewrite-pattern">v(.*)</param> - <param name="revision">v3.1.1</param> + <param name="revision">v3.2.0</param> </service> <service name="tar" mode="disabled"/> <service name="recompress" mode="disabled"> @@ -18,35 +18,4 @@ </service> <service name="go_modules" mode="disabled"> </service> - <!-- SETUP VERSIONS FOR ALL SIDECARDS --> - <service name="replace_using_package_version" mode="buildtime"> - <param name="file">csi-images-SUSE.patch</param> - <param name="regex">%CSI_REG_VERSION%</param> - <param name="parse-version">patch</param> - <param name="package">csi-node-driver-registrar</param> - </service> - <service name="replace_using_package_version" mode="buildtime"> - <param name="file">csi-images-SUSE.patch</param> - <param name="regex">%CSI_PROV_VERSION%</param> - <param name="parse-version">patch</param> - <param name="package">csi-external-provisioner</param> - </service> - <service name="replace_using_package_version" mode="buildtime"> - <param name="file">csi-images-SUSE.patch</param> - <param name="regex">%CSI_SNAP_VERSION%</param> - <param name="parse-version">patch</param> - <param name="package">csi-external-snapshotter</param> - </service> - <service name="replace_using_package_version" mode="buildtime"> - <param name="file">csi-images-SUSE.patch</param> - <param name="regex">%CSI_ATTACH_VERSION%</param> - <param name="parse-version">patch</param> - <param name="package">csi-external-attacher</param> - </service> - <service name="replace_using_package_version" mode="buildtime"> - <param name="file">csi-images-SUSE.patch</param> - <param name="regex">%CSI_RESIZE_VERSION%</param> - <param name="parse-version">patch</param> - <param name="package">csi-external-resizer</param> - </service> </services> ++++++ ceph-csi-3.1.1+git0.22b631e99.obscpio -> ceph-csi-3.2.0+git0.997f9283f.obscpio ++++++ /work/SRC/openSUSE:Factory/ceph-csi/ceph-csi-3.1.1+git0.22b631e99.obscpio /work/SRC/openSUSE:Factory/.ceph-csi.new.2401/ceph-csi-3.2.0+git0.997f9283f.obscpio differ: char 49, line 1 ++++++ ceph-csi-3.1.1+git0.22b631e99.tar.gz -> ceph-csi-3.2.0+git0.997f9283f.tar.gz ++++++ /work/SRC/openSUSE:Factory/ceph-csi/ceph-csi-3.1.1+git0.22b631e99.tar.gz /work/SRC/openSUSE:Factory/.ceph-csi.new.2401/ceph-csi-3.2.0+git0.997f9283f.tar.gz differ: char 12, line 1 ++++++ ceph-csi.obsinfo ++++++ --- /var/tmp/diff_new_pack.lLTTVM/_old 2021-03-12 13:30:40.630103448 +0100 +++ /var/tmp/diff_new_pack.lLTTVM/_new 2021-03-12 13:30:40.630103448 +0100 @@ -1,5 +1,5 @@ name: ceph-csi -version: 3.1.1+git0.22b631e99 -mtime: 1601364375 -commit: 22b631e991c5309e117f1b99f49d1163aa5c8744 +version: 3.2.0+git0.997f9283f +mtime: 1607517591 +commit: 997f9283f312eb96871431900d5bab6c3dac2a71 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/ceph-csi/vendor.tar.gz /work/SRC/openSUSE:Factory/.ceph-csi.new.2401/vendor.tar.gz differ: char 5, line 1
