Compare commits

..

15 commits

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
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 29 additions and 22 deletions

View file

@ -1,23 +1,24 @@
FROM registry.fedoraproject.org/kubernetes-node:29
FROM registry.fedoraproject.org/f27/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=17 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 && 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 tmpfiles.template service.template config.json.template /exports/
RUN mkdir -p /exports/hostfs/etc/cni/net.d && \
mkdir -p /exports/hostfs/etc/kubernetes && \

View file

@ -232,12 +232,14 @@
"source": "proc"
},
{
"source": "/dev",
"destination": "/dev",
"type": "bind",
"type": "tmpfs",
"source": "tmpfs",
"options": [
"rbind",
"rslave"
"nosuid",
"strictatime",
"mode=755",
"size=65536k"
]
},
{
@ -265,6 +267,16 @@
"size=65536k"
]
},
{
"destination": "/dev/mqueue",
"type": "mqueue",
"source": "mqueue",
"options": [
"nosuid",
"noexec",
"nodev"
]
},
{
"type": "bind",
"source": "/sys",
@ -368,7 +380,7 @@
"destination": "/var/lib/kubelet",
"options": [
"rbind",
"rshared",
"rslave",
"rw",
"mode=755"
]
@ -385,21 +397,20 @@
},
{
"destination": "/tmp",
"type": "tmpfs",
"type": "tmpfs",
"source": "tmpfs",
"options": [
"mode=755",
"size=65536k"
]
}
$ADDTL_MOUNTS
],
"linux": {
"rootfsPropagation": "rslave",
"resources": {
"devices": [
{
"allow": true,
"allow": false,
"access": "rwm"
}
]
@ -410,6 +421,7 @@
}
],
"devices": null,
"apparmorProfile": ""
"apparmorProfile": "",
"selinuxProcessLabel": ""
}
}

View file

@ -5,6 +5,6 @@ source /etc/kubernetes/config
TEMP_KUBELET_ARGS='--cgroup-driver=systemd --cgroups-per-qos=false --enforce-node-allocatable='
ARGS="$@ $TEMP_KUBELET_ARGS $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBELET_API_SERVER $KUBELET_ADDRESS $KUBELET_PORT $KUBELET_HOSTNAME $KUBE_ALLOW_PRIV $KUBELET_ARGS"
ARGS=$(echo "$@ $TEMP_KUBELET_ARGS $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBELET_API_SERVER $KUBELET_ADDRESS $KUBELET_PORT $KUBELET_HOSTNAME $KUBE_ALLOW_PRIV $KUBELET_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs)
exec /usr/bin/kubelet $ARGS --containerized

View file

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