kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #58097 from steveperry-53/ipv6 

Automatic merge from submit-queue (batch tested with PRs 59391, 58097, 60057, 60090). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Add IPv6 to command options.

**What this PR does / why we need it**:
This PR adds IPv6 information to the descriptions for several command options.

[Related PR in kubernetes/website](https://github.com/kubernetes/website/pull/6498)

**Release note**:

```release-note
NONE
```

Kubernetes-commit: b3099bcf532bc470ff7075e93025b8741da09be4
This commit is contained in:
Kubernetes Publisher 2018-02-20 13:51:32 -08:00
parent 7a2bcc8b53 2aca9afa1d
commit 0cca544c01
2 changed files with 251 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

496
Godeps/Godeps.json generated
View File

File diff suppressed because it is too large Load Diff

5
pkg/server/options/serving.go
View File

@ -110,8 +110,9 @@ func (s *SecureServingOptions) AddFlags(fs *pflag.FlagSet) {
}
fs.IPVar(&s.BindAddress, "bind-address", s.BindAddress, ""+
"The IP address on which to listen for the --secure-port port. If blank, all interfaces will be used (0.0.0.0).")
"The IP address on which to listen for the --secure-port port. The "+
"associated interface(s) must be reachable by the rest of the cluster, and by CLI/web "+
"clients. If blank, all interfaces will be used (0.0.0.0 for all IPv4 interfaces and :: for all IPv6 interfaces).")
fs.IntVar(&s.BindPort, "secure-port", s.BindPort, ""+
"The port on which to serve HTTPS with authentication and authorization. If 0, "+
"don't serve HTTPS at all.")