From 8ba1a699d7ba24bd2cf91b6e4a8c37049428ba7a Mon Sep 17 00:00:00 2001
From: Jason Brooks <jbrooks@redhat.com>
Date: Tue, 28 Nov 2017 12:56:03 -0800
Subject: [PATCH 1/4] fix uid/gid, make launch script executable

---
 Dockerfile           | 4 ++--
 config.json.template | 4 ++--
 launch.sh            | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 launch.sh

diff --git a/Dockerfile b/Dockerfile
index 41abf8f..9d0342d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM registry.fedoraproject.org/f27/kubernetes-master:latest
+FROM registry.fedoraproject.org/kubernetes-master:rawhide
 MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker
 
-ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=8 ARCH=x86_64
+ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=0 ARCH=x86_64
 LABEL BZComponent="$NAME" \
         name="$FGC/$NAME" \
         version="$VERSION" \
diff --git a/config.json.template b/config.json.template
index bc7e6a8..27cb6e9 100644
--- a/config.json.template
+++ b/config.json.template
@@ -7,8 +7,8 @@
     "process": {
         "terminal": false,
         "user": {
-            "uid": 994,
-            "gid": 996
+            "uid": 996,
+            "gid": 994
         },
         "args": [
             "/usr/bin/kube-controller-manager-docker.sh"
diff --git a/launch.sh b/launch.sh
old mode 100644
new mode 100755

From 228f8cf8bbc32f83fe93e3835eb66c3012e02ef3 Mon Sep 17 00:00:00 2001
From: Jason Brooks <jbrooks@redhat.com>
Date: Tue, 20 Mar 2018 12:55:06 -0700
Subject: [PATCH 2/4] from f28

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 9d0342d..e86a1c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/kubernetes-master:rawhide
+FROM registry.fedoraproject.org/kubernetes-master:28
 MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker

From f5ffaecff4203e20562acab09a5de23fafb178bf Mon Sep 17 00:00:00 2001
From: Jason Brooks <jbrooks@redhat.com>
Date: Tue, 20 Mar 2018 12:55:47 -0700
Subject: [PATCH 3/4] revert

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e86a1c0..9d0342d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/kubernetes-master:28
+FROM registry.fedoraproject.org/kubernetes-master:rawhide
 MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker

From ca8e0e2c97daf1745de8c37572be833455fed6c8 Mon Sep 17 00:00:00 2001
From: Bhavin Gandhi <bhavin7392@gmail.com>
Date: Thu, 23 Aug 2018 23:03:06 +0530
Subject: [PATCH 4/4] Drop Release label in favor of OSBS release_bump plugin

OSBS can automatically bump the release number, for that
we just need to drop the label from the Dockerfile

See https://pagure.io/ContainerSIG/container-sig/issue/1

Signed-off-by: Bhavin Gandhi <bhavin7392@gmail.com>
---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9d0342d..5889463 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,11 +3,10 @@ MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker
 
-ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=0 ARCH=x86_64
+ENV NAME=kubernetes-controller-manager VERSION=0 ARCH=x86_64
 LABEL BZComponent="$NAME" \
         name="$FGC/$NAME" \
         version="$VERSION" \
-        release="$RELEASE.$DISTTAG" \
         architecture="$ARCH" \
         atomic.type='system'