github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-17 15:50:10 +00:00
Code Issues Projects Releases Wiki Activity

Added flag to skip zone check

Browse Source
This commit is contained in:
Kenneth D. Evensen 2016-07-02 05:58:25 -04:00
parent 7de5e87135
commit 7e4af9a66b
No known key found for this signature in database
GPG Key ID: 16D6152C9FDA6A3B
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,6 +300,8 @@ type CloudConfig struct {
//has setup a rule that allows inbound traffic on kubelet ports from the //has setup a rule that allows inbound traffic on kubelet ports from the
//local VPC subnet (so load balancers can access it). E.g. 10.82.0.0/16 30000-32000. //local VPC subnet (so load balancers can access it). E.g. 10.82.0.0/16 30000-32000.
DisableSecurityGroupIngress bool DisableSecurityGroupIngress bool
DisableStrictZoneCheck bool
} }
} }
@ -664,9 +666,13 @@ func newAWSCloud(config io.Reader, awsServices Services) (*Cloud, error) {
return nil, err return nil, err
} }
valid := isRegionValid(regionName) if !cfg.Global.DisableStrictZoneCheck {
if !valid { valid := isRegionValid(regionName)
return nil, fmt.Errorf("not a valid AWS zone (unknown region): %s", zone) if !valid {
return nil, fmt.Errorf("not a valid AWS zone (unknown region): %s", zone)
}
} else {
glog.Warningf("Strict AWS zone checking is disabled. Proceeding with zone: %s", zone)
} }
ec2, err := awsServices.Compute(regionName) ec2, err := awsServices.Compute(regionName)