From 51b38c026272d1cd2b09f8c3b7f5dfb8a95ab1dd Mon Sep 17 00:00:00 2001
From: Jason Brooks <jbrooks@redhat.com>
Date: Tue, 28 Nov 2017 12:49:30 -0800
Subject: [PATCH 1/2] fix uid/gid, bind mount /var/run/kubernetes

---
 Dockerfile           |  6 +++---
 config.json.template | 13 +++++++++++--
 launch.sh            |  0
 tmpfiles.template    |  1 +
 4 files changed, 15 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 launch.sh
 create mode 100644 tmpfiles.template

diff --git a/Dockerfile b/Dockerfile
index b386efb..e3c35cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM candidate-registry.fedoraproject.org/f27/kubernetes-master:1.7.1
+FROM registry.fedoraproject.org/kubernetes-master:rawhide
 MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker
 
-ENV NAME=kubernetes-apiserver VERSION=1.7.1 RELEASE=0 ARCH=x86_64
+ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=0 ARCH=x86_64
 LABEL BZComponent="$NAME" \
         name="$FGC/$NAME" \
         version="$VERSION" \
@@ -17,7 +17,7 @@ RUN chmod +x /usr/bin/kube-apiserver
 
 LABEL RUN /usr/bin/docker/ run -d --net=host -p 443:443
 
-COPY service.template config.json.template /exports/
+COPY service.template config.json.template tmpfiles.template /exports/
 
 RUN mkdir -p /exports/hostfs/usr/local/bin/ && cp /usr/bin/kubectl /exports/hostfs/usr/local/bin/kubectl
 
diff --git a/config.json.template b/config.json.template
index 8a58c2a..ec6bae5 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-apiserver-docker.sh"
@@ -155,6 +155,15 @@
                 "rbind",
                 "rprivate"
              ]
+          },
+          {
+            "destination": "/var/run/kubernetes",
+            "type": "bind",
+            "source": "/var/run/kubernetes",
+            "options": [
+                "rw",
+                "rbind"
+             ]
           }
     ],
     "linux": {
diff --git a/launch.sh b/launch.sh
old mode 100644
new mode 100755
diff --git a/tmpfiles.template b/tmpfiles.template
new file mode 100644
index 0000000..0fc3bdf
--- /dev/null
+++ b/tmpfiles.template
@@ -0,0 +1 @@
+d /var/run/kubernetes 0755 kube kube -

From 1c35a2501b0fbfa7c86fd7be09bb9e8e3e06b99e Mon Sep 17 00:00:00 2001
From: Bhavin Gandhi <bhavin7392@gmail.com>
Date: Tue, 21 Aug 2018 23:18:40 +0530
Subject: [PATCH 2/2] 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 e3c35cb..84d5631 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,11 +3,10 @@ MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker
 
-ENV NAME=kubernetes-apiserver VERSION=0 RELEASE=0 ARCH=x86_64
+ENV NAME=kubernetes-apiserver VERSION=0 ARCH=x86_64
 LABEL BZComponent="$NAME" \
         name="$FGC/$NAME" \
         version="$VERSION" \
-        release="$RELEASE.$DISTTAG" \
         architecture="$ARCH" \
         atomic.type='system'