Hello community, here is the log from the commit of package ceph-csi for openSUSE:Factory checked in at 2020-10-08 13:11:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ceph-csi (Old) and /work/SRC/openSUSE:Factory/.ceph-csi.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ceph-csi" Thu Oct 8 13:11:35 2020 rev:9 rq:839810 version:3.1.1+git0.22b631e99 Changes: -------- --- /work/SRC/openSUSE:Factory/ceph-csi/ceph-csi.changes 2020-09-25 16:28:32.395731213 +0200 +++ /work/SRC/openSUSE:Factory/.ceph-csi.new.4249/ceph-csi.changes 2020-10-08 13:12:25.835185818 +0200 @@ -1,0 +2,30 @@ +Fri Oct 2 01:38:50 UTC 2020 - Mike Latimer <mlati...@suse.com> + +- update to 3.1.1 + * Bail out from node expansion if its block mode pvc + * Use common logging for rbd + * Add Upgrade E2E testing from 3.0.0 to 3.1.0 + * Update Sidecars to the latest version + * Update go-ceph to v0.5.0 + * Implement rbd.updateVolWithImageInfo() with go-ceph + * Add support for snapshot retention + * Add support for "snapshot-autoprotect" feature + * CephFS: Check error output contains Error: ENOENT + * CephFS: Fix lock release in volumeDelete + * CephFS: Trim spaces around fuseMountOptions + * CephFS: Check ENOTEMPTY when removing subvolume + * RBD: Fix cleanup in case of clone failure + * RBD: Use stagingTargetPath in NodeExpandVolume RPC + * RBD: Allow readonly only for volume with contentsource + * RBD: Rados namespaced image deletion fix + +------------------------------------------------------------------- +Fri Oct 2 01:05:12 UTC 2020 - Mike Latimer <mlati...@suse.com> + +- Package ceph-csi-cephfs and ceph-csi-rbd helm charts into a new + RPM package for later use in publishing process + * Add BuildRequires for CSI sidecars + * Add csi-images-SUSE.patch to set CSI sidecar versions + * New RPM: ceph-csi-helm-charts.rpm + +------------------------------------------------------------------- Old: ---- ceph-csi-3.1.0+git0.5d4847358.obscpio ceph-csi-3.1.0+git0.5d4847358.tar.gz New: ---- ceph-csi-3.1.1+git0.22b631e99.obscpio ceph-csi-3.1.1+git0.22b631e99.tar.gz csi-images-SUSE.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ceph-csi.spec ++++++ --- /var/tmp/diff_new_pack.XeKW5X/_old 2020-10-08 13:12:27.475187303 +0200 +++ /var/tmp/diff_new_pack.XeKW5X/_new 2020-10-08 13:12:27.483187310 +0200 @@ -20,16 +20,20 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: ceph-csi -Version: 3.1.0+git0.5d4847358 +Version: 3.1.1+git0.22b631e99 Release: 0 Summary: Container Storage Interface driver for Ceph block and file License: Apache-2.0 +Group: System/Management URL: https://github.com/ceph/ceph-csi Source0: %{name}-%{version}.tar.gz 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 @@ -43,6 +47,13 @@ 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 @@ -55,6 +66,17 @@ See https://github.com/ceph/ceph-csi for more information. ################################################################################ +# ceph-csi helm charts +################################################################################ +%package helm-charts +Summary: Ceph CSI helm charts +Group: System/Management +BuildArch: noarch + +%description helm-charts +Helm charts for CephFS and RBD access through ceph-csi. + +################################################################################ # The tasty, meaty build section ################################################################################ @@ -64,6 +86,24 @@ rm -rf vendor/ %setup -q -T -D -a 1 +%patch0 -p1 + +# Set chart registry source depending on the base os type +%if 0%{?is_opensuse} +%define registry registry.opensuse.org/opensuse +%else # is SES +%if 0%{?sle_version} >= 150200 +%define registry registry.suse.com/ses/7 +%else +%define registry registry.suse.com/ses/6 +%endif +%endif + +%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} + %build # version format is defined in _service @@ -84,6 +124,31 @@ install --mode=755 --directory %{buildroot}%{_bindir} install --preserve-timestamps --mode=755 --target-directory=%{buildroot}%{_bindir} _output/cephcsi +# Set versions for helm charts +helm_appVersion=`echo %{version} | cut -d '+' -f 1` +helm_version="${helm_appVersion}_%{RELEASE}" + +# 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} +cp -pr charts/ceph-csi-cephfs/* %{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-cephfs +cp -pr charts/ceph-csi-rbd/* %{buildroot}%{_datadir}/%{name}-helm-charts/ceph-csi-rbd + +# 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} +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} +sed -i -e "s|\(version: \).*|\1${helm_version}|" %{rbd_chart_yaml} + +# Set CSI version at build time from helm_appVersion (same as version_parsed) +sed -i -e "s|\%CSI_VERSION\%|${helm_appVersion}|" %{cephfs_values_yaml} +sed -i -e "s|\%CSI_VERSION\%|${helm_appVersion}|" %{rbd_values_yaml} + ################################################################################ # Specify which files we built belong to each package ################################################################################ @@ -92,6 +157,12 @@ %defattr(-,root,root,-) %{_bindir}/cephcsi +%files helm-charts +%defattr(-,root,root,-) +%doc %{_datadir}/%{name}-helm-charts/ceph-csi-cephfs/README.md +%doc %{_datadir}/%{name}-helm-charts/ceph-csi-rbd/README.md +%{_datadir}/%{name}-helm-charts + ################################################################################ # Finalize ################################################################################ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.XeKW5X/_old 2020-10-08 13:12:27.527187350 +0200 +++ /var/tmp/diff_new_pack.XeKW5X/_new 2020-10-08 13:12:27.531187353 +0200 @@ -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.0</param> + <param name="revision">v3.1.1</param> </service> <service name="tar" mode="disabled"/> <service name="recompress" mode="disabled"> @@ -18,4 +18,35 @@ </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.0+git0.5d4847358.obscpio -> ceph-csi-3.1.1+git0.22b631e99.obscpio ++++++ /work/SRC/openSUSE:Factory/ceph-csi/ceph-csi-3.1.0+git0.5d4847358.obscpio /work/SRC/openSUSE:Factory/.ceph-csi.new.4249/ceph-csi-3.1.1+git0.22b631e99.obscpio differ: char 49, line 1 ++++++ ceph-csi-3.1.0+git0.5d4847358.tar.gz -> ceph-csi-3.1.1+git0.22b631e99.tar.gz ++++++ /work/SRC/openSUSE:Factory/ceph-csi/ceph-csi-3.1.0+git0.5d4847358.tar.gz /work/SRC/openSUSE:Factory/.ceph-csi.new.4249/ceph-csi-3.1.1+git0.22b631e99.tar.gz differ: char 12, line 1 ++++++ ceph-csi.obsinfo ++++++ --- /var/tmp/diff_new_pack.XeKW5X/_old 2020-10-08 13:12:27.619187433 +0200 +++ /var/tmp/diff_new_pack.XeKW5X/_new 2020-10-08 13:12:27.623187437 +0200 @@ -1,5 +1,5 @@ name: ceph-csi -version: 3.1.0+git0.5d4847358 -mtime: 1597332891 -commit: 5d48473582a31c21d9080d1d824db97ebf4a7a80 +version: 3.1.1+git0.22b631e99 +mtime: 1601364375 +commit: 22b631e991c5309e117f1b99f49d1163aa5c8744 ++++++ csi-images-SUSE.patch ++++++ Index: ceph-csi-3.1.0+git0.5d4847358/charts/ceph-csi-cephfs/values.yaml =================================================================== --- ceph-csi-3.1.0+git0.5d4847358.orig/charts/ceph-csi-cephfs/values.yaml +++ ceph-csi-3.1.0+git0.5d4847358/charts/ceph-csi-cephfs/values.yaml @@ -67,15 +67,15 @@ nodeplugin: registrar: image: - repository: quay.io/k8scsi/csi-node-driver-registrar - tag: v1.3.0 + repository: SUSE_REGISTRY/cephcsi/csi-node-driver-registrar + tag: v%CSI_REG_VERSION% pullPolicy: IfNotPresent resources: {} plugin: image: - repository: quay.io/cephcsi/cephcsi - tag: v3.1.1 + repository: SUSE_REGISTRY/cephcsi/cephcsi + tag: v%CSI_VERSION% pullPolicy: IfNotPresent resources: {} @@ -133,8 +133,8 @@ provisioner: provisioner: image: - repository: quay.io/k8scsi/csi-provisioner - tag: v1.6.0 + repository: SUSE_REGISTRY/cephcsi/csi-provisioner + tag: v%CSI_PROV_VERSION% pullPolicy: IfNotPresent resources: {} @@ -142,8 +142,8 @@ provisioner: name: attacher enabled: true image: - repository: quay.io/k8scsi/csi-attacher - tag: v2.1.1 + repository: SUSE_REGISTRY/cephcsi/csi-attacher + tag: v%CSI_ATTACH_VERSION% pullPolicy: IfNotPresent resources: {} @@ -151,15 +151,15 @@ provisioner: name: resizer enabled: true image: - repository: quay.io/k8scsi/csi-resizer - tag: v0.5.0 + repository: SUSE_REGISTRY/cephcsi/csi-resizer + tag: v%CSI_RESIZE_VERSION% pullPolicy: IfNotPresent resources: {} snapshotter: image: - repository: quay.io/k8scsi/csi-snapshotter - tag: v2.1.1 + repository: SUSE_REGISTRY/cephcsi/csi-snapshotter + tag: v%CSI_SNAP_VERSION% pullPolicy: IfNotPresent resources: {} Index: ceph-csi-3.1.0+git0.5d4847358/charts/ceph-csi-rbd/values.yaml =================================================================== --- ceph-csi-3.1.0+git0.5d4847358.orig/charts/ceph-csi-rbd/values.yaml +++ ceph-csi-3.1.0+git0.5d4847358/charts/ceph-csi-rbd/values.yaml @@ -79,15 +79,15 @@ nodeplugin: registrar: image: - repository: quay.io/k8scsi/csi-node-driver-registrar - tag: v1.3.0 + repository: SUSE_REGISTRY/cephcsi/csi-node-driver-registrar + tag: v%CSI_REG_VERSION% pullPolicy: IfNotPresent resources: {} plugin: image: - repository: quay.io/cephcsi/cephcsi - tag: v3.1.1 + repository: SUSE_REGISTRY/cephcsi/cephcsi + tag: v%CSI_VERSION% pullPolicy: IfNotPresent resources: {} @@ -152,8 +152,8 @@ provisioner: provisioner: image: - repository: quay.io/k8scsi/csi-provisioner - tag: v1.6.0 + repository: SUSE_REGISTRY/cephcsi/csi-provisioner + tag: v%CSI_PROV_VERSION% pullPolicy: IfNotPresent resources: {} @@ -161,8 +161,8 @@ provisioner: name: attacher enabled: true image: - repository: quay.io/k8scsi/csi-attacher - tag: v2.1.1 + repository: SUSE_REGISTRY/cephcsi/csi-attacher + tag: v%CSI_ATTACH_VERSION% pullPolicy: IfNotPresent resources: {} @@ -170,15 +170,15 @@ provisioner: name: resizer enabled: true image: - repository: quay.io/k8scsi/csi-resizer - tag: v0.5.0 + repository: SUSE_REGISTRY/cephcsi/csi-resizer + tag: v%CSI_RESIZE_VERSION% pullPolicy: IfNotPresent resources: {} snapshotter: image: - repository: quay.io/k8scsi/csi-snapshotter - tag: v2.1.0 + repository: SUSE_REGISTRY/cephcsi/csi-snapshotter + tag: v%CSI_SNAP_VERSION% pullPolicy: IfNotPresent resources: {} ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/ceph-csi/vendor.tar.gz /work/SRC/openSUSE:Factory/.ceph-csi.new.4249/vendor.tar.gz differ: char 5, line 1
