From bfacd698bdbffc2e5aae1272cd28230de4fab769056ae681197fcd82a1c7ec55 Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Tue, 28 Apr 2020 08:25:30 +0000
Subject: [PATCH 1/5] - De-install busybox-sh in favour of bash

OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/kubic-etcd-image?expand=0&rev=14
---
 kubic-etcd-image.changes | 5 +++++
 kubic-etcd-image.kiwi    | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/kubic-etcd-image.changes b/kubic-etcd-image.changes
index 3919b3c..a4f25ca 100644
--- a/kubic-etcd-image.changes
+++ b/kubic-etcd-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 28 08:25:07 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
+
+- De-install busybox-sh in favour of bash 
+
 -------------------------------------------------------------------
 Fri Nov  8 22:09:48 UTC 2019 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/kubic-etcd-image.kiwi b/kubic-etcd-image.kiwi
index 8aa1a03..2f8846d 100644
--- a/kubic-etcd-image.kiwi
+++ b/kubic-etcd-image.kiwi
@@ -47,5 +47,7 @@
   <packages type="bootstrap">
     <package name="etcd-for-k8s-image"/>
     <!-- package name="kubernetes-etcd-migrate"/ -->
+    <package name="--"/>
+    <package_name="-busybox-sh"/>
   </packages>
 </image>

From 50187c97011d435adf0207fbb5c2a1ae408ad95be2f6330e425c95428641ccec Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Tue, 28 Apr 2020 08:35:02 +0000
Subject: [PATCH 2/5] OBS-URL:
 https://build.opensuse.org/package/show/devel:kubic:containers/kubic-etcd-image?expand=0&rev=15

---
 kubic-etcd-image.kiwi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubic-etcd-image.kiwi b/kubic-etcd-image.kiwi
index 2f8846d..d121c2c 100644
--- a/kubic-etcd-image.kiwi
+++ b/kubic-etcd-image.kiwi
@@ -48,6 +48,6 @@
     <package name="etcd-for-k8s-image"/>
     <!-- package name="kubernetes-etcd-migrate"/ -->
     <package name="--"/>
-    <package_name="-busybox-sh"/>
+    <package name="-busybox-sh"/>
   </packages>
 </image>

From 7dd70048fcd8f3bd72dbec1b303bb7caac51ece822aad249dc99f4f8c9d8092b Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Wed, 29 Apr 2020 13:43:46 +0000
Subject: [PATCH 3/5] OBS-URL:
 https://build.opensuse.org/package/show/devel:kubic:containers/kubic-etcd-image?expand=0&rev=16

---
 kubic-etcd-image.changes | 5 -----
 kubic-etcd-image.kiwi    | 2 --
 2 files changed, 7 deletions(-)

diff --git a/kubic-etcd-image.changes b/kubic-etcd-image.changes
index a4f25ca..3919b3c 100644
--- a/kubic-etcd-image.changes
+++ b/kubic-etcd-image.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Tue Apr 28 08:25:07 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
-
-- De-install busybox-sh in favour of bash 
-
 -------------------------------------------------------------------
 Fri Nov  8 22:09:48 UTC 2019 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/kubic-etcd-image.kiwi b/kubic-etcd-image.kiwi
index d121c2c..8aa1a03 100644
--- a/kubic-etcd-image.kiwi
+++ b/kubic-etcd-image.kiwi
@@ -47,7 +47,5 @@
   <packages type="bootstrap">
     <package name="etcd-for-k8s-image"/>
     <!-- package name="kubernetes-etcd-migrate"/ -->
-    <package name="--"/>
-    <package name="-busybox-sh"/>
   </packages>
 </image>

From 2e1b471a7f5fec79c2f49b46d9900373799be7055b0136ec3ac08a412e75335e Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Tue, 1 Sep 2020 15:53:44 +0000
Subject: [PATCH 4/5] - Rework package to use kubernetes-etcd metapackage

OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/kubic-etcd-image?expand=0&rev=17
---
 _service                 |  2 +-
 kubic-etcd-image.changes |  5 +++++
 kubic-etcd-image.kiwi    | 10 +++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/_service b/_service
index d8be25b..89cd0fd 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
         <param name="file">kubic-etcd-image.kiwi</param>
         <param name="regex">%PKG_VERSION%</param>
         <param name="parse-version">patch</param>
