github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

kube-controller-manager: enable secure ports 10257, deprecate insecure port

pull/8/head
Dr. Stefan Schimanski 2018-08-07 11:13:01 +02:00
parent e45d74d00d
commit eb27b61cdb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kube-controller-manager/app/options/options.go
View File

@ -191,10 +191,7 @@ func NewKubeControllerManagerOptions() (*KubeControllerManagerOptions, error) {
s.SecureServing.ServerCert.CertDirectory = "/var/run/kubernetes" s.SecureServing.ServerCert.CertDirectory = "/var/run/kubernetes"
s.SecureServing.ServerCert.PairName = "kube-controller-manager" s.SecureServing.ServerCert.PairName = "kube-controller-manager"
s.SecureServing.BindPort = ports.KubeControllerManagerPort
// disable secure serving for now
// TODO: enable HTTPS by default
s.SecureServing.BindPort = 0
gcIgnoredResources := make([]componentconfig.GroupResource, 0, len(garbagecollector.DefaultIgnoredResources())) gcIgnoredResources := make([]componentconfig.GroupResource, 0, len(garbagecollector.DefaultIgnoredResources()))
for r := range garbagecollector.DefaultIgnoredResources() { for r := range garbagecollector.DefaultIgnoredResources() {

4
pkg/master/ports/ports.go
View File

@ -28,6 +28,7 @@ const (
SchedulerPort = 10251 SchedulerPort = 10251
// InsecureKubeControllerManagerPort is the default port for the controller manager status server. // InsecureKubeControllerManagerPort is the default port for the controller manager status server.
// May be overridden by a flag at startup. // May be overridden by a flag at startup.
// Deprecated: use the secure KubeControllerManagerPort instead.
InsecureKubeControllerManagerPort = 10252 InsecureKubeControllerManagerPort = 10252
// InsecureCloudControllerManagerPort is the default port for the cloud controller manager server. // InsecureCloudControllerManagerPort is the default port for the cloud controller manager server.
// This value may be overridden by a flag at startup. // This value may be overridden by a flag at startup.
@ -41,4 +42,7 @@ const (
// ProxyHealthzPort is the default port for the proxy healthz server. // ProxyHealthzPort is the default port for the proxy healthz server.
// May be overridden by a flag at startup. // May be overridden by a flag at startup.
ProxyHealthzPort = 10256 ProxyHealthzPort = 10256
// KubeControllerManagerPort is the default port for the controller manager status server.
// May be overridden by a flag at startup.
KubeControllerManagerPort = 10257
) )