github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69711 from wgliang/cleanup/rename-recognize-region

Browse Source 
AWS: unexport unnecessarily exported methods and variables about reco…
This commit is contained in:
k8s-ci-robot 2018-10-14 13:30:20 -07:00 committed by GitHub
commit 02cca1f11a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -260,7 +260,7 @@ const MaxReadThenCreateRetries = 30
// need hardcoded defaults. // need hardcoded defaults.
const DefaultVolumeType = "gp2" const DefaultVolumeType = "gp2"
// Used to call RecognizeWellKnownRegions just once // Used to call recognizeWellKnownRegions just once
var once sync.Once var once sync.Once
// AWS implements PVLabeler. // AWS implements PVLabeler.
@ -1063,7 +1063,7 @@ func newAWSCloud(cfg CloudConfig, awsServices Services) (*Cloud, error) {
// Trust that if we get a region from configuration or AWS metadata that it is valid, // Trust that if we get a region from configuration or AWS metadata that it is valid,
// and register ECR providers // and register ECR providers
RecognizeRegion(regionName) recognizeRegion(regionName)
if !cfg.Global.DisableStrictZoneCheck { if !cfg.Global.DisableStrictZoneCheck {
valid := isRegionValid(regionName) valid := isRegionValid(regionName)
@ -1152,7 +1152,7 @@ func newAWSCloud(cfg CloudConfig, awsServices Services) (*Cloud, error) {
// Register regions, in particular for ECR credentials // Register regions, in particular for ECR credentials
once.Do(func() { once.Do(func() {
RecognizeWellKnownRegions() recognizeWellKnownRegions()
}) })
return awsCloud, nil return awsCloud, nil

16
pkg/cloudprovider/providers/aws/regions.go
View File

@ -23,9 +23,9 @@ import (
"sync" "sync"
) )
// WellKnownRegions is the complete list of regions known to the AWS cloudprovider // wellKnownRegions is the complete list of regions known to the AWS cloudprovider
// and credentialprovider. // and credentialprovider.
var WellKnownRegions = [...]string{ var wellKnownRegions = [...]string{
// from `aws ec2 describe-regions --region us-east-1 --query Regions[].RegionName | sort` // from `aws ec2 describe-regions --region us-east-1 --query Regions[].RegionName | sort`
"ap-northeast-1", "ap-northeast-1",
"ap-northeast-2", "ap-northeast-2",
@ -53,12 +53,12 @@ var awsRegionsMutex sync.Mutex
// awsRegions is a set of recognized regions // awsRegions is a set of recognized regions
var awsRegions sets.String var awsRegions sets.String
// RecognizeRegion is called for each AWS region we know about. // recognizeRegion is called for each AWS region we know about.
// It currently registers a credential provider for that region. // It currently registers a credential provider for that region.
// There are two paths to discovering a region: // There are two paths to discovering a region:
// * we hard-code some well-known regions // * we hard-code some well-known regions
// * if a region is discovered from instance metadata, we add that // * if a region is discovered from instance metadata, we add that
func RecognizeRegion(region string) { func recognizeRegion(region string) {
awsRegionsMutex.Lock() awsRegionsMutex.Lock()
defer awsRegionsMutex.Unlock() defer awsRegionsMutex.Unlock()
@ -78,10 +78,10 @@ func RecognizeRegion(region string) {
awsRegions.Insert(region) awsRegions.Insert(region)
} }
// RecognizeWellKnownRegions calls RecognizeRegion on each WellKnownRegion // recognizeWellKnownRegions calls RecognizeRegion on each WellKnownRegion
func RecognizeWellKnownRegions() { func recognizeWellKnownRegions() {
for _, region := range WellKnownRegions { for _, region := range wellKnownRegions {
RecognizeRegion(region) recognizeRegion(region)
} }
} }

4
pkg/cloudprovider/providers/aws/regions_test.go
View File

@ -22,7 +22,7 @@ import (
// TestRegions does basic checking of region verification / addition // TestRegions does basic checking of region verification / addition
func TestRegions(t *testing.T) { func TestRegions(t *testing.T) {
RecognizeWellKnownRegions() recognizeWellKnownRegions()
tests := []struct { tests := []struct {
Add string Add string
@ -55,7 +55,7 @@ func TestRegions(t *testing.T) {
for _, test := range tests { for _, test := range tests {
if test.Add != "" { if test.Add != "" {
RecognizeRegion(test.Add) recognizeRegion(test.Add)
} }
if test.Lookup != "" { if test.Lookup != "" {