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

Compare commits

merge into: container:rawhide
Branches Tags
container:rawhide
container:f30
container:main
container:f28
container:f27
container:f29
container:f26
container:f25
...
pull from: container:f27
Branches Tags
container:f30
container:main
container:rawhide
container:f28
container:f27
container:f29
container:f26
container:f25
Sign in to create a new pull request.

15 commits
rawhide ... f27

Author SHA1 Message Date
Mohan Boddu
eb3c83a187 "Bump RELEASE for automatic rebuild" 2018-07-17 20:11:45 +00:00
Mohan Boddu
b0d70454f3 "Bump RELEASE for automatic rebuild" 2018-05-21 16:21:17 +00:00
Mohan Boddu
1c1d41dbad "Bump RELEASE for automatic rebuild" 2018-04-20 14:52:05 +00:00
Mohan Boddu
0ac8943510 "Bump RELEASE for automatic rebuild" 2018-03-29 15:02:09 +00:00
Mohan Boddu
ae31c736a5 "Bump RELEASE for automatic rebuild" 2018-03-15 15:46:38 +00:00
Jason Brooks
54c24f124d Add ${STATE_DIR}/kubelet to tmpfiles 2018-03-02 13:21:35 -08:00
Mohan Boddu
eedb5cf409 "Bump RELEASE for automatic rebuild" 2018-03-01 19:11:48 +00:00
Mohan Boddu
3df2149318 "Bump RELEASE for automatic rebuild" 2018-03-01 17:20:29 +00:00
Jason Brooks
972518ad86 bump release 2018-02-13 10:55:19 -08:00
Jason Brooks
1bc39006dd Merge branch 'f27' of ssh://pkgs.fedoraproject.org/container/kubernetes-kubelet into f27 2018-02-13 10:53:35 -08:00
Jason Brooks
3101b1d171 Update kubelet based openshift/node 
see: https://github.com/projectatomic/atomic-system-containers/pull/161
 2018-02-13 10:52:47 -08:00
Mohan Boddu
1cb41cb0be "Bump RELEASE for automatic rebuild" 2018-01-10 13:57:19 +00:00
Jason Brooks
6f2ac0a46c make run script executable 2017-11-27 17:20:47 -08:00
Adam Miller
bec335d375 Bump RELEASE for automatic rebuild 2017-11-14 17:36:01 -06:00
Jason Brooks
700ff95b86 set FROM for 27, set version to 0 2017-11-01 14:37:52 -07:00
4 changed files with 54 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -3,7 +3,7 @@ MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
ENV container=docker
ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=8 ARCH=x86_64
ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=17 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"]

68
config.json.template
View file

@ -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": {

0
launch.sh Normal file → Executable file
View file

3
tmpfiles.template Normal file
View file

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