31332fa84a
As part of the larger plan to drop --cloud-provider and --cloud-config from kube-apiserver, we need to stop calling Cloud Provider API to find the external ip address when one is not specified on the command line. When ExternalHost is not specified, we check if AdvertiseAddress is specified and use that, if that is missing then we use os.Hostname(). When testing this feature, found a problem that when ExternalHost is specified, the port was not added in the generated URL. So fixed that as well.
44 lines
1.2 KiB
Go
44 lines
1.2 KiB
Go
/*
|
|
Copyright 2017 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package options
|
|
|
|
import (
|
|
"github.com/spf13/pflag"
|
|
)
|
|
|
|
type CloudProviderOptions struct {
|
|
CloudConfigFile string
|
|
CloudProvider string
|
|
}
|
|
|
|
func NewCloudProviderOptions() *CloudProviderOptions {
|
|
return &CloudProviderOptions{}
|
|
}
|
|
|
|
func (s *CloudProviderOptions) Validate() []error {
|
|
allErrors := []error{}
|
|
return allErrors
|
|
}
|
|
|
|
func (s *CloudProviderOptions) AddFlags(fs *pflag.FlagSet) {
|
|
fs.StringVar(&s.CloudProvider, "cloud-provider", s.CloudProvider,
|
|
"The provider for cloud services. Empty string for no provider.")
|
|
|
|
fs.StringVar(&s.CloudConfigFile, "cloud-config", s.CloudConfigFile,
|
|
"The path to the cloud provider configuration file. Empty string for no configuration file.")
|
|
}
|