github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33568 from justinsb/fix_33563

Browse Source 
Automatic merge from submit-queue

AWS: Support default value for ExternalHost
This commit is contained in:
Kubernetes Submit Queue 2016-11-08 05:07:13 -08:00 committed by GitHub
commit 4dbc532c9a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/genericapiserver/config.go
View File

@ -493,14 +493,14 @@ func DefaultAndValidateRunOptions(options *options.ServerRunOptions) {
// Set default value for ExternalAddress if not specified. // Set default value for ExternalAddress if not specified.
if len(options.ExternalHost) == 0 { if len(options.ExternalHost) == 0 {
// TODO: extend for other providers // TODO: extend for other providers
if options.CloudProvider == "gce" { if options.CloudProvider == "gce" || options.CloudProvider == "aws" {
cloud, err := cloudprovider.InitCloudProvider(options.CloudProvider, options.CloudConfigFile) cloud, err := cloudprovider.InitCloudProvider(options.CloudProvider, options.CloudConfigFile)
if err != nil { if err != nil {
glog.Fatalf("Cloud provider could not be initialized: %v", err) glog.Fatalf("Cloud provider could not be initialized: %v", err)
} }
instances, supported := cloud.Instances() instances, supported := cloud.Instances()
if !supported { if !supported {
glog.Fatalf("GCE cloud provider has no instances. this shouldn't happen. exiting.") glog.Fatalf("%q cloud provider has no instances. this shouldn't happen. exiting.", options.CloudProvider)
} }
hostname, err := os.Hostname() hostname, err := os.Hostname()
if err != nil { if err != nil {