Merge pull request #5178 from dims/patch-1

Add a FIXME and don't log about insecure ports
This commit is contained in:
k8s-ci-robot 2018-05-26 14:22:41 -07:00 committed by GitHub
commit ad60dbd63d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions

View File

@ -26,7 +26,6 @@ import (
"k8s.io/kops/upup/pkg/fi/loader"
"github.com/blang/semver"
"github.com/golang/glog"
)
// KubeAPIServerOptionsBuilder adds options for the apiserver to the model
@ -245,14 +244,8 @@ func (b *KubeAPIServerOptionsBuilder) BuildOptions(o interface{}) error {
c.AnonymousAuth = fi.Bool(false)
}
// We disable the insecure port from 1.6 onwards
if b.IsKubernetesGTE("1.6") {
c.InsecurePort = 0
glog.V(4).Infof("Enabling apiserver insecure port, for healthchecks (issue #43784)")
c.InsecurePort = 8080
} else {
c.InsecurePort = 8080
}
// FIXME : Disable the insecure port when kubernetes issue #43784 is fixed
c.InsecurePort = 8080
return nil
}