From 2c7771e90c8dd9a798f4a5d6a70d0529895d4e94 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 27 Sep 2016 11:15:35 -0400 Subject: [PATCH] AWS: Support default for ExternalHost on AWS Fix #33563 --- pkg/genericapiserver/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/genericapiserver/config.go b/pkg/genericapiserver/config.go index 0a3e7c20a53..479d8b34a08 100644 --- a/pkg/genericapiserver/config.go +++ b/pkg/genericapiserver/config.go @@ -503,14 +503,14 @@ func DefaultAndValidateRunOptions(options *options.ServerRunOptions) { // Set default value for ExternalHost if not specified. if len(options.ExternalHost) == 0 { // TODO: extend for other providers - if options.CloudProvider == "gce" { + if options.CloudProvider == "gce" || options.CloudProvider == "aws" { cloud, err := cloudprovider.InitCloudProvider(options.CloudProvider, options.CloudConfigFile) if err != nil { glog.Fatalf("Cloud provider could not be initialized: %v", err) } instances, supported := cloud.Instances() 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() if err != nil {