From c396ec26e438602fb31978f5a0244a52fb97e1a2 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Mon, 9 Jan 2017 13:53:40 -0800 Subject: [PATCH 01/28] first import of kubernetes-controller-manager Dockerfile and files --- Dockerfile | 15 +++++++++++++++ launch.sh | 8 ++++++++ 2 files changed, 23 insertions(+) create mode 100644 Dockerfile create mode 100755 launch.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..ee79c14 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,15 @@ +FROM registry.fedoraproject.org/kubernetes-master:25 +MAINTAINER "Jason Brooks" + +ENV NAME=kube-controller-manager VERSION=0.1 RELEASE=1 ARCH=x86_64 +LABEL BZComponent="kubernetes" \ + Name="$FGC/$NAME" \ + Version="$VERSION" \ + Release="$RELEASE.$DISTTAG" \ + Architecture="$ARCH" + +COPY launch.sh /usr/bin/kube-controller-manager-docker.sh + +LABEL RUN /usr/bin/docker run -d --net=host + +ENTRYPOINT ["/usr/bin/kube-controller-manager-docker.sh"] diff --git a/launch.sh b/launch.sh new file mode 100755 index 0000000..f75107c --- /dev/null +++ b/launch.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +source /etc/kubernetes/controller-manager +source /etc/kubernetes/config + +ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_CONTROLLER_MANAGER_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs) + +exec /usr/bin/kube-controller-manager $ARGS From 23d13d4a36b4708ae342036aeea8acec38d18a2f Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Fri, 17 Feb 2017 11:51:54 -0800 Subject: [PATCH 02/28] fix FROM line --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee79c14..1bbe8ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ -FROM registry.fedoraproject.org/kubernetes-master:25 +FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kube-controller-manager VERSION=0.1 RELEASE=1 ARCH=x86_64 +ENV NAME=kube-controller-manager VERSION=0.1 RELEASE=2 ARCH=x86_64 LABEL BZComponent="kubernetes" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From bf59c0dc23c1dc4dd85eb00e49aff2229247b0f9 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 2 Mar 2017 22:47:04 -0800 Subject: [PATCH 03/28] fix bzcomponent label --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1bbe8ad..3148f04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" ENV NAME=kube-controller-manager VERSION=0.1 RELEASE=2 ARCH=x86_64 -LABEL BZComponent="kubernetes" \ +LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ Release="$RELEASE.$DISTTAG" \ From 046242afed2797887f618a75b8d1858f960d055e Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 7 Mar 2017 10:15:53 -0800 Subject: [PATCH 04/28] fix component name --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3148f04..6c9e1b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kube-controller-manager VERSION=0.1 RELEASE=2 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=3 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 8f58e9153014bc6e6921a97cc7bba2601eded9fd Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 16:46:07 -0500 Subject: [PATCH 05/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6c9e1b9..ddce734 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=3 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=4 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From b3bd39ed95f97620dc5597371134a20a79e79f4c Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 16:49:10 -0500 Subject: [PATCH 06/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ddce734..25d71f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=4 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=5 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 3c737d94b1ec3b215509473afa8b75e586c6d1ea Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 15 Mar 2017 17:23:41 -0500 Subject: [PATCH 07/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 25d71f2..7f22880 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=5 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=6 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 4bab7b791558ab5ff62b17c89bd1a65b5f2d8c04 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 29 Mar 2017 15:16:48 -0500 Subject: [PATCH 08/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7f22880..c163e17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=6 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=7 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From beff491b1bb9257280ca5186c06a7d59c86e5b75 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 29 Mar 2017 22:38:17 -0500 Subject: [PATCH 09/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c163e17..4193332 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=7 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=8 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From c40830ed10bc0ae34fc34da1f738cd405971c2d6 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 20 Apr 2017 21:31:29 -0500 Subject: [PATCH 10/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4193332..2d2e096 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=8 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=9 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From dd006623274eca17b3caf09344870c50cc9156ce Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 20 Apr 2017 21:33:03 -0500 Subject: [PATCH 11/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2d2e096..453ebe2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=9 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=10 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 85acddac1cf4266795f6d1ba6e42ed98716cf55e Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 23 May 2017 16:16:21 -0500 Subject: [PATCH 12/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 453ebe2..ebcb848 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=10 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=11 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From cd3e416e44c06f7473f95512751d480c2dc878a2 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 23 May 2017 17:57:01 -0500 Subject: [PATCH 13/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ebcb848..13d1253 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=11 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=12 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 049248828556e2f95acbbc3038db96d9c5197f6a Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 23 May 2017 22:27:20 -0500 Subject: [PATCH 14/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 13d1253..b21c838 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=12 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=13 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From d4f8f4cbbc7102535db835aae2549cc3e93a0f21 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 27 Jun 2017 11:49:19 -0500 Subject: [PATCH 15/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b21c838..1eb102f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=13 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=14 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 9a0a057ab7e63aa75f2a0f6e2fe504db77493890 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 27 Jun 2017 12:20:33 -0500 Subject: [PATCH 16/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1eb102f..dec5df0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=14 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=15 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 3663f9680f3fc99bb9c4ce8f1436695ef231912b Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 6 Jul 2017 12:29:55 -0700 Subject: [PATCH 17/28] initial commit --- Dockerfile | 22 ++++++ config.json.template | 184 +++++++++++++++++++++++++++++++++++++++++++ launch.sh | 8 ++ service.template | 12 +++ 4 files changed, 226 insertions(+) create mode 100644 Dockerfile create mode 100644 config.json.template create mode 100644 launch.sh create mode 100644 service.template diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..cbc035e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM registry.fedoraproject.org/kubernetes-master:rawhide +MAINTAINER "Jason Brooks" + +ENV container=docker + +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=8 ARCH=x86_64 +LABEL bzcomponent="$NAME" \ + name="$FGC/$NAME" \ + version="$VERSION" \ + release="$RELEASE.$DISTTAG" \ + architecture="$ARCH" \ + atomic.type='system' + +COPY launch.sh /usr/bin/kube-controller-manager-docker.sh + +LABEL RUN /usr/bin/docker run -d --net=host + +COPY service.template config.json.template /exports/ + +RUN mkdir -p /exports/hostfs/etc/kubernetes && cp /etc/kubernetes/{config,controller-manager} /exports/hostfs/etc/kubernetes + +ENTRYPOINT ["/usr/bin/kube-controller-manager-docker.sh"] diff --git a/config.json.template b/config.json.template new file mode 100644 index 0000000..bc7e6a8 --- /dev/null +++ b/config.json.template @@ -0,0 +1,184 @@ +{ + "ociVersion": "1.0.0", + "platform": { + "os": "linux", + "arch": "amd64" + }, + "process": { + "terminal": false, + "user": { + "uid": 994, + "gid": 996 + }, + "args": [ + "/usr/bin/kube-controller-manager-docker.sh" + ], + "env": [ + "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", + "TERM=xterm" + ], + "cwd": "/", + "capabilities": { + "bounding": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_DAC_READ_SEARCH" + ], + "permitted": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_DAC_READ_SEARCH" + ], + "inheritable": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_DAC_READ_SEARCH" + ], + "effective": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_DAC_READ_SEARCH" + ], + "ambient": [ + "CAP_AUDIT_WRITE", + "CAP_KILL", + "CAP_NET_BIND_SERVICE", + "CAP_DAC_READ_SEARCH" + ] + }, + "rlimits": [ + { + "type": "RLIMIT_NOFILE", + "hard": 1024, + "soft": 1024 + } + ] + }, + "root": { + "path": "rootfs", + "readonly": true + }, + "mounts": [ + { + "destination": "/proc", + "type": "proc", + "source": "proc" + }, + { + "destination": "/dev", + "type": "tmpfs", + "source": "tmpfs", + "options": [ + "nosuid", + "strictatime", + "mode=755", + "size=65536k" + ] + }, + { + "destination": "/dev/pts", + "type": "devpts", + "source": "devpts", + "options": [ + "nosuid", + "noexec", + "newinstance", + "ptmxmode=0666", + "mode=0620", + "gid=5" + ] + }, + { + "destination": "/dev/shm", + "type": "tmpfs", + "source": "shm", + "options": [ + "nosuid", + "noexec", + "nodev", + "mode=1777", + "size=65536k" + ] + }, + { + "destination": "/dev/mqueue", + "type": "mqueue", + "source": "mqueue", + "options": [ + "nosuid", + "noexec", + "nodev" + ] + }, + { + "destination": "/sys", + "type": "sysfs", + "source": "sysfs", + "options": [ + "nosuid", + "noexec", + "nodev" + ] + }, + { + "destination": "/sys/fs/cgroup", + "type": "cgroup", + "source": "cgroup", + "options": [ + "nosuid", + "noexec", + "nodev", + "relatime", + "ro" + ] + }, + { + "type": "bind", + "source": "/etc/kubernetes", + "destination": "/etc/kubernetes", + "options": [ + "rbind", + "ro", + "rprivate" + ] + }, + { + "destination": "/etc/resolv.conf", + "type": "bind", + "source": "/etc/resolv.conf", + "options": [ + "ro", + "rbind", + "rprivate" + ] + } + ], + "linux": { + "resources": { + "devices": [ + { + "allow": false, + "access": "rwm" + } + ] + }, + "namespaces": [ + { + "type": "pid" + }, + { + "type": "ipc" + }, + { + "type": "mount" + } + ], + "devices": null, + "apparmorProfile": "", + "selinuxProcessLabel": "" + } +} diff --git a/launch.sh b/launch.sh new file mode 100644 index 0000000..f75107c --- /dev/null +++ b/launch.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +source /etc/kubernetes/controller-manager +source /etc/kubernetes/config + +ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_CONTROLLER_MANAGER_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs) + +exec /usr/bin/kube-controller-manager $ARGS diff --git a/service.template b/service.template new file mode 100644 index 0000000..d73b0b3 --- /dev/null +++ b/service.template @@ -0,0 +1,12 @@ +[Unit] +Description=kubernetes-controller-manager + +[Service] +ExecStart=$EXEC_START +ExecStop=$EXEC_STOP +Restart=on-failure +WorkingDirectory=$DESTDIR + +[Install] +WantedBy=multi-user.target + From 2a156f42e98fcaa937d5420c3757699cc9b3b94f Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 6 Jul 2017 13:02:17 -0700 Subject: [PATCH 18/28] fix BZComponent capitalization --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cbc035e..1f78297 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER "Jason Brooks" ENV container=docker ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=8 ARCH=x86_64 -LABEL bzcomponent="$NAME" \ +LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ release="$RELEASE.$DISTTAG" \ From d4ecfd081519f1ad6ddc4ca75144bcf7c8d636c4 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 6 Jul 2017 15:27:10 -0500 Subject: [PATCH 19/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dec5df0..7ba7c28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=15 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=16 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 62d3628bae4367f8d54f6909af5e651b35741ca2 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Thu, 6 Jul 2017 13:59:39 -0700 Subject: [PATCH 20/28] build from f27 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1f78297..41abf8f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/kubernetes-master:rawhide +FROM registry.fedoraproject.org/f27/kubernetes-master:latest MAINTAINER "Jason Brooks" ENV container=docker From e0a5a8c8c9233fd5647a0c714ffe54c99c509f9b Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Mon, 24 Jul 2017 18:14:30 -0700 Subject: [PATCH 21/28] don't sort args --- launch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launch.sh b/launch.sh index f75107c..3b38c36 100644 --- a/launch.sh +++ b/launch.sh @@ -3,6 +3,6 @@ source /etc/kubernetes/controller-manager source /etc/kubernetes/config -ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_CONTROLLER_MANAGER_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs) +ARGS="$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_CONTROLLER_MANAGER_ARGS" exec /usr/bin/kube-controller-manager $ARGS From 274c70892b2a301d6d30f7ffc9600574128b379d Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 25 Jul 2017 14:53:53 -0500 Subject: [PATCH 22/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7ba7c28..24087f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=16 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=17 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From ae104d7acf6545630d3fad8332073811e838cc20 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 24 Aug 2017 16:29:58 -0500 Subject: [PATCH 23/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 24087f4..4736ebb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=17 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=18 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 39ae62549e5978b7d981507b573890664e6e3e97 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Thu, 21 Sep 2017 12:19:07 -0500 Subject: [PATCH 24/28] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4736ebb..9e2b580 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM registry.fedoraproject.org/f25/kubernetes-master:latest MAINTAINER "Jason Brooks" -ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=18 ARCH=x86_64 +ENV NAME=kubernetes-controller-manager VERSION=0.1 RELEASE=19 ARCH=x86_64 LABEL BZComponent="$NAME" \ Name="$FGC/$NAME" \ Version="$VERSION" \ From 8ba1a699d7ba24bd2cf91b6e4a8c37049428ba7a Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 28 Nov 2017 12:56:03 -0800 Subject: [PATCH 25/28] 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" 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 Date: Tue, 20 Mar 2018 12:55:06 -0700 Subject: [PATCH 26/28] 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" ENV container=docker From f5ffaecff4203e20562acab09a5de23fafb178bf Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 20 Mar 2018 12:55:47 -0700 Subject: [PATCH 27/28] 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" ENV container=docker From ca8e0e2c97daf1745de8c37572be833455fed6c8 Mon Sep 17 00:00:00 2001 From: Bhavin Gandhi Date: Thu, 23 Aug 2018 23:03:06 +0530 Subject: [PATCH 28/28] 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 --- 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" 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'