github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2708 from djs55/kubernetes-yaml

Browse Source 
kubernetes: allow yaml, CNI configuration to be provided via metadata
This commit is contained in:
Ian Campbell 2017-11-13 11:12:31 +00:00 committed by GitHub
commit 1490cad25f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/kubernetes/kubernetes/kubeadm-init.sh
View File

@ -10,7 +10,13 @@ if [ -f /etc/kubeadm/kubeadm.yaml ]; then
else
kubeadm init --skip-preflight-checks --kubernetes-version @KUBERNETES_VERSION@ $@
fi
for i in /etc/kubeadm/kube-system.init/*.yaml ; do
if [ -d /var/config/cni/etc/net.d ]; then
cp /var/config/cni/etc/net.d/* /var/lib/cni/etc/net.d/
fi
# sorting by basename relies on the dirnames having the same number of directories
YAML=$(ls -1 /var/config/kube-system.init/*.yaml /etc/kubeadm/kube-system.init/*.yaml 2>/dev/null | sort --field-separator=/ --key=5)
for i in ${YAML}; do
n=$(basename "$i")
if [ -e "$i" ] ; then
if [ ! -s "$i" ] ; then # ignore zero sized files