Merge pull request #49261 from heidecke/on-premises

Automatic merge from submit-queue Fix on-premises term in error string and comments for aws provider **What this PR does / why we need it**: fix for correct terminology of "on-premises" over "on-premise" **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: n/a **Special notes for your reviewer**: Updated error string while doing a scrub for the incorrect term in the docs (kubernetes/kubernetes.github.io#4413). **Release note**: ```release-note NONE ```

Merge pull request #49261 from heidecke/on-premises
de71cc50 · Kubernetes Submit Queue · GitHub · ec2fa9d4 · c8b69244 · de71cc50
Commit de71cc50 authored Jul 19, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

aws.go pkg/cloudprovider/providers/aws/aws.go +3 -3

No files found.
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -403,7 +403,7 @@ type CloudConfig struct {
 		Zone string

 		// 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
 		VPC string
 		// 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

 	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
-		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{
 			nodeName: "master-dummy",
 			vpcID:    cfg.Global.VPC,