From f2a29676b888fc0c5bc031eb6fca01c25829093b Mon Sep 17 00:00:00 2001 From: zouyee Date: Tue, 21 Aug 2018 11:06:44 +0800 Subject: [PATCH] Supplementary information for common flags and add restart second config --- cluster/centos/master/scripts/apiserver.sh | 2 ++ cluster/centos/master/scripts/controller-manager.sh | 3 ++- cluster/centos/master/scripts/scheduler.sh | 4 +++- cluster/centos/node/scripts/kubelet.sh | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cluster/centos/master/scripts/apiserver.sh b/cluster/centos/master/scripts/apiserver.sh index 89e834f903..be62549ce4 100755 --- a/cluster/centos/master/scripts/apiserver.sh +++ b/cluster/centos/master/scripts/apiserver.sh @@ -66,6 +66,8 @@ KUBE_SERVICE_ADDRESSES="--service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}" # LimitRanger, AlwaysDeny, SecurityContextDeny, NamespaceExists, # NamespaceLifecycle, NamespaceAutoProvision, AlwaysAdmit, # ServiceAccount, DefaultStorageClass, DefaultTolerationSeconds, ResourceQuota +# Mark Deprecated. Use --enable-admission-plugins or --disable-admission-plugins instead since v1.10. +# It will be removed in a future version. KUBE_ADMISSION_CONTROL="--admission-control=${ADMISSION_CONTROL}" # --client-ca-file="": If set, any request presenting a client certificate signed diff --git a/cluster/centos/master/scripts/controller-manager.sh b/cluster/centos/master/scripts/controller-manager.sh index 6fcbe6f9a0..218783b223 100755 --- a/cluster/centos/master/scripts/controller-manager.sh +++ b/cluster/centos/master/scripts/controller-manager.sh @@ -30,7 +30,8 @@ KUBE_CONTROLLER_MANAGER_ROOT_CA_FILE="--root-ca-file=/srv/kubernetes/ca.crt" # RSA key used to sign service account tokens. KUBE_CONTROLLER_MANAGER_SERVICE_ACCOUNT_PRIVATE_KEY_FILE="--service-account-private-key-file=/srv/kubernetes/server.key" -# --leader-elect +# --leader-elect: Start a leader election client and gain leadership before +# executing the main loop. Enable this when running replicated components for high availability. KUBE_LEADER_ELECT="--leader-elect" EOF diff --git a/cluster/centos/master/scripts/scheduler.sh b/cluster/centos/master/scripts/scheduler.sh index 2d9de3a21e..90fff183e6 100755 --- a/cluster/centos/master/scripts/scheduler.sh +++ b/cluster/centos/master/scripts/scheduler.sh @@ -27,9 +27,11 @@ KUBE_LOGTOSTDERR="--logtostderr=true" # --v=0: log level for V logs KUBE_LOG_LEVEL="--v=4" +# --master: The address of the Kubernetes API server (overrides any value in kubeconfig). KUBE_MASTER="--master=${MASTER_ADDRESS}:8080" -# --leader-elect +# --leader-elect: Start a leader election client and gain leadership before +# executing the main loop. Enable this when running replicated components for high availability. KUBE_LEADER_ELECT="--leader-elect" # Add your own! diff --git a/cluster/centos/node/scripts/kubelet.sh b/cluster/centos/node/scripts/kubelet.sh index a6c0e216da..88d6b149ef 100755 --- a/cluster/centos/node/scripts/kubelet.sh +++ b/cluster/centos/node/scripts/kubelet.sh @@ -87,6 +87,7 @@ EnvironmentFile=-/opt/kubernetes/cfg/kubelet ExecStart=/opt/kubernetes/bin/kubelet ${KUBELET_OPTS} Restart=on-failure KillMode=process +RestartSec=15s [Install] WantedBy=multi-user.target