github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-07 12:11:43 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request #6309 from GoogleCloudPlatform/revert-6243-kubelet-ssl"

Browse Source 
This reverts commit 96a0a0d618, reversing
changes made to 2af9b54147.
This commit is contained in:
Robert Bailey
2015-04-01 16:19:17 -07:00
parent acdce749a3
commit f15e34a1bf
9 changed files with 126 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/controllermanager.go
View File

@@ -83,7 +83,7 @@ func NewCMServer() *CMServer {
SyncNodeStatus: false,
KubeletConfig: client.KubeletConfig{
Port: ports.KubeletPort,
EnableHttps: false,
EnableHttps: true,
HTTPTimeout: time.Duration(5) * time.Second,
},
}