github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changed config-default.sh: deleting the DenyEscalatingExec option from ADMISSION_CONTROL, so kube-apiserver can start correctly. 

Changed util.sh: provision-* functions so every flannel interface is created after starting the etcd service and reconfDocker.sh with the "i" option is launched after every flannel interface is up and running.
pull/6/head
thaerlo 2015-10-01 13:27:39 +02:00 committed by Alfredo Espejel
parent b9cfab87e3
commit 6e6c5375d2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/ubuntu/util.sh
View File

@ -364,7 +364,7 @@ function provision-master() {
${PROXY_SETTING} sudo -E ~/kube/make-ca-cert.sh ${MASTER_IP} IP:${MASTER_IP},IP:${SERVICE_CLUSTER_IP_RANGE%.*}.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local; \
sudo mkdir -p /opt/bin/ && sudo cp ~/kube/master/* /opt/bin/; \
sudo service etcd start; \
sudo FLANNEL_NET=${FLANNEL_NET} -b ~/kube/reconfDocker.sh "a";"
sudo FLANNEL_NET=${FLANNEL_NET} ~/kube/reconfDocker.sh "a";"
}
function provision-node() {
@ -383,7 +383,7 @@ function provision-node() {
sudo -p '[sudo] password to start node: ' cp ~/kube/default/* /etc/default/ && sudo cp ~/kube/init_conf/* /etc/init/ && sudo cp ~/kube/init_scripts/* /etc/init.d/ \
&& sudo mkdir -p /opt/bin/ && sudo cp ~/kube/minion/* /opt/bin; \
sudo service flanneld start; \
sudo -b ~/kube/reconfDocker.sh "i";"
sudo ~/kube/reconfDocker.sh "i";"
}
function provision-masterandnode() {
@ -409,7 +409,7 @@ function provision-masterandnode() {
${PROXY_SETTING} sudo -E ~/kube/make-ca-cert.sh ${MASTER_IP} IP:${MASTER_IP},IP:${SERVICE_CLUSTER_IP_RANGE%.*}.1,DNS:kubernetes,DNS:kubernetes.default,DNS:kubernetes.default.svc,DNS:kubernetes.default.svc.cluster.local; \
sudo mkdir -p /opt/bin/ && sudo cp ~/kube/master/* /opt/bin/ && sudo cp ~/kube/minion/* /opt/bin/; \
sudo service etcd start; \
sudo FLANNEL_NET=${FLANNEL_NET} -b ~/kube/reconfDocker.sh "ai";"
sudo FLANNEL_NET=${FLANNEL_NET} ~/kube/reconfDocker.sh "ai";"
}
# Delete a kubernetes cluster