container/kubernetes-kubelet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: container:rawhide
Branches Tags
container:rawhide
container:f30
container:main
container:f28
container:f27
container:f29
container:f26
container:f25
..
compare: container:f26
Branches Tags
container:f30
container:main
container:rawhide
container:f28
container:f27
container:f29
container:f26
container:f25

6 commits
rawhide ... f26

Author SHA1 Message Date
Adam Miller
f4e3ba3e71 Bump RELEASE for automatic rebuild 2017-11-14 16:43:14 -06:00
Adam Miller
12f39af772 Bump RELEASE for automatic rebuild 2017-09-21 15:06:53 -05:00
Adam Miller
cd687b15bb Bump RELEASE for automatic rebuild 2017-08-24 18:01:10 -05:00
Jason Brooks
5d74086904 make init file executable 2017-08-16 21:23:28 -07:00
Jason Brooks
6f2ac8faf0 don't sort args, Mount /dev to allow block storage support 2017-07-24 18:19:46 -07:00
Jason Brooks
8bf131dcbc import from rawhide 2017-07-07 09:47:55 -07:00
4 changed files with 34 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Dockerfile
View file

@ -1,26 +1,25 @@
FROM registry.fedoraproject.org/kubernetes-node:29
FROM registry.fedoraproject.org/f26/kubernetes-node:latest
MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
ENV container=docker
ENV NAME=kubernetes-kubelet VERSION=0 ARCH=x86_64
ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=4 ARCH=x86_64
LABEL BZComponent="$NAME" \
name="$FGC/$NAME" \
version="$VERSION" \
release="$RELEASE.$DISTTAG" \
architecture="$ARCH" \
atomic.type='system' \
maintainer="Jason Brooks <jbrooks@redhat.com>"
atomic.type='system'
# Containerized kubelet requires nsenter
RUN dnf install -y --setopt=tsflags=nodocs util-linux ethtool systemd-udev e2fsprogs xfsprogs && dnf clean all
RUN dnf install -y util-linux ethtool systemd-udev e2fsprogs xfsprogs && dnf clean all
LABEL RUN /usr/bin/docker run -d --privileged --net=host --pid=host -v /:/rootfs:ro -v /sys:/sys:rw -v /var/run:/var/run:rw -v /run:/run:rw -v /var/lib/docker:/var/lib/docker:rw -v /var/lib/kubelet:/var/lib/kubelet:slave -v /var/log/containers:/var/log/containers:rw
COPY launch.sh /usr/bin/kubelet-docker.sh
COPY manifest.json tmpfiles.template service.template config.json.template /exports/
COPY service.template config.json.template /exports/
RUN mkdir -p /exports/hostfs/etc/cni/net.d && \
mkdir -p /exports/hostfs/etc/kubernetes && \
cp /etc/kubernetes/{config,kubelet} /exports/hostfs/etc/kubernetes
RUN mkdir -p /exports/hostfs/etc/kubernetes && cp /etc/kubernetes/{config,kubelet} /exports/hostfs/etc/kubernetes
ENTRYPOINT ["/usr/bin/kubelet-docker.sh"]

76
config.json.template
View file

@ -232,9 +232,9 @@
"source": "proc"
},
{
"source": "/dev",
"destination": "/dev",
"type": "bind",
"source": "/dev",
"options": [
"rbind",
"rslave"
@ -266,24 +266,26 @@
]
},
{
"type": "bind",
"source": "/sys",
"destination": "/sys",
"type": "sysfs",
"source": "sysfs",
"options": [
"rbind",
"rw"
"nosuid",
"noexec",
"nodev"
]
},
{
"type": "bind",
"source": "/etc/cni/net.d",
"destination": "/etc/cni/net.d",
"options": [
"bind",
"slave",
"rw",
"mode=777"
]
"destination": "/sys/fs/cgroup",
"type": "cgroup",
"source": "cgroup",
"options": [
"nosuid",
"noexec",
"nodev",
"relatime",
"ro"
]
},
{
"type": "bind",
@ -295,31 +297,14 @@
"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",
"bind"
"rbind",
"rprivate"
]
},
{
@ -334,8 +319,8 @@
},
{
"type": "bind",
"source": "/var/run/secrets",
"destination": "/var/run/secrets",
"source": "/var/run/",
"destination": "/var/run/",
"options": [
"rbind",
"rw",
@ -344,7 +329,7 @@
},
{
"type": "bind",
"source": "${RUN_DIRECTORY}",
"source": "/run",
"destination": "/run",
"options": [
"rbind",
@ -354,7 +339,7 @@
},
{
"type": "bind",
"source": "${STATE_DIRECTORY}",
"source": "/var/lib",
"destination": "/var/lib",
"options": [
"bind",
@ -364,11 +349,11 @@
},
{
"type": "bind",
"source": "${STATE_DIRECTORY}/kubelet",
"source": "/var/lib/kubelet",
"destination": "/var/lib/kubelet",
"options": [
"rbind",
"rshared",
"rslave",
"rw",
"mode=755"
]
@ -382,17 +367,7 @@
"rw",
"mode=755"
]
},
{
"destination": "/tmp",
"type": "tmpfs",
"source": "tmpfs",
"options": [
"mode=755",
"size=65536k"
]
}
$ADDTL_MOUNTS
],
"linux": {
"rootfsPropagation": "rslave",
@ -410,6 +385,7 @@
}
],
"devices": null,
"apparmorProfile": ""
"apparmorProfile": "",
"selinuxProcessLabel": ""
}
}

6
manifest.json
View file

@ -1,6 +0,0 @@
{
"version": "1.0",
"defaultValues": {
"ADDTL_MOUNTS": ""
}
}

3
tmpfiles.template
View file

@ -1,3 +0,0 @@
d ${STATE_DIRECTORY}/kubelet - - - - -
d /var/lib/cni - - - - -
d /var/run/secrets - - - - -