From 700ff95b860c20d17dd9ffc1b262017ed5f474fc Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Wed, 1 Nov 2017 14:37:52 -0700 Subject: [PATCH 01/14] set FROM for 27, set version to 0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 573611f..a0909a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=8 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=1 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From bec335d375b2013831dbb4fb8a59a7f5a52c2876 Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 14 Nov 2017 17:36:01 -0600 Subject: [PATCH 02/14] Bump RELEASE for automatic rebuild --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a0909a3..49be19a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=1 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=2 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 6f2ac0a46cd9ca037615bd1f0cca4e771f3bb42e Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Mon, 27 Nov 2017 17:20:47 -0800 Subject: [PATCH 03/14] make run script executable --- Dockerfile | 2 +- launch.sh | 0 2 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 launch.sh diff --git a/Dockerfile b/Dockerfile index 49be19a..83f1576 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=2 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=3 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ diff --git a/launch.sh b/launch.sh old mode 100644 new mode 100755 From 1cb41cb0be1416a94b3b4169a60d30073f3878ba Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Wed, 10 Jan 2018 13:57:19 +0000 Subject: [PATCH 04/14] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 83f1576..e67484e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=3 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=4 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 3101b1d171508db23338e9d6550160df5185ddc3 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 13 Feb 2018 10:51:29 -0800 Subject: [PATCH 05/14] Update kubelet based openshift/node see: https://github.com/projectatomic/atomic-system-containers/pull/161 --- Dockerfile | 8 ++++-- config.json.template | 68 ++++++++++++++++++++++++++++++-------------- tmpfiles.template | 2 ++ 3 files changed, 53 insertions(+), 25 deletions(-) create mode 100644 tmpfiles.template diff --git a/Dockerfile b/Dockerfile index 83f1576..fad29d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=3 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=4 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ @@ -18,8 +18,10 @@ LABEL RUN /usr/bin/docker run -d --privileged --net=host --pid=host -v /:/rootfs COPY launch.sh /usr/bin/kubelet-docker.sh -COPY service.template config.json.template /exports/ +COPY tmpfiles.template service.template config.json.template /exports/ -RUN mkdir -p /exports/hostfs/etc/kubernetes && cp /etc/kubernetes/{config,kubelet} /exports/hostfs/etc/kubernetes +RUN mkdir -p /exports/hostfs/etc/cni/net.d && \ + mkdir -p /exports/hostfs/etc/kubernetes && \ + cp /etc/kubernetes/{config,kubelet} /exports/hostfs/etc/kubernetes ENTRYPOINT ["/usr/bin/kubelet-docker.sh"] diff --git a/config.json.template b/config.json.template index 0e64af2..0292ea7 100644 --- a/config.json.template +++ b/config.json.template @@ -278,26 +278,24 @@ ] }, { + "type": "bind", + "source": "/sys", "destination": "/sys", - "type": "sysfs", - "source": "sysfs", "options": [ - "nosuid", - "noexec", - "nodev" + "rbind", + "rw" ] }, { - "destination": "/sys/fs/cgroup", - "type": "cgroup", - "source": "cgroup", - "options": [ - "nosuid", - "noexec", - "nodev", - "relatime", - "ro" - ] + "type": "bind", + "source": "/etc/cni/net.d", + "destination": "/etc/cni/net.d", + "options": [ + "bind", + "slave", + "rw", + "mode=777" + ] }, { "type": "bind", @@ -309,14 +307,31 @@ "rprivate" ] }, + { + "type": "bind", + "source": "/etc/localtime", + "destination": "/etc/localtime", + "options": [ + "rbind", + "ro" + ] + }, + { + "type": "bind", + "source": "/etc/pki", + "destination": "/etc/pki", + "options": [ + "bind", + "ro" + ] + }, { "destination": "/etc/resolv.conf", "type": "bind", "source": "/etc/resolv.conf", "options": [ "ro", - "rbind", - "rprivate" + "bind" ] }, { @@ -331,8 +346,8 @@ }, { "type": "bind", - "source": "/var/run/", - "destination": "/var/run/", + "source": "/var/run/secrets", + "destination": "/var/run/secrets", "options": [ "rbind", "rw", @@ -341,7 +356,7 @@ }, { "type": "bind", - "source": "/run", + "source": "${RUN_DIRECTORY}", "destination": "/run", "options": [ "rbind", @@ -351,7 +366,7 @@ }, { "type": "bind", - "source": "/var/lib", + "source": "${STATE_DIRECTORY}", "destination": "/var/lib", "options": [ "bind", @@ -361,7 +376,7 @@ }, { "type": "bind", - "source": "/var/lib/kubelet", + "source": "${STATE_DIRECTORY}/kubelet", "destination": "/var/lib/kubelet", "options": [ "rbind", @@ -379,6 +394,15 @@ "rw", "mode=755" ] + }, + { + "destination": "/tmp", + "type": "tmpfs", + "source": "tmpfs", + "options": [ + "mode=755", + "size=65536k" + ] } ], "linux": { diff --git a/tmpfiles.template b/tmpfiles.template new file mode 100644 index 0000000..bdad86c --- /dev/null +++ b/tmpfiles.template @@ -0,0 +1,2 @@ +d /var/lib/cni - - - - - +d /var/run/secrets - - - - - From 972518ad868ac282feb96794ff6ab0889d10ea53 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Tue, 13 Feb 2018 10:55:19 -0800 Subject: [PATCH 06/14] bump release --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fad29d6..6149a28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=4 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=9 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 3df214931858bacabdec41730555c3ad6a886f94 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Mar 2018 17:20:29 +0000 Subject: [PATCH 07/14] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6149a28..3c00770 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=9 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=10 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From eedb5cf4092e5767e9bc27777ee82ba2a1ea42af Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 1 Mar 2018 19:11:48 +0000 Subject: [PATCH 08/14] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c00770..8aaba66 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=10 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=11 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 54c24f124d6becc3aac95c10a1c029c0377260d6 Mon Sep 17 00:00:00 2001 From: Jason Brooks Date: Fri, 2 Mar 2018 13:21:35 -0800 Subject: [PATCH 09/14] Add ${STATE_DIR}/kubelet to tmpfiles --- Dockerfile | 2 +- tmpfiles.template | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8aaba66..68e4788 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=11 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=12 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ diff --git a/tmpfiles.template b/tmpfiles.template index bdad86c..b15bfa8 100644 --- a/tmpfiles.template +++ b/tmpfiles.template @@ -1,2 +1,3 @@ +d ${STATE_DIRECTORY}/kubelet - - - - - d /var/lib/cni - - - - - d /var/run/secrets - - - - - From ae31c736a5d3f29916476c2f8915cd2ce43cf8d3 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 15 Mar 2018 15:46:38 +0000 Subject: [PATCH 10/14] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 68e4788..a5d9dba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=12 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=13 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 0ac8943510f3a771559018e273cea3db0911a793 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Thu, 29 Mar 2018 15:02:09 +0000 Subject: [PATCH 11/14] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a5d9dba..9dd7b08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=13 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=14 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From 1c1d41dbada90e9b2620ea20e4f789111494e24e Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 20 Apr 2018 14:52:05 +0000 Subject: [PATCH 12/14] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9dd7b08..5ef9c95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=14 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=15 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From b0d70454f3045e8a4a341467f087855cc8efd55e Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 21 May 2018 16:21:17 +0000 Subject: [PATCH 13/14] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5ef9c95..9a755dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=15 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=16 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \ From eb3c83a1875cec936d37e45043385cf2e75b6785 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Tue, 17 Jul 2018 20:11:45 +0000 Subject: [PATCH 14/14] "Bump RELEASE for automatic rebuild" --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9a755dd..1183510 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" ENV container=docker -ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=16 ARCH=x86_64 +ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=17 ARCH=x86_64 LABEL BZComponent="$NAME" \ name="$FGC/$NAME" \ version="$VERSION" \