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

Compare commits

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

8 commits
f27 ... rawhide

Author SHA1 Message Date
Jason Brooks
28f98bfc6e Merge #1 Drop Release label in favor of OSBS release_bump plugin 2018-08-29 16:34:58 +00:00
Bhavin Gandhi
99636e7114 Use 29 tag for f29 branch 
Signed-off-by: Bhavin Gandhi <bhavin7392@gmail.com>
 2018-08-26 23:24:01 +05:30
Bhavin Gandhi
c338dca994 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 <bhavin7392@gmail.com>
 2018-08-26 23:22:00 +05:30
Bhavin Gandhi
cf334d024a 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 <bhavin7392@gmail.com>
 2018-08-26 23:19:59 +05:30
Jason Brooks
99dce7ecad fix BZComponent capitalization 2018-05-17 13:52:04 -07:00
Jason Brooks
502959b2aa from rawhide 2018-03-20 13:20:48 -07:00
Jason Brooks
87638b8689 * FROM f28 
* Add ${STATE_DIR}/kubelet to tmpfiles
* Add kubelet system-container ADDLT_MOUNTS
* Update kubelet based openshift/node
* Enable mount propagation in /var/lib/kubelet
 2018-03-20 13:15:27 -07:00
Jason Brooks
ab4a89ee75 make launch executable 2017-11-28 12:57:37 -08:00
4 changed files with 22 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Dockerfile
View file

@ -1,24 +1,23 @@
FROM registry.fedoraproject.org/f27/kubernetes-node:latest
MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
FROM registry.fedoraproject.org/kubernetes-node:29
ENV container=docker
ENV NAME=kubernetes-kubelet VERSION=0 RELEASE=17 ARCH=x86_64
ENV NAME=kubernetes-kubelet VERSION=0 ARCH=x86_64
LABEL BZComponent="$NAME" \
name="$FGC/$NAME" \
version="$VERSION" \
release="$RELEASE.$DISTTAG" \
architecture="$ARCH" \
atomic.type='system'
atomic.type='system' \
maintainer="Jason Brooks <jbrooks@redhat.com>"
# Containerized kubelet requires nsenter
RUN dnf install -y util-linux ethtool && dnf clean all
RUN dnf install -y --setopt=tsflags=nodocs 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 tmpfiles.template service.template config.json.template /exports/
COPY manifest.json tmpfiles.template service.template config.json.template /exports/
RUN mkdir -p /exports/hostfs/etc/cni/net.d && \
mkdir -p /exports/hostfs/etc/kubernetes && \

30
config.json.template
View file

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

2
launch.sh
View file

@ -5,6 +5,6 @@ source /etc/kubernetes/config
TEMP_KUBELET_ARGS='--cgroup-driver=systemd --cgroups-per-qos=false --enforce-node-allocatable='
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)
ARGS="$@ $TEMP_KUBELET_ARGS $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBELET_API_SERVER $KUBELET_ADDRESS $KUBELET_PORT $KUBELET_HOSTNAME $KUBE_ALLOW_PRIV $KUBELET_ARGS"
exec /usr/bin/kubelet $ARGS --containerized

6
manifest.json Normal file
View file

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