Hello community, here is the log from the commit of package rook for openSUSE:Factory checked in at 2019-11-11 12:58:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rook (Old) and /work/SRC/openSUSE:Factory/.rook.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rook" Mon Nov 11 12:58:53 2019 rev:9 rq:746144 version:1.1.6+git0.g91d6f635 Changes: -------- --- /work/SRC/openSUSE:Factory/rook/rook.changes 2019-10-05 16:19:34.937550172 +0200 +++ /work/SRC/openSUSE:Factory/.rook.new.2990/rook.changes 2019-11-11 12:58:57.005598802 +0100 @@ -1,0 +2,50 @@ +Wed Nov 6 09:11:01 UTC 2019 - Kristoffer Gronlund <[email protected]> + +- Update rook to v1.1.6: + * Flex driver should not allow attach before detach on a different node (#3582) + * Properly set the ceph-mgr annotations (#4195) + * Only trigger an orchestration if the cluster CR changed (#4252) + * Fix setting rbdGrpcMetricsPort in the helm chart (#4202) + * Document all helm chart settings (#4202) + * Support all layers of CRUSH map with node labels (#4236) + * Skip orchestration restart on device config map update for osd on pvc (#4124) + * Deduplicate tolerations collected for the drain canary pods (#4220) + * Role bindings are missing for pod security policies (#3851) + * Continue with orchestration if a single mon pod fails to start (#4146) + * OSDs cannot call 'restorecon' when selinux is enabled (#4214) + * Use the rook image for drain canary pods (#4213) + * Allow setting of osd prepare resource limits (#4182) + * Documentation for object bucket provisioning (#3882) + +------------------------------------------------------------------- +Tue Nov 5 16:10:12 UTC 2019 - Kristoffer Gronlund <[email protected]> + +- Update rook to v1.1.4: + * OSD config overrides were ignored for some upgraded OSDs (#4161) + * Enable restoring a cluster after disaster recovery (#4021) + * Enable upgrade of OSDs configured on PVCs (#3996) + * Automatically removing OSDs requires setting: removeOSDsIfOutAndSafeToRemove(#4116) + * Rework csi keys and secrets to use minimal privileges (#4086) + * Expose OSD prepare pod resource limits (#4083) + * Minimum K8s version for running OSDs on PVCs is 1.13 (#4009) + * Add 'rgw.buckets.non-ec' to list of RGW metadataPools (#4087) + * Hide wrong error for clusterdisruption controller (#4094) + * Multiple integration test fixes to improve CI stability (#4098) + * Detect mount fstype more accurately in the flex driver (#4109) + * Do not override mgr annotations (#4110) + * Add OSDs to proper buckets in crush hierarchy with topology awareness (#4099) + * More robust removal of cluster finalizer (#4090) + * Take activeStandby into account for the CephFileSystem disruption budget (#4075) + * Update the CSI CephFS registration directory name (#4070) + * Fix incorrect Ceph CSI doc links (#4081) + * Remove decimal places for osdMemoryTargetValue monitoring setting (#4046) + * Relax pre-requisites for external cluster to allow connections to Luminous (#4025) + * Avoid nodes getting stuck in OrchestrationStatusStarting during OSD config (#3817) + * Make metrics and liveness port configurable (#4005) + * Correct system namespace for CSI driver settings during upgrade (#4040) + +- Update csi-dummy-images.patch +- Update csi-template-paths.patch +- Update 0001-bsc-1152690-ceph-csi-Driver-will-fail-with-error.patch + +------------------------------------------------------------------- Old: ---- rook-1.1.1+git0.g9a2641a6-vendor.tar.xz rook-1.1.1+git0.g9a2641a6.tar.xz New: ---- rook-1.1.6+git0.g91d6f635-vendor.tar.xz rook-1.1.6+git0.g91d6f635.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rook.spec ++++++ --- /var/tmp/diff_new_pack.GVAeHO/_old 2019-11-11 12:58:58.657600552 +0100 +++ /var/tmp/diff_new_pack.GVAeHO/_new 2019-11-11 12:58:58.657600552 +0100 @@ -17,7 +17,7 @@ Name: rook -Version: 1.1.1+git0.g9a2641a6 +Version: 1.1.6+git0.g91d6f635 Release: 0 Summary: Orchestrator for distributed storage systems in cloud-native environments License: Apache-2.0 @@ -143,13 +143,13 @@ # 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 +%global rook_container_version 1.1.6.0 # this is updated by update-tarball.sh %if 0%{?is_opensuse} -%global rook_image registry.opensuse.org/opensuse/rook/ceph:%{rook_container_version} +%global rook_image registry.opensuse.org/opensuse/rook/ceph:%{rook_container_version}.%{release} %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 rook_image registry.suse.com/ses/6/rook/ceph:%{rook_container_version}.%{release} %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 ++++++ 0001-bsc-1152690-ceph-csi-Driver-will-fail-with-error.patch ++++++ --- /var/tmp/diff_new_pack.GVAeHO/_old 2019-11-11 12:58:58.673600569 +0100 +++ /var/tmp/diff_new_pack.GVAeHO/_new 2019-11-11 12:58:58.673600569 +0100 @@ -1,25 +1,23 @@ -From 2e3c909f525cffe9dd2c81bdc27b00fc95c71cac Mon Sep 17 00:00:00 2001 +From 90f8e99adca70716b91491d736fa6417cc9ba8cd Mon Sep 17 00:00:00 2001 From: Stefan Haas <[email protected]> -Date: Wed, 2 Oct 2019 10:42:57 +0200 +Date: Tue, 5 Nov 2019 19:32:45 +0000 Subject: [PATCH] bsc#1152690 - ceph-csi: Driver will fail with error -Signed-off-by: Stefan Haas <[email protected]> -(cherry picked from commit 5d52d65915eb73c94a8b2ad922b97ce609ca2d37) --- - .../csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml | 2 ++ - .../csi/template/cephfs/csi-cephfsplugin-provisioner-sts.yaml | 2 ++ - .../kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin.yaml | 2 ++ - .../ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml | 2 ++ - .../ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml | 2 ++ - .../kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml | 2 ++ + .../ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml | 2 ++ + .../ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-sts.yaml | 2 ++ + .../examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin.yaml | 2 ++ + .../kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml | 2 ++ + .../kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml | 2 ++ + cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml | 2 ++ 6 files changed, 12 insertions(+) diff --git a/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml b/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml -index fdba6063..85a7f987 100644 +index 27988be9..a27f0fec 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-dep.yaml @@ -67,6 +67,7 @@ spec: - - "--metricsport=9091" + - "--metricsport={{ .CephFSGRPCMetricsPort }}" - "--metricspath=/metrics" - "--enablegrpcmetrics={{ .EnableCSIGRPCMetrics }}" + - "--forcecephkernelclient=true" @@ -35,11 +33,11 @@ - name: CSI_ENDPOINT value: unix:///csi/csi-provisioner.sock diff --git a/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-sts.yaml b/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-sts.yaml -index 9bef3f6d..9e72f044 100644 +index 374835e7..9d7de9c5 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-sts.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin-provisioner-sts.yaml @@ -62,6 +62,7 @@ spec: - - "--metricsport=9091" + - "--metricsport={{ .CephFSGRPCMetricsPort }}" - "--metricspath=/metrics" - "--enablegrpcmetrics={{ .EnableCSIGRPCMetrics }}" + - "--forcecephkernelclient=true" @@ -55,11 +53,11 @@ - name: CSI_ENDPOINT value: unix:///csi/csi-provisioner.sock diff --git a/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin.yaml b/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin.yaml -index e6b2f168..f80195e4 100644 +index 114ed0d5..b8927ccd 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/cephfs/csi-cephfsplugin.yaml @@ -59,6 +59,7 @@ spec: - - "--metricsport=9091" + - "--metricsport={{ .CephFSGRPCMetricsPort }}" - "--metricspath=/metrics" - "--enablegrpcmetrics={{ .EnableCSIGRPCMetrics }}" + - "--forcecephkernelclient=true" @@ -75,18 +73,18 @@ - name: CSI_ENDPOINT value: unix:///csi/csi.sock diff --git a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml -index a49d86f7..b9d2bf8e 100644 +index e48c6b22..e1a47530 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-dep.yaml -@@ -84,6 +84,7 @@ spec: - - "--metricsport=9090" +@@ -83,6 +83,7 @@ spec: + - "--metricsport={{ .RBDGRPCMetricsPort }}" - "--metricspath=/metrics" - "--enablegrpcmetrics={{ .EnableCSIGRPCMetrics }}" + - "--forcecephkernelclient=true" env: - name: POD_IP valueFrom: -@@ -127,6 +128,7 @@ spec: +@@ -122,6 +123,7 @@ spec: - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" @@ -95,18 +93,18 @@ - name: CSI_ENDPOINT value: unix:///csi/csi-provisioner.sock diff --git a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml -index 83cdb64d..06a2b185 100644 +index 5079eae2..a571a9b3 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin-provisioner-sts.yaml -@@ -77,6 +77,7 @@ spec: - - "--metricsport=9090" +@@ -76,6 +76,7 @@ spec: + - "--metricsport={{ .RBDGRPCMetricsPort }}" - "--metricspath=/metrics" - "--enablegrpcmetrics={{ .EnableCSIGRPCMetrics }}" + - "--forcecephkernelclient=true" env: - name: POD_IP valueFrom: -@@ -120,6 +121,7 @@ spec: +@@ -115,6 +116,7 @@ spec: - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" @@ -115,18 +113,18 @@ - name: CSI_ENDPOINT value: unix:///csi/csi-provisioner.sock diff --git a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml -index 932c2b18..4af4ff83 100644 +index 8f7b7aed..44867370 100644 --- a/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml +++ b/cluster/examples/kubernetes/ceph/csi/template/rbd/csi-rbdplugin.yaml @@ -59,6 +59,7 @@ spec: - - "--metricsport=9090" + - "--metricsport={{ .RBDGRPCMetricsPort }}" - "--metricspath=/metrics" - "--enablegrpcmetrics={{ .EnableCSIGRPCMetrics }}" + - "--forcecephkernelclient=true" env: - name: POD_IP valueFrom: -@@ -108,6 +109,7 @@ spec: +@@ -104,6 +105,7 @@ spec: - "--metricspath=/metrics" - "--polltime=60s" - "--timeout=3s" @@ -135,5 +133,5 @@ - name: CSI_ENDPOINT value: unix:///csi/csi.sock -- -2.23.0 +2.16.4 ++++++ README ++++++ --- /var/tmp/diff_new_pack.GVAeHO/_old 2019-11-11 12:58:58.689600586 +0100 +++ /var/tmp/diff_new_pack.GVAeHO/_new 2019-11-11 12:58:58.693600590 +0100 @@ -1,8 +1,19 @@ -To update the package: +# Packaging rook + +## Dependencies + +- go + Requires go 1.12+ and GOPATH set correctly +- dep + go get -u github.com/golang/dep/cmd/dep +- git +- curl + +## Updating the package - run update-tarball.sh to create a new tarball - update rook.changes +- remove the old tarballs +- osc ar - osc commit -The update-tarball.sh script requires a go installation, the go dependency tool -dep and git to run. ++++++ csi-dummy-images.patch ++++++ --- /var/tmp/diff_new_pack.GVAeHO/_old 2019-11-11 12:58:58.709600607 +0100 +++ /var/tmp/diff_new_pack.GVAeHO/_new 2019-11-11 12:58:58.709600607 +0100 @@ -1,34 +1,25 @@ +From e602b3efe0bf57924b28884f584661d7563a92ee Mon Sep 17 00:00:00 2001 +From: Kristoffer Gronlund <[email protected]> +Date: Tue, 5 Nov 2019 16:30:46 +0000 +Subject: [PATCH] Replace cephcsi image path with dummy value + +--- + pkg/operator/ceph/csi/spec.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go -index 81491fde..327bd139 100644 +index e139c2b1..09f5e16c 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go -@@ -66,17 +66,23 @@ var ( - ConfigKey = "csi-cluster-config-json" - ) - --const ( -- KubeMinMajor = "1" -- KubeMinMinor = "13" -- provDeploymentSuppVersion = "14" -- -+// Specify default images as var instead of const so that they can be overridden with the Go -+// linker's -X flag. This allows users to easily build images with a different opinionated set of -+// images without having to specify them manually in charts/manifests which can make upgrades more -+// manually challenging. -+var ( +@@ -80,7 +80,7 @@ var ( + // manually challenging. + var ( // image names -- DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v1.2.0" +- DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v1.2.1" + 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" - DefaultSnapshotterImage = "quay.io/k8scsi/csi-snapshotter:v1.2.0" -+) -+ -+const ( -+ KubeMinMajor = "1" -+ KubeMinMinor = "13" -+ provDeploymentSuppVersion = "14" +-- +2.16.4 - // kubelet directory path - DefaultKubeletDirPath = "/var/lib/kubelet" ++++++ csi-template-paths.patch ++++++ --- /var/tmp/diff_new_pack.GVAeHO/_old 2019-11-11 12:58:58.717600616 +0100 +++ /var/tmp/diff_new_pack.GVAeHO/_new 2019-11-11 12:58:58.717600616 +0100 @@ -1,8 +1,17 @@ +From d48b3a9ee97c89c2b1f550af0ec91b5dac391193 Mon Sep 17 00:00:00 2001 +From: Kristoffer Gronlund <[email protected]> +Date: Tue, 5 Nov 2019 16:49:49 +0000 +Subject: [PATCH] Update template paths + +--- + pkg/operator/ceph/csi/spec.go | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go -index 44f07f7e..9bad585d 100644 +index 09f5e16c..d08ea948 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go -@@ -82,15 +82,15 @@ const ( +@@ -102,15 +102,15 @@ const ( DefaultKubeletDirPath = "/var/lib/kubelet" // template @@ -24,6 +33,9 @@ + 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 { + // grpc metrics and liveness port for cephfs and rbd + DefaultCephFSGRPCMerticsPort uint16 = 9091 +-- +2.16.4 + ++++++ rook-1.1.1+git0.g9a2641a6-vendor.tar.xz -> rook-1.1.6+git0.g91d6f635-vendor.tar.xz ++++++ ++++++ rook-1.1.1+git0.g9a2641a6-vendor.tar.xz -> rook-1.1.6+git0.g91d6f635.tar.xz ++++++ /work/SRC/openSUSE:Factory/rook/rook-1.1.1+git0.g9a2641a6-vendor.tar.xz /work/SRC/openSUSE:Factory/.rook.new.2990/rook-1.1.6+git0.g91d6f635.tar.xz differ: char 25, line 1 ++++++ update-tarball.sh ++++++ --- /var/tmp/diff_new_pack.GVAeHO/_old 2019-11-11 12:59:01.573603640 +0100 +++ /var/tmp/diff_new_pack.GVAeHO/_new 2019-11-11 12:59:01.573603640 +0100 @@ -2,6 +2,9 @@ set -xEeuo pipefail +ROOK_REPO="github.com/rook/rook" +ROOK_REV="v1.1.6" + if ! command -V go; then echo "ERROR: could not find go binary" @@ -39,8 +42,6 @@ } trap on_err ERR -ROOK_REPO="github.com/SUSE/rook" -ROOK_REV="v1.1.1" cat <<EOF tar-ing Rook $ROOK_REPO at revision '$ROOK_REV'
