From f41d3d8e3cef79582c88e36a788e40a80ae522b15f32e10d681f27ce856aca87 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Wed, 18 Nov 2020 05:15:26 +0000 Subject: [PATCH 1/3] - Rework _service and spec file to make future version updates easier OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/csi-external-provisioner?expand=0&rev=3 --- _service | 5 ++++- csi-external-provisioner-1.6.0.tar.gz | 3 +++ csi-external-provisioner.changes | 5 +++++ csi-external-provisioner.spec | 17 +++++++++-------- external-provisioner-1.6.0.tar.gz | 3 --- vendor.tar.gz | 4 ++-- 6 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 csi-external-provisioner-1.6.0.tar.gz delete mode 100644 external-provisioner-1.6.0.tar.gz diff --git a/_service b/_service index 559b39c..ba9eba3 100644 --- a/_service +++ b/_service @@ -3,13 +3,16 @@ https://github.com/kubernetes-csi/external-provisioner git .git + csi-external-provisioner 1.6.0 - 321fa5c1c + v1.6.0 *.tar gz + + diff --git a/csi-external-provisioner-1.6.0.tar.gz b/csi-external-provisioner-1.6.0.tar.gz new file mode 100644 index 0000000..e668894 --- /dev/null +++ b/csi-external-provisioner-1.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2c5137a127e71b9b13a08c22cb72b271acad7f02cccbae3e9ec38be3b850b57 +size 5398256 diff --git a/csi-external-provisioner.changes b/csi-external-provisioner.changes index ee5efb3..9bb4237 100644 --- a/csi-external-provisioner.changes +++ b/csi-external-provisioner.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 18 05:09:15 UTC 2020 - Tim Serong + +- Rework _service and spec file to make future version updates easier + ------------------------------------------------------------------- Tue Aug 11 01:18:55 UTC 2020 - Chin-Ya Huang diff --git a/csi-external-provisioner.spec b/csi-external-provisioner.spec index dcfec12..1984c52 100644 --- a/csi-external-provisioner.spec +++ b/csi-external-provisioner.spec @@ -1,7 +1,7 @@ # -# spec file for package csi-provisioner +# spec file for package csi-external-provisioner # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %{go_nostrip} %define project github.com/kubernetes-csi/external-provisioner @@ -27,19 +28,19 @@ Release: 0 Summary: Dynamically provisions volumes of CSI drivers License: Apache-2.0 Group: System/Management -Url: https://%{project} -Source: %{source}-%{version}.tar.gz +URL: https://%{project} +Source: %{name}-%{version}.tar.gz Source1: vendor.tar.gz +BuildRequires: go1.12 >= 1.12.0 BuildRequires: golang-packaging BuildRequires: golang(API) >= 1.12 -BuildRequires: go1.12 >= 1.12.0 %description Kubernetes external controller that monitors PersistentVolumeClaim objects created by user and creates/deletes volumes for them. %prep -%setup -q -n %{source}-%{version} -%setup -q -T -D -a 1 -n %{source}-%{version} +%setup -q +%setup -q -T -D -a 1 %build %goprep %{project} diff --git a/external-provisioner-1.6.0.tar.gz b/external-provisioner-1.6.0.tar.gz deleted file mode 100644 index d3aae0d..0000000 --- a/external-provisioner-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08b2d2ac983c540a3cf36a06f7da2749e95ae2f5513fae4ffe2939137778a45a -size 5388919 diff --git a/vendor.tar.gz b/vendor.tar.gz index 2f1a9f4..87b0a04 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:810328049a08abc98661cd008c0be39d87ee1ddde24719ae5ef0e55a8095a735 -size 5086266 +oid sha256:18864212a0dcffb5ffa10bb9fbc12410b4f2b7b902df5dc2bc73edc4ee55e34b +size 5193017 From 3a3a9242e490d28e6d5dc1f2456bbefc81cec5d74b333dc78d9b552d0c3d732d Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Fri, 20 Nov 2020 02:32:48 +0000 Subject: [PATCH 2/3] Ensure set_version service only uses main source tarball OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/csi-external-provisioner?expand=0&rev=4 --- _service | 1 + vendor.tar.gz | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_service b/_service index ba9eba3..61ccb80 100644 --- a/_service +++ b/_service @@ -12,6 +12,7 @@ gz + csi-external-provisioner diff --git a/vendor.tar.gz b/vendor.tar.gz index 87b0a04..d0e4471 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:18864212a0dcffb5ffa10bb9fbc12410b4f2b7b902df5dc2bc73edc4ee55e34b -size 5193017 +oid sha256:531ebc7dbe6e025d9946062b6171ef6b19060d0fc7fa699474535934b95880bf +size 5193079 From 4dac43d61ef9436a075ad9898ea9125f74d2f49f5a683429b1fcc4f5869292e4 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Tue, 24 Nov 2020 03:11:42 +0000 Subject: [PATCH 3/3] - Remove duplicate version information from _service file OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/csi-external-provisioner?expand=0&rev=5 --- _service | 3 ++- csi-external-provisioner.changes | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/_service b/_service index 61ccb80..28c63ac 100644 --- a/_service +++ b/_service @@ -4,7 +4,8 @@ git .git csi-external-provisioner - 1.6.0 + @PARENT_TAG@ + v(.*) v1.6.0 diff --git a/csi-external-provisioner.changes b/csi-external-provisioner.changes index 9bb4237..bd7c2ac 100644 --- a/csi-external-provisioner.changes +++ b/csi-external-provisioner.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 24 03:08:44 UTC 2020 - Tim Serong + +- Remove duplicate version information from _service file + ------------------------------------------------------------------- Wed Nov 18 05:09:15 UTC 2020 - Tim Serong