-        <param name="package">etcd-for-k8s-image</param>
+        <param name="package">kubernetes-etcd</param>
     </service>
     <service mode="buildtime" name="kiwi_label_helper"/>
 </services>
diff --git a/kubic-etcd-image.changes b/kubic-etcd-image.changes
index 3919b3c..7256636 100644
--- a/kubic-etcd-image.changes
+++ b/kubic-etcd-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  1 15:44:31 UTC 2020 - Richard Brown <rbrown@suse.com>
+
+- Rework package to use kubernetes-etcd metapackage 
+
 -------------------------------------------------------------------
 Fri Nov  8 22:09:48 UTC 2019 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/kubic-etcd-image.kiwi b/kubic-etcd-image.kiwi
index 8aa1a03..f51d34e 100644
--- a/kubic-etcd-image.kiwi
+++ b/kubic-etcd-image.kiwi
@@ -4,8 +4,8 @@
 
 <image schemaversion="6.9" name="kubic-etcd-image" xmlns:suse_label_helper="com.suse.label_helper">
   <description type="system">
-    <author>Thorsten Kukuk</author>
-    <contact>kukuk@suse.com</contact>
+    <author>Richard Brown</author>
+    <contact>rbrown@suse.com</contact>
     <specification>Image containing etcd for openSUSE Kubic.</specification>
   </description>
   <preferences>
@@ -16,7 +16,7 @@
         name="kubic/etcd"
         tag="latest"
         additionaltags="%PKG_VERSION%,%PKG_VERSION%-0,%PKG_VERSION%-0.%RELEASE%"
-        maintainer="Thorsten Kukuk &lt;kukuk@suse.com&gt;">
+        maintainer="Richard Brown &lt;rbrown@suse.com&gt;">
         <expose>
           <port number="2379"/>
           <port number="2380"/>
@@ -34,7 +34,7 @@
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
           </suse_label_helper:add_prefix>
         </labels>
-        <history author="Thorsten Kukuk &lt;kukuk@suse.com&gt;">openSUSE Kubic etcd container</history>
+        <history author="Richard Brown &lt;rbrown@suse.com&gt;">openSUSE Kubic etcd container</history>
       </containerconfig>
     </type>
     <version>1.0.0</version>
@@ -45,7 +45,7 @@
     <source path="obsrepositories:/"/>
   </repository>
   <packages type="bootstrap">
-    <package name="etcd-for-k8s-image"/>
+    <package name="kubernetes-etcd"/>
     <!-- package name="kubernetes-etcd-migrate"/ -->
   </packages>
 </image>

From b9cb6e34611b751fbae92123dba8be9f91897693aa2f607e7d627003f49a5ce2 Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Wed, 2 Sep 2020 11:31:35 +0000
Subject: [PATCH 5/5] - add %PKG_VERSION%-1 tag to work with hardcoded
 kubernetes tag requirements

OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/kubic-etcd-image?expand=0&rev=18
---
 kubic-etcd-image.changes | 5 +++++
 kubic-etcd-image.kiwi    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/kubic-etcd-image.changes b/kubic-etcd-image.changes
index 7256636..fd6ba0b 100644
--- a/kubic-etcd-image.changes
+++ b/kubic-etcd-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep  2 11:30:06 UTC 2020 - Richard Brown <rbrown@suse.com>
+
+- add %PKG_VERSION%-1 tag to work with hardcoded kubernetes tag requirements
+
 -------------------------------------------------------------------
 Tue Sep  1 15:44:31 UTC 2020 - Richard Brown <rbrown@suse.com>
 
diff --git a/kubic-etcd-image.kiwi b/kubic-etcd-image.kiwi
index f51d34e..f845eb8 100644
--- a/kubic-etcd-image.kiwi
+++ b/kubic-etcd-image.kiwi
@@ -15,7 +15,7 @@
       <containerconfig
         name="kubic/etcd"
         tag="latest"
-        additionaltags="%PKG_VERSION%,%PKG_VERSION%-0,%PKG_VERSION%-0.%RELEASE%"
+        additionaltags="%PKG_VERSION%,%PKG_VERSION%-0,%PKG_VERSION%-0.%RELEASE%,%PKG_VERSION%-1,%PKG_VERSION%-1.%RELEASE%"
         maintainer="Richard Brown &lt;rbrown@suse.com&gt;">
         <expose>
           <port number="2379"/>