github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix on-premises term in error string and comments

pull/6/head
Luke Heidecke 2017-07-20 13:04:33 +09:00
parent e48ad7782e
commit c8b6924424
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/providers/aws/aws.go
View File

@ -403,7 +403,7 @@ type CloudConfig struct {
Zone string Zone string
// The AWS VPC flag enables the possibility to run the master components // The AWS VPC flag enables the possibility to run the master components
// on a different aws account, on a different cloud provider or on-premise. // on a different aws account, on a different cloud provider or on-premises.
// If the flag is set also the KubernetesClusterTag must be provided // If the flag is set also the KubernetesClusterTag must be provided
VPC string VPC string
// SubnetID enables using a specific subnet to use for ELB's // SubnetID enables using a specific subnet to use for ELB's
@ -876,9 +876,9 @@ func newAWSCloud(config io.Reader, awsServices Services) (*Cloud, error) {
awsCloud.instanceCache.cloud = awsCloud awsCloud.instanceCache.cloud = awsCloud
if cfg.Global.VPC != "" && cfg.Global.SubnetID != "" && (cfg.Global.KubernetesClusterTag != "" || cfg.Global.KubernetesClusterID != "") { if cfg.Global.VPC != "" && cfg.Global.SubnetID != "" && (cfg.Global.KubernetesClusterTag != "" || cfg.Global.KubernetesClusterID != "") {
// When the master is running on a different AWS account, cloud provider or on-premise // When the master is running on a different AWS account, cloud provider or on-premises
// build up a dummy instance and use the VPC from the nodes account // build up a dummy instance and use the VPC from the nodes account
glog.Info("Master is configured to run on a different AWS account, different cloud provider or on-premise") glog.Info("Master is configured to run on a different AWS account, different cloud provider or on-premises")
awsCloud.selfAWSInstance = &awsInstance{ awsCloud.selfAWSInstance = &awsInstance{
nodeName: "master-dummy", nodeName: "master-dummy",
vpcID: cfg.Global.VPC, vpcID: cfg.Global.VPC,