From 157fd968bdce41bc26b47fbe51d3e19a922f14a90cbf14e936786bc592fbe3a5 Mon Sep 17 00:00:00 2001
From: Richard Brown <rbrown@suse.com>
Date: Thu, 18 Jul 2019 19:50:34 +0000
Subject: [PATCH] Accepting request 716573 from home:kukuk:container

- Replace kubernetes-common with kubernetes-controller-manager

OBS-URL: https://build.opensuse.org/request/show/716573
OBS-URL: https://build.opensuse.org/package/show/devel:kubic:containers/kubic-kube-controller-manager-image?expand=0&rev=3
---
 _service                                    | 2 +-
 config.sh                                   | 2 +-
 kubic-kube-controller-manager-image.changes | 5 +++++
 kubic-kube-controller-manager-image.kiwi    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/_service b/_service
index cfcdf79..70501fa 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
         <param name="file">kubic-kube-controller-manager-image.kiwi</param>
         <param name="regex">%PKG_VERSION%</param>
         <param name="parse-version">patch</param>
-        <param name="package">kubernetes-common</param>
+        <param name="package">kubernetes-controller-manager</param>
     </service>
     <service mode="buildtime" name="kiwi_label_helper"/>
 </services>
diff --git a/config.sh b/config.sh
index 8257ea0..d815a48 100644
--- a/config.sh
+++ b/config.sh
@@ -8,6 +8,6 @@
 #--------------------------------------
 echo "Configure image: [$kiwi_iname]..."
 
-ln -sf /usr/bin/hyperkube /usr/local/bin/kube-controller-manager 
+ln -sf /usr/bin/kube-controller-manager /usr/local/bin/kube-controller-manager 
 
 exit 0
diff --git a/kubic-kube-controller-manager-image.changes b/kubic-kube-controller-manager-image.changes
index 8d59b42..3f9cca5 100644
--- a/kubic-kube-controller-manager-image.changes
+++ b/kubic-kube-controller-manager-image.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 17 06:07:11 UTC 2019 - Thorsten Kukuk <kukuk@suse.com>
+
+- Replace kubernetes-common with kubernetes-controller-manager
+
 -------------------------------------------------------------------
 Wed Jun 26 20:06:00 UTC 2019 - Thorsten Kukuk <kukuk@suse.com>
 
diff --git a/kubic-kube-controller-manager-image.kiwi b/kubic-kube-controller-manager-image.kiwi
index 27f9cef..b9c1432 100644
--- a/kubic-kube-controller-manager-image.kiwi
+++ b/kubic-kube-controller-manager-image.kiwi
@@ -39,6 +39,6 @@
     <source path="obsrepositories:/"/>
   </repository>
   <packages type="bootstrap">
-    <package name="kubernetes-common"/>
+    <package name="kubernetes-controller-manager"/>
   </packages>
 </image>