diff --git a/cluster/images/hyperkube/Dockerfile b/cluster/images/hyperkube/Dockerfile index d5abe8a4fb63e..c64697f74e99a 100644 --- a/cluster/images/hyperkube/Dockerfile +++ b/cluster/images/hyperkube/Dockerfile @@ -32,6 +32,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y \ nfs-common \ glusterfs-client \ cifs-utils \ + ceph-common \ && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \ && DEBIAN_FRONTEND=noninteractive apt-get autoremove -y \ && DEBIAN_FRONTEND=noninteractive apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # CACHEBUST @@ -90,3 +91,6 @@ RUN ln -s /hyperkube /apiserver \ # Copy the hyperkube binary COPY hyperkube /hyperkube + +# Add CAP_NET_BIND_SERVICE to hyperkube so it can bind privileged ports as non-root. +RUN setcap cap_net_bind_service=+ep /hyperkube diff --git a/cluster/images/hyperkube/Makefile b/cluster/images/hyperkube/Makefile index 1273c08019173..257aeb400820a 100644 --- a/cluster/images/hyperkube/Makefile +++ b/cluster/images/hyperkube/Makefile @@ -111,6 +111,8 @@ else endif # Download CNI curl -sSL --retry 5 https://storage.googleapis.com/kubernetes-release/network-plugins/cni-${ARCH}-${CNI_RELEASE}.tar.gz | tar -xz -C ${TEMP_DIR}/cni-bin + curl -sSL --retry 5 -o ${TEMP_DIR}/cni-bin/bin/calico https://github.com/projectcalico/calico-cni/releases/download/v1.11.0/calico + chmod +x ${TEMP_DIR}/cni-bin/bin/calico docker build --pull -t ${REGISTRY}/hyperkube-${ARCH}:${VERSION} ${TEMP_DIR} rm -rf "${TEMP_DIR}"