1
0
mirror of https://github.com/rancher/rke.git synced 2025-08-31 14:36:32 +00:00

Merge pull request #463 from galal-hussein/fix_kubeapi_param

fix kubelet and kubeapi params
This commit is contained in:
Alena Prokharchyk
2018-03-30 15:48:15 -07:00
committed by GitHub

View File

@@ -92,7 +92,7 @@ func (c *Cluster) BuildKubeAPIProcess() v3.Process {
"insecure-port": "0",
"secure-port": "6443",
"cloud-provider": c.CloudProvider.Name,
"allow_privileged": "true",
"allow-privileged": "true",
"kubelet-preferred-address-types": "InternalIP,ExternalIP,Hostname",
"service-cluster-ip-range": c.Services.KubeAPI.ServiceClusterIPRange,
"admission-control": "ServiceAccount,NamespaceLifecycle,LimitRanger,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds",
@@ -254,7 +254,6 @@ func (c *Cluster) BuildKubeletProcess(host *hosts.Host) v3.Process {
"client-ca-file": pki.GetCertPath(pki.CACertName),
"anonymous-auth": "false",
"volume-plugin-dir": "/var/lib/kubelet/volumeplugins",
"require-kubeconfig": "True",
"fail-swap-on": strconv.FormatBool(c.Services.Kubelet.FailSwapOn),
}
if host.Address != host.InternalAddress {