From fd09bb69349d099b21ee4240f2dc3aa7c5bae28c Mon Sep 17 00:00:00 2001 From: Sebastian Scheele Date: Fri, 3 Mar 2017 16:57:12 -0800 Subject: [PATCH] AWS: add KubernetesClusterID as additional option when VPC is set --- pkg/cloudprovider/providers/aws/aws.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 8d52f0c906b..a401bf84b73 100644 --- 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")