Hello community, here is the log from the commit of package rook for openSUSE:Factory checked in at 2019-09-27 14:45:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rook (Old) and /work/SRC/openSUSE:Factory/.rook.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rook" Fri Sep 27 14:45:26 2019 rev:7 rq:733524 version:1.1.1+git0.g9a2641a6 Changes: -------- --- /work/SRC/openSUSE:Factory/rook/rook.changes 2019-09-19 15:51:00.331291309 +0200 +++ /work/SRC/openSUSE:Factory/.rook.new.2352/rook.changes 2019-09-27 14:45:34.229213780 +0200 @@ -0,0 +1,61 @@ +------------------------------------------------------------------------------- +Thu Sep 26 22:33:02 UTC 2019 - Blaine Gardner <[email protected]> + +- Fix 2 improper RPM spec variable references in specfile + +------------------------------------------------------------------------------- +Wed Sep 25 21:27:40 UTC 2019 - Blaine Gardner <[email protected]> + +- Use lightweight git tags when determining Rook version from source in tarball script (bsc#1151909) + + Build should now be tagged appropriately as version 1.1.1.0 instead of 1.1.0.x +- Override some Rook defaults with linker flags at build time: + + CSI image -> SUSE image + + FlexVolume dir (for Kubic) +- Add patches for: + + updating CSI image to a dummy value later changed at linker time + + updating CSI template paths to the ones installed by rook-k8s-manifests + + update the FlexVolume dir path to be compatible with Kubic +- Remove previously applied SUSE-specific changes that are now taken care of by the above patches + +- Add patch: csi-dummy-images.patch +- Add patch: csi-template-paths.patch +- Add patch: flexvolume-dir.patch + +------------------------------------------------------------------- +Wed Sep 25 15:30:40 UTC 2019 - Kristoffer Gronlund <[email protected]> + +- rook-k8s-yaml: Fix YAML indentation of cephcsi image value (bsc#1152008) + +------------------------------------------------------------------------------- +Wed Sep 25 00:27:20 UTC 2019 - Blaine Gardner <[email protected]> + +- Update Rook to match upstream version v1.1.1 (bsc#1151909) + + Disable the flex driver by default in new clusters + + MDB controller to use namespace for checking ceph status + + CSI liveness container socket file + + Add list of unusable directories paths + + Remove helm incompatible chars from values.yaml + + Fail NFS-ganesha if CephFS is not configured + + Make lifecycle hook chown less verbose for OSDs + + Configure LVM settings for rhel8 base image + + Make kubelet path configurable in operator for csi (#392 + + OSD pods should always use hostname for node selector + + Deactivate device from lvm when OSD pods are shutting down + + Add CephNFS to OLM's CSV + + Tolerations for drain detection canaries + + Enable ceph-volume debug logs + + Add documentation for CSI upgrades from v1.0 (#386 + + Add a new skipUpgradeChecks property to allow forcing upgrades + + Include CSI image in helm chart values (#385 + + Use HTTP port if SSL is disabled + + Enable SSL for dashboard by default + + Enable msgr2 properly during upgrades + + Nautilus v14.2.4 is the default Ceph image + + Ensure the ceph-csi secret exists on upgrade + + Disable the min PG warning if the pg_autoscaler is enabled + + Disable the warning for bluestore warn on legacy statfs +- add SUSE-specific changes to manifests: + + uncomment ROOK_CSI_CEPH_IMAGE var + + set FlexVolume dir path for Kubic + + add ROOK_CSI_*_TEMPLATE_PATH configs + @@ -4 +65 @@ -- rook-k8s-yaml: Revert to buildrequire for ceph +- rook-k8s-yaml: Revert to buildrequire for ceph (bsc#1151479) @@ -11 +72 @@ -- Update Rook to tag 'v1.1.0' +- Update Rook to tag 'v1.1.0' (bsc#1151479) Old: ---- rook-1.1.0+git0.g2f9db0e1-vendor.tar.xz rook-1.1.0+git0.g2f9db0e1.tar.xz New: ---- csi-dummy-images.patch csi-template-paths.patch flexvolume-dir.patch rook-1.1.1+git0.g9a2641a6-vendor.tar.xz rook-1.1.1+git0.g9a2641a6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rook.spec ++++++ --- /var/tmp/diff_new_pack.U3oWxu/_old 2019-09-27 14:45:34.929211960 +0200 +++ /var/tmp/diff_new_pack.U3oWxu/_new 2019-09-27 14:45:34.933211950 +0200 @@ -17,7 +17,7 @@ Name: rook -Version: 1.1.0+git0.g2f9db0e1 +Version: 1.1.1+git0.g9a2641a6 Release: 0 Summary: Orchestrator for distributed storage systems in cloud-native environments License: Apache-2.0 @@ -28,6 +28,19 @@ Source1: %{name}-%{version}-vendor.tar.xz Source98: README Source99: update-tarball.sh + +# When possible, a patch is preferred over link-time overrides because the patch will fail if the +# 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 dummy value that needs to be replaced at link time. Use dummy patch so that +# upstream changes will cause build failures if there are updates maintainers miss manually. +Patch0: csi-dummy-images.patch +# Change CSI template paths to match those installed by rook-k8s-manifests +Patch1: csi-template-paths.patch +# Change the default FlexVolume dir path to support Kubic. +Patch2: flexvolume-dir.patch + %if 0%{?suse_version} # _insert_obs_source_lines_here ExclusiveArch: x86_64 aarch64 ppc64 ppc64le @@ -118,12 +131,34 @@ %setup -q -n %{name} %setup -q -n %{name} -T -D -b 1 # unpack Source1, don't delete what was unpacked before +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +# determine image names to use in manifests depending on the base os type +# %CEPH_VERSION% is replaced at build time by the _service +%global rook_container_version 1.1.1.0 # this is udpated by update-tarball.sh +%if 0%{?is_opensuse} +%global rook_image registry.opensuse.org/opensuse/rook/ceph:%{rook_container_version} +%global ceph_image registry.opensuse.org/opensuse/ceph/ceph:%CEPH_VERSION% +%global ceph_csi_image registry.opensuse.org/opensuse/cephcsi/cephcsi:%CSI_VERSION%.%CSI_OFFSET% +%else # is SES +%global rook_image registry.suse.com/ses/6/rook/ceph:%{rook_container_version} +%global ceph_image registry.suse.com/ses/6/ceph/ceph:%CEPH_VERSION% +%global ceph_csi_image registry.suse.com/ses/6/cephcsi/cephcsi:%CSI_VERSION%.%CSI_OFFSET% +%endif + %build #we need to remove unsupported by Rook symbols from version version_parsed=%{version} -linker_flags=("-X" "github.com/rook/rook/pkg/version.Version=${version_parsed//[+]/-}") +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 + "-X" "github.com/rook/rook/pkg/operator/ceph/csi.DefaultCSIPluginImage=%{ceph_csi_image}" \ +) build_flags=("-ldflags" "${linker_flags[*]}") %goprep github.com/rook/rook @@ -173,35 +208,21 @@ ################################################################################ # Update manifests with images coming from Build Service ################################################################################ -rook_container_version='1.1.0.0' # this is udpated by update-tarball.sh - -# determine image names to use in manifests depending on the base os type -# %CEPH_VERSION% is replaced at build time by the _service -%if 0%{?is_opensuse} -rook_image=registry.opensuse.org/opensuse/rook/ceph:${rook_container_version} -ceph_image=registry.opensuse.org/opensuse/ceph/ceph:%CEPH_VERSION% -ceph_csi_image=registry.opensuse.org/opensuse/cephcsi/cephcsi:%CSI_VERSION%.%CSI_OFFSET% -%else # is SES -rook_image=registry.suse.com/ses/6/rook/ceph:${rook_container_version} -ceph_image=registry.suse.com/ses/6/ceph/ceph:%CEPH_VERSION% -ceph_csi_image=registry.suse.com/ses/6/cephcsi/cephcsi:%CSI_VERSION%.%CSI_OFFSET% -%endif - # set rook, ceph and ceph-csi container versions -sed -i -e "s|image: .*|image: ${rook_image}|g" %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/operator* -sed -i -e "s|\".*/cephcsi/cephcsi:.*|\"${ceph_csi_image}\"|g" %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/operator* -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/operator* +sed -i -e "s|\".*/cephcsi/cephcsi:.*|\"%{ceph_csi_image}\"|g" %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/operator* +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|/usr/local/bin/toolbox.sh|%{_bindir}/toolbox.sh|g" %{buildroot}%{_datadir}/k8s-yaml/rook/ceph/toolbox* # For the integration test tooling, store files with the current Rook and Ceph image names # These files can be cat'ed to get these without needing to do special processing %define rook_integration_dir %{buildroot}%{_datadir}/rook-integration mkdir -p %{rook_integration_dir} -echo -n ${rook_image} > %{rook_integration_dir}/rook-image-name -echo -n ${ceph_image} > %{rook_integration_dir}/ceph-image-name -echo -n ${ceph_csi_image} > %{rook_integration_dir}/ceph-csi-image-name -ls %{rook_integration_dir} +echo -n %{rook_image} > %{rook_integration_dir}/rook-image-name +echo -n %{ceph_image} > %{rook_integration_dir}/ceph-image-name +echo -n %{ceph_csi_image} > %{rook_integration_dir}/ceph-csi-image-name +for f in %{rook_integration_dir}/*; do cat "$f"; done ################################################################################ # Specify which files we built belong to each package ++++++ csi-dummy-images.patch ++++++ diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 44f07f7e..bfdcd409 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -72,7 +72,7 @@ const ( provDeploymentSuppVersion = "14" // image names - DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v1.2.0" + DefaultCSIPluginImage = "dummy-value-that-should-be-replaced-at-link-time" DefaultRegistrarImage = "quay.io/k8scsi/csi-node-driver-registrar:v1.1.0" DefaultProvisionerImage = "quay.io/k8scsi/csi-provisioner:v1.3.0" DefaultAttacherImage = "quay.io/k8scsi/csi-attacher:v1.2.0" ++++++ csi-template-paths.patch ++++++ diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 44f07f7e..9bad585d 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -82,15 +82,15 @@ const ( DefaultKubeletDirPath = "/var/lib/kubelet" // template - DefaultRBDPluginTemplatePath = "/etc/ceph-csi/rbd/csi-rbdplugin.yaml" - DefaultRBDProvisionerSTSTemplatePath = "/etc/ceph-csi/rbd/csi-rbdplugin-provisioner-sts.yaml" - DefaultRBDProvisionerDepTemplatePath = "/etc/ceph-csi/rbd/csi-rbdplugin-provisioner-dep.yaml" - DefaultRBDPluginServiceTemplatePath = "/etc/ceph-csi/rbd/csi-rbdplugin-svc.yaml" - - DefaultCephFSPluginTemplatePath = "/etc/ceph-csi/cephfs/csi-cephfsplugin.yaml" - DefaultCephFSProvisionerSTSTemplatePath = "/etc/ceph-csi/cephfs/csi-cephfsplugin-provisioner-sts.yaml" - DefaultCephFSProvisionerDepTemplatePath = "/etc/ceph-csi/cephfs/csi-cephfsplugin-provisioner-dep.yaml" - DefaultCephFSPluginServiceTemplatePath = "/etc/ceph-csi/cephfs/csi-cephfsplugin-svc.yaml" + DefaultRBDPluginTemplatePath = "/usr/share/k8s-yaml/rook/ceph/csi/template/rbd/csi-rbdplugin.yaml" + DefaultRBDProvisionerSTSTemplatePath = "/usr/share/k8s-yaml/rook/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml" + DefaultRBDProvisionerDepTemplatePath = "/usr/share/k8s-yaml/rook/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml" + DefaultRBDPluginServiceTemplatePath = "/usr/share/k8s-yaml/rook/ceph/csi/template/rbd/csi-rbdplugin-svc.yaml" + + DefaultCephFSPluginTemplatePath = "/usr/share/k8s-yaml/rook/ceph/csi/template/cephfs/csi-cephfsplugin.yaml" + DefaultCephFSProvisionerSTSTemplatePath = "/usr/share/k8s-yaml/rook/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-sts.yaml" + DefaultCephFSProvisionerDepTemplatePath = "/usr/share/k8s-yaml/rook/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml" + DefaultCephFSPluginServiceTemplatePath = "/usr/share/k8s-yaml/rook/ceph/csi/template/cephfs/csi-cephfsplugin-svc.yaml" ) func CSIEnabled() bool { ++++++ flexvolume-dir.patch ++++++ diff --git a/pkg/operator/ceph/agent/agent.go b/pkg/operator/ceph/agent/agent.go index 7f7c9e14..4278b951 100644 --- a/pkg/operator/ceph/agent/agent.go +++ b/pkg/operator/ceph/agent/agent.go @@ -38,7 +38,7 @@ const ( flexvolumePathDirEnv = "FLEXVOLUME_DIR_PATH" libModulesPathDirEnv = "LIB_MODULES_DIR_PATH" agentMountsEnv = "AGENT_MOUNTS" - flexvolumeDefaultDirPath = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/" + flexvolumeDefaultDirPath = "/var/lib/kubelet/volumeplugins" agentDaemonsetTolerationEnv = "AGENT_TOLERATION" agentDaemonsetTolerationKeyEnv = "AGENT_TOLERATION_KEY" agentDaemonsetTolerationsEnv = "AGENT_TOLERATIONS" ++++++ rook-1.1.0+git0.g2f9db0e1-vendor.tar.xz -> rook-1.1.1+git0.g9a2641a6-vendor.tar.xz ++++++ ++++++ rook-1.1.0+git0.g2f9db0e1-vendor.tar.xz -> rook-1.1.1+git0.g9a2641a6.tar.xz ++++++ /work/SRC/openSUSE:Factory/rook/rook-1.1.0+git0.g2f9db0e1-vendor.tar.xz /work/SRC/openSUSE:Factory/.rook.new.2352/rook-1.1.1+git0.g9a2641a6.tar.xz differ: char 25, line 1 ++++++ update-tarball.sh ++++++ --- /var/tmp/diff_new_pack.U3oWxu/_old 2019-09-27 14:45:37.333205708 +0200 +++ /var/tmp/diff_new_pack.U3oWxu/_new 2019-09-27 14:45:37.333205708 +0200 @@ -40,7 +40,7 @@ trap on_err ERR ROOK_REPO="github.com/SUSE/rook" -ROOK_REV="v1.1.0" +ROOK_REV="v1.1.1" cat <<EOF tar-ing Rook $ROOK_REPO at revision '$ROOK_REV' @@ -60,15 +60,16 @@ git checkout "$ROOK_REV" # e.g, DESCRIBE=v1.1.0-0-g56789def OR DESCRIBE=v1.1.0-beta.1-0-g12345abc -describe="$(git describe --long)" +describe="$(git describe --long --tags)" GIT_COMMIT=${describe##*-} # git commit hash is last hyphen-delimited field remainder=${describe%-*} # strip off the git commit field & continue GIT_COMMIT_NUM=${remainder##*-} # num of commits after tag is second-to-last hyphen-delimited field RELEASE=${remainder%-*} # all content before git commit num is the release version tag RELEASE=${RELEASE//-/'~'} # support upstream beta tags: replace hyphen with tilde +RELEASE=${RELEASE:1} # remove preceding 'v' from beginning of release # strip off preceding 'v' from RELEASE -VERSION="${RELEASE:1}+git$GIT_COMMIT_NUM.$GIT_COMMIT" +VERSION="${RELEASE}+git$GIT_COMMIT_NUM.$GIT_COMMIT" # make primary source tarball before changing anything in the repo cd $PKG_DIR @@ -86,6 +87,6 @@ # update spec file versions sed -i "s/^Version:.*/Version: $VERSION/" rook.spec -sed -i "s/^rook_container_version=.*/rook_container_version='${RELEASE:1}.$GIT_COMMIT_NUM' # this is udpated by update-tarball.sh/" 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 echo "Finished successfully!"
