Hello community, here is the log from the commit of package rook for openSUSE:Factory checked in at 2020-10-08 13:11:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rook (Old) and /work/SRC/openSUSE:Factory/.rook.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rook" Thu Oct 8 13:11:32 2020 rev:20 rq:839809 version:1.4.5+git5.ge3c837f8 Changes: -------- --- /work/SRC/openSUSE:Factory/rook/rook.changes 2020-09-25 16:21:02.443332891 +0200 +++ /work/SRC/openSUSE:Factory/.rook.new.4249/rook.changes 2020-10-08 13:12:22.331182646 +0200 @@ -1,0 +2,38 @@ +Fri Oct 2 15:27:40 UTC 2020 - Mike Latimer <[email protected]> + +- Update to v1.4.5 + * Update the CSI driver to v3.1.1 (#6340) + * Fix drive group deployment failure (#6267) + * Fix OBC upgrade from 1.3 to 1.4 external cluster (#6353) + * Remove user unlink while deleting OBC (#6338) + * Enable RBAC in the helm chart for enabling monitoring (#6352) + * Disable encryption keyring parameter not necessary after + opening block (#6350) + * Improve reconcile performance in clusters with many OSDs on + PVCs (#6330) + * Only one external cluster secret supported in import script (#6343) + * Allow OSD PVC template name to be set to any value (#6307) + * OSD prepare job was failing due to low aio-max-nr setting (#6284) + * During upgrade assume a pod spec changed if diff checking fails (#6272) + * Merge config from rook-config-override configmap to the default global + config file (#6252) +- Package all sample yaml files in rook-k8s-yaml + +------------------------------------------------------------------- +Tue Sep 29 17:19:01 UTC 2020 - Mike Latimer <[email protected]> + +- Update helm chart version to match rook product version plus + the current release number + +------------------------------------------------------------------- +Tue Sep 29 05:07:16 UTC 2020 - Mike Latimer <[email protected]> + +- Update to v1.4.4 + * Upgrade to v1.4.3 for cluster-on-pvc hung due to changing label + selectors on the mons (#6256) + * Remove osd status configmap for nodes with long names (#6235) + * Allow running rgw daemons from an external cluster (#6226) +- Create symlinks in /usr/local/bin for toolbox.sh and rook to + ensure compatibility with upstream sample yamls + +------------------------------------------------------------------- @@ -139 +177 @@ -Wed May 27 09:57:20 UTC 2020 - Stefan Haas <[email protected]> +Wed May 27 10:54:07 UTC 2020 - Stefan Haas <[email protected]> @@ -158 +196 @@ -Wed Apr 22 10:32:40 UTC 2020 - Stefan Haas <[email protected]> +Wed Apr 22 10:40:36 UTC 2020 - Stefan Haas <[email protected]> @@ -162,0 +201 @@ +- Removed orchestrator-cli-rename.patch as it got merged @@ -172 +210,0 @@ -- Removed orchestrator-cli-rename.patch as it got merged @@ -175 +213 @@ -Tue Mar 31 14:02:05 UTC 2020 - Kristoffer Gronlund <[email protected]> +Tue Mar 31 14:07:50 UTC 2020 - Kristoffer Gronlund <[email protected]> @@ -188 +226 @@ -Wed Mar 18 14:27:07 UTC 2020 - Kristoffer Gronlund <[email protected]> +Wed Mar 18 14:32:31 UTC 2020 - Kristoffer Gronlund <[email protected]> @@ -204 +242 @@ -Thu Feb 20 12:36:38 UTC 2020 - Kristoffer Gronlund <[email protected]> +Thu Feb 20 12:48:04 UTC 2020 - Kristoffer Gronlund <[email protected]> @@ -209 +247 @@ -Tue Feb 18 11:08:04 UTC 2020 - Kristoffer Gronlund <[email protected]> +Tue Feb 18 11:12:33 UTC 2020 - Kristoffer Gronlund <[email protected]> @@ -221 +259 @@ -Mon Jan 27 14:04:35 UTC 2020 - Kristoffer Gronlund <[email protected]> +Fri Jan 31 09:55:19 UTC 2020 - Kristoffer Gronlund <[email protected]> @@ -226 +264 @@ -Mon Jan 27 13:52:34 UTC 2020 - Kristoffer Gronlund <[email protected]> +Mon Jan 27 13:56:36 UTC 2020 - Kristoffer Gronlund <[email protected]> @@ -247 +285 @@ -Wed Jan 8 14:33:13 UTC 2020 - Kristoffer Gronlund <[email protected]> +Wed Jan 8 14:51:22 UTC 2020 - Kristoffer Gronlund <[email protected]> @@ -257 +295 @@ -Fri Dec 20 18:22:58 UTC 2019 - Kristoffer Gronlund <[email protected]> +Fri Dec 20 18:23:58 UTC 2019 - Kristoffer Gronlund <[email protected]> Old: ---- rook-1.4.3+git18.g42e1675e.tar.gz New: ---- rook-1.4.5+git5.ge3c837f8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rook.spec ++++++ --- /var/tmp/diff_new_pack.VVzF3P/_old 2020-10-08 13:12:23.271183497 +0200 +++ /var/tmp/diff_new_pack.VVzF3P/_new 2020-10-08 13:12:23.271183497 +0200 @@ -17,7 +17,7 @@ Name: rook -Version: 1.4.3+git18.g42e1675e +Version: 1.4.5+git5.ge3c837f8 Release: 0 Summary: Orchestrator for distributed storage systems in cloud-native environments License: Apache-2.0 @@ -98,7 +98,7 @@ BuildRequires: ceph %description k8s-yaml -This package contains the yaml files required to deploy and run the +This package contains examples of yaml files required to deploy and run the Rook-Ceph operator and Ceph clusters in a Kubernetes cluster. ################################################################################ @@ -159,7 +159,7 @@ # determine image names to use in manifests depending on the base os type # %CEPH_VERSION%, and all CSI sidecar versions are replaced at build time by _service -%global rook_container_version 1.4.3.18 # this is updated by update-tarball.sh +%global rook_container_version 1.4.5.5 # this is updated by update-tarball.sh %if 0%{?is_opensuse} %define registry registry.opensuse.org/opensuse %else # is SES @@ -247,20 +247,16 @@ --target-directory="${install_location}" \ images/ceph/toolbox.sh -# Install selected yaml files to download and run the Rook operator and Ceph containers +# Install ALL sample yaml files mkdir -p %{buildroot}%{_datadir}/k8s-yaml/rook/ceph -install_yamls='ceph-client cluster cluster-on-pvc cluster-with-drive-groups common dashboard-external-http - dashboard-external-https dashboard-ingress-https dashboard-loadbalancer filesystem - filesystem-ec object-bucket-claim-delete object-bucket-claim-retain object-ec object-user - operator pool pool-ec rgw-external toolbox toolbox-job' -for file in ${install_yamls}; do - cp -pr cluster/examples/kubernetes/ceph/${file}.yaml %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/ -done +cp -pr cluster/examples/kubernetes/ceph/* %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/ # Include ceph/csi directory, but move templates to /etc cp -pr cluster/examples/kubernetes/ceph/csi %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/ mkdir -p %{buildroot}%{_sysconfdir}/ceph-csi mv %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/csi/template/* %{buildroot}%{_sysconfdir}/ceph-csi/ rmdir %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/csi/template +# Remove the flex directory as this is not supported at all +rm -rf %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/flex ################################################################################ # Check that linker flags are applied @@ -272,6 +268,7 @@ %global version_parsed "${version_noplus}-%{release}" # strip off everything following + for the helm appVersion %global helm_appVersion "${version_full%+*}" +%global helm_version "%{helm_appVersion}_%{RELEASE}" # Check Rook version is properly set rook_bin="$rook_bin_location"rook @@ -306,9 +303,10 @@ %define values_yaml "%{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator/values.yaml" mkdir -p %{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator cp -pr cluster/charts/rook-ceph/* %{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator -sed -i -e "1 i\#!BuildTag: rook-ceph:"%{version_parsed} %{chart_yaml} +sed -i -e "1 i\#!BuildTag: rook-ceph:"%{helm_version} %{chart_yaml} # appVersion should being with a 'v', even though the image tag currently does not sed -i -e "/apiVersion/a appVersion: v%{helm_appVersion}" %{chart_yaml} +sed -i -e "s|\(version: \).*|\1%{helm_version}|" %{chart_yaml} sed -i -e "s|\(.*tag: \)VERSION|\1%{helm_appVersion}|" %{values_yaml} # Install SUSE specific helm chart NOTES.txt cp %SOURCE97 %{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator/templates/NOTES.txt @@ -324,18 +322,24 @@ ################################################################################ # Specify which files we built belong to each package ################################################################################ -# rook-version-build.arch.rpm %files %defattr(-,root,root,-) %{_bindir}/rook %{_bindir}/toolbox.sh %config %{_sysconfdir}/ceph-csi +# Due to upstream's use of /usr/local/bin in their example yamls, create +# symlinks to avoid a difficult to find configuration problem +%post +[[ -e /usr/local/bin/toolbox.sh ]] || ln -s %{_bindir}/toolbox.sh /usr/local/bin/toolbox.sh +[[ -e /usr/local/bin/rook ]] || ln -s %{_bindir}/rook /usr/local/bin/rook + +%postun +[[ -e /usr/local/bin/toolbox.sh ]] && rm /usr/local/bin/toolbox.sh +[[ -e /usr/local/bin/rook ]] && rm /usr/local/bin/rook -# rook-rookflex-version-build.arch.rpm %files rookflex %{_bindir}/rookflex -# rook-k8s-yaml-version-build.arch.rpm %files k8s-yaml %dir %{_datarootdir}/k8s-yaml %dir %{_datarootdir}/k8s-yaml/rook @@ -346,7 +350,6 @@ %doc %{_datadir}/%{name}-ceph-helm-charts/operator/README.md %{_datadir}/%{name}-ceph-helm-charts -# rook-integration-version-build.arch.rpm %files integration # integration test binary %{_bindir}/rook-integration ++++++ csi-images-SUSE.patch ++++++ --- /var/tmp/diff_new_pack.VVzF3P/_old 2020-10-08 13:12:23.327183547 +0200 +++ /var/tmp/diff_new_pack.VVzF3P/_new 2020-10-08 13:12:23.331183551 +0200 @@ -6,7 +6,7 @@ // manually challenging. var ( // image names -- DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.1.0" +- DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.1.1" - DefaultRegistrarImage = "quay.io/k8scsi/csi-node-driver-registrar:v1.2.0" - DefaultProvisionerImage = "quay.io/k8scsi/csi-provisioner:v1.6.0" - DefaultAttacherImage = "quay.io/k8scsi/csi-attacher:v2.1.0" @@ -38,7 +38,7 @@ #rbdLivenessMetricsPort: 9080 #kubeletDirPath: /var/lib/kubelet #cephcsi: -- #image: quay.io/cephcsi/cephcsi:v3.1.0 +- #image: quay.io/cephcsi/cephcsi:v3.1.1 + #image: SUSE_REGISTRY/cephcsi/cephcsi:v%CSI_VERSION%.%CSI_OFFSET% #registrar: - #image: quay.io/k8scsi/csi-node-driver-registrar:v1.2.0 ++++++ rook-1.4.3+git18.g42e1675e.tar.gz -> rook-1.4.5+git5.ge3c837f8.tar.gz ++++++ /work/SRC/openSUSE:Factory/rook/rook-1.4.3+git18.g42e1675e.tar.gz /work/SRC/openSUSE:Factory/.rook.new.4249/rook-1.4.5+git5.ge3c837f8.tar.gz differ: char 14, line 1 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/rook/vendor.tar.gz /work/SRC/openSUSE:Factory/.rook.new.4249/vendor.tar.gz differ: char 5, line 1
