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

Allow override of "kubernetes" endpoint port

k3s-v1.14.6
Darren Shepherd 2018-10-08 11:07:42 -07:00 committed by Erik Wilson
parent d50088fcfa
commit ae595d76e6
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apiserver/pkg/server/config.go
View File

@ -217,6 +217,8 @@ type SecureServingInfo struct {
// HTTP2MaxStreamsPerConnection is the limit that the api server imposes on each client.
// A value of zero means to use the default provided by golang's HTTP/2 support.
HTTP2MaxStreamsPerConnection int
AdvertisePort int
}
type AuthenticationInfo struct {
@ -537,6 +539,9 @@ func (s *SecureServingInfo) HostPort() (string, int, error) {
if err != nil {
return "", 0, fmt.Errorf("invalid non-numeric port %q", portStr)
}
if s.AdvertisePort != 0 {
port = s.AdvertisePort
}
return host, port, nil
}

6
staging/src/k8s.io/apiserver/pkg/server/options/serving.go
View File

@ -66,6 +66,8 @@ type SecureServingOptions struct {
// HTTP2MaxStreamsPerConnection is the limit that the api server imposes on each client.
// A value of zero means to use the default provided by golang's HTTP/2 support.
HTTP2MaxStreamsPerConnection int
AdvertisePort int
}
type CertKey struct {
@ -153,6 +155,8 @@ func (s *SecureServingOptions) AddFlags(fs *pflag.FlagSet) {
}
fs.IntVar(&s.BindPort, "secure-port", s.BindPort, desc)
fs.IntVar(&s.AdvertisePort, "advertise-port", s.AdvertisePort, "The port that will be advertised as kubernetes endpoints")
fs.StringVar(&s.ServerCert.CertDirectory, "cert-dir", s.ServerCert.CertDirectory, ""+
"The directory where the TLS certs are located. "+
"If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored.")
@ -265,6 +269,8 @@ func (s *SecureServingOptions) ApplyTo(config **server.SecureServingInfo) error
return err
}
c.AdvertisePort = s.AdvertisePort
return nil
}