Skip to content

K
k3s
Commit 4dbc532c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #33568 from justinsb/fix_33563

Automatic merge from submit-queue AWS: Support default value for ExternalHost
parents d87dfa27 2c7771e9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/genericapiserver/config.go
View file @ 4dbc532c
...@@ -493,14 +493,14 @@ func DefaultAndValidateRunOptions(options *options.ServerRunOptions) { ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment