Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rook for openSUSE:Factory checked in
at 2021-03-08 15:15:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rook (Old)
and /work/SRC/openSUSE:Factory/.rook.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rook"
Mon Mar 8 15:15:20 2021 rev:21 rq:876713 version:1.5.7+git4.gae949004e
Changes:
--------
--- /work/SRC/openSUSE:Factory/rook/rook.changes 2020-10-08
13:12:22.331182646 +0200
+++ /work/SRC/openSUSE:Factory/.rook.new.2378/rook.changes 2021-03-08
15:16:58.885926574 +0100
@@ -1,0 +2,99 @@
+Wed Mar 3 15:27:27 UTC 2021 - Stefan Haas <stefan.h...@suse.com>
+
+- Update to v1.5.7
+ * Ceph
+ * CSI Troubleshooting Guide (#7157)
+ * Print device information in OSD prepare logs (#7194)
+ * Expose vault curl error in the OSD init container for KCS configurations
(#7193)
+ * Prevent re-using a device to configure an OSD on PVC from a previous
cluster (#7170)
+ * Remove crash collector if all Ceph pods moved off a node (#7160)
+ * Add helm annotation to keep CRDs in the helm chart during uninstall
(#7162)
+ * Bind mgr modules to all interfaces instead of pod ip (#7151)
+ * Check for orchestration cancellation while waiting for all OSDs to start
(#7112)
+ * Skip pdb reconcile on create and delete events (#7155)
+ * Silence harmless errors in log when the operator is still initializing
(#7056)
+ * Add --extra-create-metadata flag to the CSI driver (#7147)
+ * Add deviceClass to the object store schema (#7132)
+ * Simplify the log-collector container name (#7133)
+ * Skip csi detection if CSI is disabled (#6866)
+ * Remove Rook pods stuck in terminating state on a failed node (#6999)
+ * Timeout for rgw configuration to prevent stuck object store when no
healthy OSDs (#7075)
+ * Update lib bucket provisioner for OBCs (#7086)
+
+- Drop csi-images-SUSE.patch
+
+-------------------------------------------------------------------
+Wed Nov 18 01:47:48 UTC 2020 - Mike Latimer <mlati...@suse.com>
+
+- Derive CSI and sidecar image versions from code defaults rather
+ than images found in the build service
+
+-------------------------------------------------------------------
+Fri Nov 6 18:24:07 UTC 2020 - Mike Latimer <mlati...@suse.com>
+
+- Update to v1.4.7
+ * Ceph
+ * Log warning about v14.2.13 being an unsupported Ceph version due to
+ errors creating new OSDs (#6545)
+ * Disaster recovery guide for PVCs (#6452)
+ * Set the deviceClass for OSDs in non-PVC clusters (#6545)
+ * External cluster script to fail if prometheus port is not default (#6504)
+ * Remove the osd pvc from the osd purge job (#6533)
+ * External cluster script added additional checks for monitoring
+ endpoint (#6473)
+ * Ignore Ceph health error MDS_ALL_DOWN during reconciliation (#6494)
+ * Add optional labels to mon pods (#6515)
+ * Assert type for logging errors before using it (#6503)
+ * Check for orphaned mon resources with every reconcile (#6493)
+ * Update the mon PDBs if the maxUnavailable changed (#6469)
+ * NFS
+ * Update documentation and examples (#6455)
+
+-------------------------------------------------------------------
+Wed Oct 28 16:27:15 UTC 2020 - Mike Latimer <mlati...@suse.com>
+
+- Drop OFFSET from cephcsi image tag
+
+-------------------------------------------------------------------
+Mon Oct 26 20:33:31 UTC 2020 - Mike Latimer <mlati...@suse.com>
+
+- Update helm chart to use appropriate version prefix for the final registry
+ destination (e.g. registry.suse.com or registry.opensuse.org)
+- Improve consistency with image tags
+
+-------------------------------------------------------------------
+Tue Oct 20 00:00:54 UTC 2020 - Mike Latimer <mlati...@suse.com>
+
+- Update to v1.4.6
+ * Support IPv6 single-stack (#6283)
+ * Only start a single CSI provisioner in single-node test clusters (#6437)
+ * Raw mode OSD on LV-backed PVC (#6184)
+ * Capture ceph-volume detailed log in non-pvc scenario on failure (#6426)
+ * Add --upgrade option to external cluster script (#6392)
+ * Capture stderr when executing ceph commands and write to log (#6395)
+ * Reduce the retry count for the bucket health check for more accurate
+ status (#6408)
+ * Prevent closing of monitoring channel more than once (#6369)
+ * Check underlying block status for encrypted OSDs (#6367)
+- Add 'latest' and appVersion tags to helm chart
+- Include sample manifests in helm chart
+
+-------------------------------------------------------------------
+Fri Oct 9 16:08:41 UTC 2020 - Mike Latimer <mlati...@suse.com>
+
+- Set the helm chart version to the rook version
+
+-------------------------------------------------------------------
+Tue Oct 6 21:01:06 UTC 2020 - Mike Latimer <mlati...@suse.com>
+
+- Minor fix to helm chart to ensure SemVer formatting
+- Fix typo in sample cluster.yaml
+
+-------------------------------------------------------------------
+Tue Oct 6 06:43:15 UTC 2020 - Joshua Hesketh <jhesk...@suse.com>
+
+- Update the operator.yaml ConfigMap to reflect the default SUSE images
+ that are used rather than upstreams.
+- Fix indentation of patch tabs to match original
+
+-------------------------------------------------------------------
Old:
----
csi-images-SUSE.patch
rook-1.4.5+git5.ge3c837f8.tar.gz
New:
----
_constraints
rook-1.5.7+git4.gae949004e.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rook.spec ++++++
--- /var/tmp/diff_new_pack.HAhYTH/_old 2021-03-08 15:17:01.485928478 +0100
+++ /var/tmp/diff_new_pack.HAhYTH/_new 2021-03-08 15:17:01.485928478 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rook
#
-# 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
@@ -17,7 +17,7 @@
Name: rook
-Version: 1.4.5+git5.ge3c837f8
+Version: 1.5.7+git4.gae949004e
Release: 0
Summary: Orchestrator for distributed storage systems in cloud-native
environments
License: Apache-2.0
@@ -34,14 +34,12 @@
# upstream source is updated without the package maintainers knowing. Patches
reduce user error when
# creating a new SUSE release branch of Rook.
-# Change CSI images to SUSE specific values.
-Patch0: csi-images-SUSE.patch
# Change the default FlexVolume dir path to support Kubic.
-Patch1: flexvolume-dir.patch
+Patch0: flexvolume-dir.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
@@ -56,13 +54,6 @@
# Ceph version is needed to set correct container tag in manifests
BuildRequires: ceph
-# ceph-csi and sidecars are needed to update versions in manifest/chart
-BuildRequires: ceph-csi
-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 images/ceph/Dockerfile
@@ -143,7 +134,7 @@
[-test.run 'TestCeph'].
################################################################################
-# The tasty, meaty build section
+# Build section
################################################################################
%define _buildshell /bin/bash
@@ -155,11 +146,8 @@
tar zxf %{SOURCE1}
%patch0 -p1
-%patch1 -p1
-# 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.5.5 # this is updated by update-tarball.sh
+# Determine registry to use in manifests depending on the base os type
%if 0%{?is_opensuse}
%define registry registry.opensuse.org/opensuse
%else # is SES
@@ -170,23 +158,31 @@
%endif
%endif
+# Replace default registry and paths in all required files
%define spec_go pkg/operator/ceph/csi/spec.go
-%define chart_yaml cluster/charts/rook-ceph/Chart.yaml
%define values_yaml cluster/charts/rook-ceph/values.yaml
-sed -i -e "s|\(.*\)SUSE_REGISTRY\(.*\)|\1%{registry}\2|" %{spec_go}
-sed -i -e "s|\(.*\)SUSE_REGISTRY\(.*\)|\1%{registry}\2|" %{chart_yaml}
-sed -i -e "s|\(.*\)SUSE_REGISTRY\(.*\)|\1%{registry}\2|" %{values_yaml}
-
-%global rook_image
%{registry}/rook/ceph:%{rook_container_version}.%{release}
-%global ceph_image %{registry}/ceph/ceph:%CEPH_VERSION%
-%global ceph_csi_image
%{registry}/cephcsi/cephcsi:v%CSI_VERSION%.%CSI_OFFSET%
-%global csi_reg_image
%{registry}/cephcsi/csi-node-driver-registrar:v%CSI_REG_VERSION%
-%global csi_prov_image
%{registry}/cephcsi/csi-provisioner:v%CSI_PROV_VERSION%
-%global csi_attach_image %{registry}/cephcsi/csi-attacher:v%CSI_ATTACH_VERSION%
-%global csi_snap_image
%{registry}/cephcsi/csi-snapshotter:v%CSI_SNAP_VERSION%
-%global csi_resize_image %{registry}/cephcsi/csi-resizer:v%CSI_RESIZE_VERSION%
+%define operator_yaml cluster/examples/kubernetes/ceph/operator.yaml
+for file in %{spec_go} %{values_yaml} %{operator_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
+sed -i -e "s|\(.*\)repository: rook\(.*\)|\1repository: %{registry}/rook\2|"
%{values_yaml}
%build
+# Setup images and versions for use in linker flags
+%define spec_go pkg/operator/ceph/csi/spec.go
+ceph_csi_image=$(sed -ne "s|.*DefaultCSIPluginImage.*=
\"\(.*cephcsi:.*\)\"|\1|p" %{spec_go})
+csi_reg_image=$(sed -ne "s|.*DefaultRegistrarImage.*=
\"\(.*registrar:.*\)\"|\1|p" %{spec_go})
+csi_prov_image=$(sed -ne "s|.*DefaultProvisionerImage.*=
\"\(.*provisioner:.*\)\"|\1|p" %{spec_go})
+csi_attach_image=$(sed -ne "s|.*DefaultAttacherImage.*
\"\(.*attacher:.*\)\"|\1|p" %{spec_go})
+csi_snap_image=$(sed -ne "s|.*DefaultSnapshotterImage.*
\"\(.*snapshotter:.*\)\"|\1|p" %{spec_go})
+csi_resize_image=$(sed -ne "s|.*DefaultResizerImage.*
\"\(.*resizer:.*\)\"|\1|p" %{spec_go})
+# %CEPH_VERSION% is replaced at build time by _service
+# rook_container_version is updated by update-tarball.sh:
+%global rook_container_version 1.5.7
+%global rook_image %{registry}/rook/ceph:%{rook_container_version}
+%global ceph_image %{registry}/ceph/ceph:%CEPH_VERSION%
+%global ceph_csi_image $ceph_csi_image
# remove symbols unsupported by k8s (+) from version
version_full=%{version}
@@ -196,14 +192,12 @@
linker_flags=(
# Set Rook version - absolutely required
"-X" "github.com/rook/rook/pkg/version.Version=%{version_parsed}"
- # CSI images only known at build time, so use a linker flag instead of
patch
- # NOTE - This currently doesn't seem to work without also patching spec.go
- "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultCSIPluginImage=%{ceph_csi_image}"
- "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultRegistrarImage=%{csi_reg_image}"
- "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultProvisionerImage=%{csi_prov_image}"
- "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultAttacherImage=%{csi_attach_image}"
- "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultSnapshotterImage=%{csi_snap_image}"
- "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultResizerImage=%{csi_resize_image}"
+ "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultCSIPluginImage=${ceph_csi_image}"
+ "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultRegistrarImage=${csi_reg_image}"
+ "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultProvisionerImage=${csi_prov_image}"
+ "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultAttacherImage=${csi_attach_image}"
+ "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultSnapshotterImage=${csi_snap_image}"
+ "-X"
"github.com/rook/rook/pkg/operator/ceph/csi.DefaultResizerImage=${csi_resize_image}"
)
build_flags=("-ldflags" "${linker_flags[*]}" "-mod=vendor")
@@ -268,7 +262,10 @@
%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}"
+%global helm_version "%{helm_appVersion}-%{RELEASE}"
+# Set chart registry prefix for BuildTag
+registry_prefix=%{registry}
+registry_prefix=${registry_prefix#*/}/charts
# Check Rook version is properly set
rook_bin="$rook_bin_location"rook
@@ -294,8 +291,10 @@
################################################################################
# set rook, ceph and ceph-csi container versions
sed -i -e "s|image: .*|image: %{ceph_image}|g"
%{buildroot}%{_datadir}/k8s-yaml/rook/ceph/cluster*
-sed -i -e "s|image: .*|image: %{rook_image}|g"
%{buildroot}%{_datadir}/k8s-yaml/rook/ceph/toolbox*
+sed -i -e "s|image: .*|image: %{rook_image}|g"
%{buildroot}%{_datadir}/k8s-yaml/rook/ceph/direct-mount*
+sed -i -e "s|image: .*|image: %{rook_image}|g"
%{buildroot}%{_datadir}/k8s-yaml/rook/ceph/osd-purge*
sed -i -e "s|image: .*|image: %{rook_image}|g"
%{buildroot}%{_datadir}/k8s-yaml/rook/ceph/operator*
+sed -i -e "s|image: .*|image: %{rook_image}|g"
%{buildroot}%{_datadir}/k8s-yaml/rook/ceph/toolbox*
sed -i -e "s|/usr/local/bin/toolbox.sh|%{_bindir}/toolbox.sh|g"
%{buildroot}%{_datadir}/k8s-yaml/rook/ceph/toolbox*
# Install the helm charts
@@ -303,7 +302,13 @@
%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:"%{helm_version} %{chart_yaml}
+# Copy example manifests to chart directory
+mkdir %{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator/examples
+cp -pr %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/*
%{buildroot}%{_datadir}/%{name}-ceph-helm-charts/operator/examples
+# Registry tags should include "latest", appVersion and helm chart version
+for tag in latest %{helm_appVersion} %{helm_version}; do
+sed -i -e "1 i\#!BuildTag: ${registry_prefix}/rook-ceph:"${tag} %{chart_yaml}
+done
# 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}
++++++ _constraints ++++++
<constraints>
<hardware>
<disk>
<size unit="G">5</size>
</disk>
</hardware>
</constraints>
++++++ _service ++++++
--- /var/tmp/diff_new_pack.HAhYTH/_old 2021-03-08 15:17:01.573928543 +0100
+++ /var/tmp/diff_new_pack.HAhYTH/_new 2021-03-08 15:17:01.573928543 +0100
@@ -5,90 +5,6 @@
<param name="parse-version">patch_update</param>
<param name="package">ceph</param>
</service>
- <service name="replace_using_package_version" mode="buildtime">
- <param name="file">rook.spec</param>
- <param name="regex">%CSI_VERSION%</param>
- <param name="parse-version">patch</param>
- <param name="package">ceph-csi</param>
- </service>
- <service name="replace_using_package_version" mode="buildtime">
- <param name="file">rook.spec</param>
- <param name="regex">%CSI_OFFSET%</param>
- <param name="parse-version">offset</param>
- <param name="package">ceph-csi</param>
- </service>
- <service name="replace_using_package_version" mode="buildtime">
- <param name="file">csi-images-SUSE.patch</param>
- <param name="regex">%CSI_VERSION%</param>
- <param name="parse-version">patch</param>
- <param name="package">ceph-csi</param>
- </service>
- <service name="replace_using_package_version" mode="buildtime">
- <param name="file">csi-images-SUSE.patch</param>
- <param name="regex">%CSI_OFFSET%</param>
- <param name="parse-version">offset</param>
- <param name="package">ceph-csi</param>
- </service>
- <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">rook.spec</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">rook.spec</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">rook.spec</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">rook.spec</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>
- <service name="replace_using_package_version" mode="buildtime">
- <param name="file">rook.spec</param>
- <param name="regex">%CSI_RESIZE_VERSION%</param>
- <param name="parse-version">patch</param>
- <param name="package">csi-external-resizer</param>
- </service>
<service name="go_modules" mode="disabled">
<!-- <param name="compression">xz</param> -->
</service>
++++++ rook-1.4.5+git5.ge3c837f8.tar.gz -> rook-1.5.7+git4.gae949004e.tar.gz
++++++
/work/SRC/openSUSE:Factory/rook/rook-1.4.5+git5.ge3c837f8.tar.gz
/work/SRC/openSUSE:Factory/.rook.new.2378/rook-1.5.7+git4.gae949004e.tar.gz
differ: char 13, line 1
++++++ update-tarball.sh ++++++
--- /var/tmp/diff_new_pack.HAhYTH/_old 2021-03-08 15:17:01.609928569 +0100
+++ /var/tmp/diff_new_pack.HAhYTH/_new 2021-03-08 15:17:01.609928569 +0100
@@ -5,7 +5,7 @@
#ROOK_REPO="github.com/rook/rook"
#ROOK_REV="v1.4.0"
ROOK_REPO="github.com/SUSE/rook"
-ROOK_REV="suse-release-1.4"
+ROOK_REV="suse-release-1.5"
if ! command -V go;
then
@@ -79,9 +79,10 @@
# update spec file versions
#sed -i "s/^Version:.*/Version: $RELEASE/" rook.spec
sed -i "s/^Version:.*/Version: $VERSION/" rook.spec
-sed -i "s/^%global rook_container_version .*/%global rook_container_version
${RELEASE}.$GIT_COMMIT_NUM # this is updated by update-tarball.sh/" rook.spec
+sed -i "s/^%global rook_container_version .*/%global rook_container_version
${RELEASE}/" rook.spec
-# make vendor tarball
+# make vendor tarball (any existing rook directory must be removed first)
+[ -d ./rook ] && rm -rf ./rook
osc -A https://api.suse.de service disabledrun
echo "Finished successfully!"
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/rook/vendor.tar.gz
/work/SRC/openSUSE:Factory/.rook.new.2378/vendor.tar.gz differ: char 5, line 1
