summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh16
1 files changed, 0 insertions, 16 deletions
diff --git a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
index 8c6aa90..6abe776 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/configure-kubernetes-master.sh
@@ -5,8 +5,6 @@
5echo "configuring kubernetes (master)" 5echo "configuring kubernetes (master)"
6 6
7_prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/} 7_prefix=${CONTAINER_INFRA_PREFIX:-docker.io/openstackmagnum/}
8atomic install --storage ostree --system --system-package=no --name=kubelet ${_prefix}kubernetes-kubelet:${KUBE_TAG}
9atomic install --storage ostree --system --system-package=no --name=kube-proxy ${_prefix}kubernetes-proxy:${KUBE_TAG}
10atomic install --storage ostree --system --system-package=no --name=kube-apiserver ${_prefix}kubernetes-apiserver:${KUBE_TAG} 8atomic install --storage ostree --system --system-package=no --name=kube-apiserver ${_prefix}kubernetes-apiserver:${KUBE_TAG}
11atomic install --storage ostree --system --system-package=no --name=kube-controller-manager ${_prefix}kubernetes-controller-manager:${KUBE_TAG} 9atomic install --storage ostree --system --system-package=no --name=kube-controller-manager ${_prefix}kubernetes-controller-manager:${KUBE_TAG}
12atomic install --storage ostree --system --system-package=no --name=kube-scheduler ${_prefix}kubernetes-scheduler:${KUBE_TAG} 10atomic install --storage ostree --system --system-package=no --name=kube-scheduler ${_prefix}kubernetes-scheduler:${KUBE_TAG}
@@ -66,23 +64,9 @@ sed -i '
66 64
67sed -i '/^KUBE_SCHEDULER_ARGS=/ s/=.*/="--leader-elect=true"/' /etc/kubernetes/scheduler 65sed -i '/^KUBE_SCHEDULER_ARGS=/ s/=.*/="--leader-elect=true"/' /etc/kubernetes/scheduler
68 66
69HOSTNAME_OVERRIDE=$(hostname --short | sed 's/\.novalocal//')
70KUBELET_ARGS="--register-node=true --register-schedulable=false --pod-manifest-path=/etc/kubernetes/manifests --hostname-override=${HOSTNAME_OVERRIDE}"
71KUBELET_ARGS="${KUBELET_ARGS} --cluster_dns=${DNS_SERVICE_IP} --cluster_domain=${DNS_CLUSTER_DOMAIN}"
72
73# For using default log-driver, other options should be ignored 67# For using default log-driver, other options should be ignored
74sed -i 's/\-\-log\-driver\=journald//g' /etc/sysconfig/docker 68sed -i 's/\-\-log\-driver\=journald//g' /etc/sysconfig/docker
75 69
76KUBELET_ARGS="${KUBELET_ARGS} --pod-infra-container-image=${CONTAINER_INFRA_PREFIX:-gcr.io/google_containers/}pause:3.0"
77if [ -n "${INSECURE_REGISTRY_URL}" ]; then 70if [ -n "${INSECURE_REGISTRY_URL}" ]; then
78 echo "INSECURE_REGISTRY='--insecure-registry ${INSECURE_REGISTRY_URL}'" >> /etc/sysconfig/docker 71 echo "INSECURE_REGISTRY='--insecure-registry ${INSECURE_REGISTRY_URL}'" >> /etc/sysconfig/docker
79fi 72fi
80
81# specified cgroup driver
82KUBELET_ARGS="${KUBELET_ARGS} --cgroup-driver=systemd"
83
84sed -i '
85 /^KUBELET_ADDRESS=/ s/=.*/="--address=0.0.0.0"/
86 /^KUBELET_HOSTNAME=/ s/=.*/=""/
87 /^KUBELET_ARGS=/ s|=.*|="'"$KUBELET_ARGS"'"|
88' /etc/kubernetes/kubelet