Skip to content

Commit

Permalink
init-cloud exist if the selinux did not enabled (#335)
Browse files Browse the repository at this point in the history
  • Loading branch information
hchenxa authored and k8s-ci-robot committed Apr 29, 2019
1 parent 46fb8bd commit 918069a
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#!/bin/bash
#!/usr/bin/env bash
set -e
set -x
(
KUBELET_VERSION={{ .Machine.Spec.Versions.Kubelet }}
VERSION=v${KUBELET_VERSION}
NAMESPACE={{ .Machine.ObjectMeta.Namespace }}
MACHINE=$NAMESPACE
MACHINE+="/"
Expand Down Expand Up @@ -58,25 +57,31 @@ gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cl
exclude=kube*
EOF

setenforce 0
yum install -y kubelet-$CONTROL_PLANE_VERSION kubeadm-$CONTROL_PLANE_VERSION kubectl-$CONTROL_PLANE_VERSION --disableexcludes=kubernetes
if [[ $(getenforce) != 'Disabled' ]]; then
setenforce 0
fi

yum install -y kubelet-$KUBELET_VERSION kubeadm-$KUBELET_VERSION kubectl-$KUBELET_VERSION --disableexcludes=kubernetes

function install_configure_docker () {
# prevent docker from auto-starting
echo "exit 101" > /usr/sbin/policy-rc.d
chmod +x /usr/sbin/policy-rc.d
trap "rm /usr/sbin/policy-rc.d" RETURN
yum install -y docker
echo 'OPTIONS="--selinux-enabled --log-driver=journald --signature-verification=false --iptables=false --ip-masq=false"' >> /etc/sysconfig/docker
echo 'OPTIONS="--log-driver=journald --signature-verification=false --iptables=false --ip-masq=false"' >> /etc/sysconfig/docker
systemctl daemon-reload
systemctl enable docker
systemctl start docker
}

install_configure_docker

# Get docker cgroup driver for kubelet configuration
CG_DRIVER=$(docker info --format '{{.CgroupDriver}}')

cat <<EOF > /etc/default/kubelet
KUBELET_KUBEADM_EXTRA_ARGS=--cgroup-driver=systemd
KUBELET_KUBEADM_EXTRA_ARGS=--cgroup-driver=$CG_DRIVER
EOF

systemctl enable kubelet.service
Expand Down Expand Up @@ -175,4 +180,3 @@ chown $(id -u):$(id -g) /root/.kube/config

echo done.
) 2>&1 | tee /var/log/startup.log

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -e
set -x
(
Expand Down Expand Up @@ -26,7 +26,11 @@ EOF
swapoff -a
# disable swap in fstab
sed -i.bak -r 's/(.+ swap .+)/#\1/' /etc/fstab
setenforce 0

if [[ $(getenforce) != 'Disabled' ]]; then
setenforce 0
fi

yum install -y kubelet-$KUBELET_VERSION kubeadm-$KUBELET_VERSION kubectl-$KUBELET_VERSION --disableexcludes=kubernetes

function install_configure_docker () {
Expand All @@ -35,14 +39,17 @@ function install_configure_docker () {
chmod +x /usr/sbin/policy-rc.d
trap "rm /usr/sbin/policy-rc.d" RETURN
yum install -y docker
echo 'OPTIONS="--selinux-enabled --log-driver=journald --signature-verification=false --iptables=false --ip-masq=false"' >> /etc/sysconfig/docker
echo 'OPTIONS="--log-driver=journald --signature-verification=false --iptables=false --ip-masq=false"' >> /etc/sysconfig/docker
systemctl daemon-reload
systemctl enable docker
systemctl start docker
}

install_configure_docker

# Get docker cgroup driver for kubelet configuration
CG_DRIVER=$(docker info --format '{{.CgroupDriver}}')

# Write the cloud.conf so that the kubelet can use it.
echo $OPENSTACK_CLOUD_PROVIDER_CONF | base64 -d > /etc/kubernetes/cloud.conf
mkdir /etc/certs
Expand All @@ -68,7 +75,7 @@ nodeRegistration:
EOF

cat <<EOF > /etc/default/kubelet
KUBELET_KUBEADM_EXTRA_ARGS=--cgroup-driver=systemd
KUBELET_KUBEADM_EXTRA_ARGS=--cgroup-driver=$CG_DRIVER
EOF
systemctl enable kubelet.service

Expand All @@ -84,4 +91,3 @@ done

echo done.
) 2>&1 | tee /var/log/startup.log

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -e
set -x
(
Expand Down Expand Up @@ -205,4 +205,3 @@ done
kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.5/getting-started/kubernetes/installation/hosted/kubernetes-datastore/calico-networking/1.7/calico.yaml
echo done.
) 2>&1 | tee /var/log/startup.log

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -e
set -x
(
Expand Down Expand Up @@ -109,7 +109,7 @@ Environment="KUBELET_DNS_ARGS=--cluster-dns=${CLUSTER_DNS_SERVER} --cluster-doma
EOF
systemctl daemon-reload
systemctl restart kubelet.service
systemctl disable ufw
systemctl disable ufw
systemctl mask ufw

kubeadm -v 10 join --ignore-preflight-errors=all --config /etc/kubernetes/kubeadm_config.yaml
Expand All @@ -119,4 +119,3 @@ for tries in $(seq 1 60); do
done
echo done.
) 2>&1 | tee /var/log/startup.log

0 comments on commit 918069a

Please sign in to comment.