Merge pull request #42512 from kubermatic/scheeles-aws

Automatic merge from submit-queue (batch tested with PRs 43925, 42512) AWS: add KubernetesClusterID as additional option when VPC is set This is a small enhancement after the PRs https://github.com/kubernetes/kubernetes/pull/41695 and https://github.com/kubernetes/kubernetes/pull/39996 ## Release Notes ```release-note AWS cloud provider: allow to set KubernetesClusterID or KubernetesClusterTag in combination with VPC. ```

Merge pull request #42512 from kubermatic/scheeles-aws
4ee6782d · Kubernetes Submit Queue · GitHub · 6c6f4f01 · fd09bb69 · 4ee6782d
Commit 4ee6782d authored Apr 03, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -817,7 +817,7 @@ func newAWSCloud(config io.Reader, awsServices Services) (*Cloud, error) {
 		deviceAllocators: make(map[types.NodeName]DeviceAllocator),
 	}

-	if cfg.Global.VPC != "" && cfg.Global.KubernetesClusterTag != "" {
+	if cfg.Global.VPC != "" && (cfg.Global.KubernetesClusterTag != "" || cfg.Global.KubernetesClusterID != "") {
 		// When the master is running on a different AWS account, cloud provider or on-premise
 		// build up a dummy instance and use the VPC from the nodes account
 		glog.Info("Master is configured to run on a AWS account, different cloud provider or on-premise")