Skip to content

Commit

Permalink
add deps, add kubelet entry script
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonbrooks committed Feb 7, 2017
1 parent 78404cd commit a4615d6
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
6 changes: 4 additions & 2 deletions kubernetes/kubelet/Dockerfile
Expand Up @@ -5,10 +5,12 @@ MAINTAINER The CentOS Project <cloud-ops@centos.org>
# properly in a container, so we skip installing it

# Containerized kubelet requires nsenter
RUN yum install -y util-linux && yum clean all
RUN yum install -y util-linux ethtool && yum clean all

# cAdvisor wants /etc/machine-id
# containerized kubelet needs /:/rootfs and /var/lib/kubelet to mount volumes
LABEL RUN='/usr/bin/docker run -d --privileged --net=host ${OPT1} -v /sys:/sys:ro -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker -v /etc/machine-id:/etc/machine-id:ro -v /var/lib/kubelet:/var/lib/kubelet -v /:/rootfs --name ${NAME} ${IMAGE} ${OPT3}'

ENTRYPOINT ["/usr/bin/kubelet"]
COPY launch.sh /usr/bin/kubelet-docker.sh

ENTRYPOINT ["/usr/bin/kubelet-docker.sh"]
8 changes: 8 additions & 0 deletions kubernetes/kubelet/launch.sh
@@ -0,0 +1,8 @@
#!/bin/bash

source /etc/kubernetes/kubelet
source /etc/kubernetes/config

ARGS=$(echo "$@ $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
2 changes: 1 addition & 1 deletion kubernetes/node/Dockerfile
Expand Up @@ -2,4 +2,4 @@ FROM centos:centos7
MAINTAINER The CentOS Project <cloud-ops@centos.org>

RUN yum -y update && yum clean all
RUN yum install -y kubernetes-node && yum clean all
RUN yum install -y kubernetes-node findutils && yum clean all
2 changes: 1 addition & 1 deletion kubernetes/proxy/Dockerfile
@@ -1,7 +1,7 @@
FROM centos/kubernetes-node
MAINTAINER The CentOS Project <cloud-ops@centos.org>

RUN yum install -y iptables && yum clean all
RUN yum install -y iptables conntrack-tools && yum clean all

LABEL RUN='/usr/bin/docker run -d --net=host --privileged ${OPT1} --name ${NAME} ${IMAGE} ${OPT3}'

Expand Down

0 comments on commit a4615d6

Please sign in to comment.