openstack
/
magnum
Code Issues Proposed changes

Merge "k8s: Fix apiserver configuration"

This commit is contained in:
Jenkins 2017-07-24 08:13:14 +00:00 committed by Gerrit Code Review
parent d77047dd21 94ce3b00bd
commit ffe2ea4baa
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
View File

@ -33,13 +33,11 @@ fi
sed -i '
/^KUBE_API_ADDRESS=/ s/=.*/="'"${KUBE_API_ADDRESS}"'"/
/^KUBE_SERVICE_ADDRESSES=/ s|=.*|="--service-cluster-ip-range='"$PORTAL_NETWORK_CIDR"'"|
/^KUBE_API_ARGS=/ s/KUBE_API_ARGS.//
/^KUBE_API_ARGS=/ s|=.*|="'"${KUBE_API_ARGS}"'"|
/^KUBE_ETCD_SERVERS=/ s/=.*/="--etcd-servers=http:\/\/127.0.0.1:2379"/
/^KUBE_ADMISSION_CONTROL=/ s/=.*/="'"${KUBE_ADMISSION_CONTROL}"'"/
' /etc/kubernetes/apiserver
cat << _EOC_ >> /etc/kubernetes/apiserver
KUBE_API_ARGS="$KUBE_API_ARGS"
_EOC_
# Add controller manager args
KUBE_CONTROLLER_MANAGER_ARGS=""
@ -74,5 +72,5 @@ KUBELET_ARGS="${KUBELET_ARGS} --cgroup-driver=systemd"
sed -i '
/^KUBELET_ADDRESS=/ s/=.*/="--address=0.0.0.0"/
/^KUBELET_HOSTNAME=/ s/=.*/=""/
/^KUBELET_ARGS=/ s|=.*|='"$KUBELET_ARGS"'|
/^KUBELET_ARGS=/ s|=.*|="'"$KUBELET_ARGS"'"|
' /etc/kubernetes/kubelet