kubernetes
/
autoscaler
mirror of https://github.com/kubernetes/autoscaler.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix pricing endpoint in AWS China Region 

(cherry picked from commit b5f95e0d73)
This commit is contained in:
Hanfei Shen 2020-09-18 14:46:20 +08:00 committed by Zzde
parent d21f0edc45
commit 34b750b1cc
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cluster-autoscaler/cloudprovider/aws/aws_util.go
View File

@ -31,9 +31,10 @@ import (
) )
var ( var (
ec2MetaDataServiceUrl = "http://169.254.169.254/latest/dynamic/instance-identity/document" ec2MetaDataServiceUrl = "http://169.254.169.254/latest/dynamic/instance-identity/document"
ec2PricingServiceUrlTemplate = "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonEC2/current/%s/index.json" ec2PricingServiceUrlTemplate = "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonEC2/current/%s/index.json"
staticListLastUpdateTime = "2019-10-14" ec2PricingServiceUrlTemplateCN = "https://pricing.cn-north-1.amazonaws.com.cn/offers/v1.0/cn/AmazonEC2/current/%s/index.json"
staticListLastUpdateTime = "2019-10-14"
) )
type response struct { type response struct {
@ -53,6 +54,13 @@ type productAttributes struct {
// GenerateEC2InstanceTypes returns a map of ec2 resources // GenerateEC2InstanceTypes returns a map of ec2 resources
func GenerateEC2InstanceTypes(region string) (map[string]*InstanceType, error) { func GenerateEC2InstanceTypes(region string) (map[string]*InstanceType, error) {
var pricingUrlTemplate string
if strings.HasPrefix(region, "cn-") {
pricingUrlTemplate = ec2PricingServiceUrlTemplateCN
} else {
pricingUrlTemplate = ec2PricingServiceUrlTemplate
}
instanceTypes := make(map[string]*InstanceType) instanceTypes := make(map[string]*InstanceType)
resolver := endpoints.DefaultResolver() resolver := endpoints.DefaultResolver()
@ -64,7 +72,7 @@ func GenerateEC2InstanceTypes(region string) (map[string]*InstanceType, error) {
continue continue
} }
url := fmt.Sprintf(ec2PricingServiceUrlTemplate, r.ID()) url := fmt.Sprintf(pricingUrlTemplate, r.ID())
klog.V(1).Infof("fetching %s\n", url) klog.V(1).Infof("fetching %s\n", url)
res, err := http.Get(url) res, err := http.Get(url)
if err != nil { if err != nil {