Merge pull request #56812 from dims/drop-using-cloud-provider-for-setting-host-address

Automatic merge from submit-queue (batch tested with PRs 56250, 56809, 56812, 56792, 56724). 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>.

Drop using cloud provider to set host address feature

**What this PR does / why we need it**:

Follow up to PR #54516, also see notice to -dev@ :
https://groups.google.com/forum/#!topic/kubernetes-dev/2NaxUCSbIw8

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
kube-apiserver: The external hostname no longer longer use the cloud provider API to select a default. It can be set explicitly using --external-hostname, if needed.
```

Kubernetes-commit: b3cbfed4d80c330f2f49a9fa25501562bafec38d
This commit is contained in:
Kubernetes Publisher 2017-12-16 07:46:43 -08:00
commit 4907e61b0a
2 changed files with 97 additions and 93 deletions

174
Godeps/Godeps.json generated
View File

@ -764,351 +764,351 @@
},
{
"ImportPath": "k8s.io/api/admission/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/apps/v1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/apps/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/apps/v1beta2",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/authentication/v1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/authentication/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/authorization/v1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/authorization/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/autoscaling/v1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/autoscaling/v2beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/batch/v1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/batch/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/batch/v2alpha1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/certificates/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/core/v1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/events/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/extensions/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/networking/v1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/policy/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/rbac/v1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/rbac/v1alpha1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/rbac/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/scheduling/v1alpha1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/settings/v1alpha1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/storage/v1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/storage/v1alpha1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/api/storage/v1beta1",
"Rev": "9382f5a87a364c195477134986b578d103c7c24d"
"Rev": "3b9b65abe0aa9d995259dad1469ff3e1f18802c5"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/validation/path",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/validation",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/proxy",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/uuid",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/waitgroup",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "23bc0b9defba312e3b5938fa0d0581f3e882f862"
"Rev": "a88dfdd72a1d320a70de7ab2bb3375cfdf237864"
},
{
"ImportPath": "k8s.io/client-go/discovery",

View File

@ -338,13 +338,17 @@ type CompletedConfig struct {
// Complete fills in any fields not set that are required to have valid data and can be derived
// from other fields. If you're going to `ApplyOptions`, do that first. It's mutating the receiver.
func (c *Config) Complete(informers informers.SharedInformerFactory) CompletedConfig {
if len(c.ExternalAddress) == 0 && c.PublicAddress != nil {
hostAndPort := c.PublicAddress.String()
if c.ReadWritePort != 0 {
hostAndPort = net.JoinHostPort(hostAndPort, strconv.Itoa(c.ReadWritePort))
}
c.ExternalAddress = hostAndPort
host := c.ExternalAddress
if host == "" && c.PublicAddress != nil {
host = c.PublicAddress.String()
}
if !strings.Contains(host, ":") {
if c.ReadWritePort != 0 {
host = net.JoinHostPort(host, strconv.Itoa(c.ReadWritePort))
}
}
c.ExternalAddress = host
if c.OpenAPIConfig != nil && c.OpenAPIConfig.SecurityDefinitions != nil {
// Setup OpenAPI security: all APIs will have the same authentication for now.
c.OpenAPIConfig.DefaultSecurity = []map[string][]string{}