From c88de4b53059ac4a2221be3902e91f8698dd7d64 Mon Sep 17 00:00:00 2001
From: Jason Brooks <jbrooks@redhat.com>
Date: Tue, 28 Nov 2017 13:01:13 -0800
Subject: [PATCH 1/4] fix gid/uid, make launch.sh executable

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

diff --git a/Dockerfile b/Dockerfile
index 618c672..02c6571 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/f27/kubernetes-node:latest
+FROM registry.fedoraproject.org/kubernetes-master:rawhide
 MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker
diff --git a/config.json.template b/config.json.template
index 5084c9b..a4d7a0c 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-proxy-docker.sh"
diff --git a/launch.sh b/launch.sh
old mode 100644
new mode 100755

From 593a3f9bdb863285ed06651819700d23be002bfe Mon Sep 17 00:00:00 2001
From: Jason Brooks <jbrooks@redhat.com>
Date: Mon, 18 Dec 2017 13:41:11 -0800
Subject: [PATCH 2/4] bind mount /run rw

---
 config.json.template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/config.json.template b/config.json.template
index a4d7a0c..b63aab6 100644
--- a/config.json.template
+++ b/config.json.template
@@ -320,6 +320,16 @@
                 "rbind",
                 "rprivate"
              ]
+          },
+          {
+            "type": "bind",
+            "source": "/run",
+            "destination": "/run",
+            "options": [
+                "rbind",
+                "rw",
+                "mode=755"
+             ]
           }
     ],
     "linux": {

From 40655fd376c57d5af0a1c5c338dce560d30a48b4 Mon Sep 17 00:00:00 2001
From: Jason Brooks <jbrooks@redhat.com>
Date: Tue, 20 Mar 2018 13:26:37 -0700
Subject: [PATCH 3/4] from f28, run proxy as root

---
 Dockerfile           | 4 ++--
 config.json.template | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 02c6571..e7cfb05 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM registry.fedoraproject.org/kubernetes-master:rawhide
+FROM registry.fedoraproject.org/kubernetes-master:28
 MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker
 
-ENV NAME=kubernetes-proxy VERSION=0 RELEASE=8 ARCH=x86_64
+ENV NAME=kubernetes-proxy 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 b63aab6..3400a6b 100644
--- a/config.json.template
+++ b/config.json.template
@@ -7,8 +7,8 @@
     "process": {
         "terminal": false,
         "user": {
-            "uid": 996,
-            "gid": 994
+            "uid": 0,
+            "gid": 0
         },
         "args": [
             "/usr/bin/kube-proxy-docker.sh"

From 39372cfa577eaff82272bac7ae77890a1fc2fcb9 Mon Sep 17 00:00:00 2001
From: Bhavin Gandhi <bhavin7392@gmail.com>
Date: Sun, 26 Aug 2018 23:46:41 +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 3cdff5b..837aaf7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,11 +3,10 @@ MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker
 
-ENV NAME=kubernetes-proxy VERSION=0 RELEASE=0 ARCH=x86_64
+ENV NAME=kubernetes-proxy VERSION=0 ARCH=x86_64
 LABEL BZComponent="$NAME" \
         name="$FGC/$NAME" \
         version="$VERSION" \
-        release="$RELEASE.$DISTTAG" \
         architecture="$ARCH" \
         atomic.type='system'