Skip to content

Commit

Permalink
AWS: add KubernetesClusterID as additional option when VPC is set
Browse files Browse the repository at this point in the history
  • Loading branch information
scheeles committed Mar 4, 2017
1 parent c74bb7b commit e5432c7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion aws.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit e5432c7

Please sign in to comment.