Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix AWS region vs zone #6011

Merged
merged 4 commits into from Mar 31, 2015
Merged

Conversation

justinsb
Copy link
Member

We were specifying a region, but naming it as a zone in util.sh

The zone matters just as much as the region, e.g. for EBS volumes.

We also change the config to require a Zone, not a Region.
But we fallback to get the information from the metadata service.

@@ -29,27 +29,50 @@ import (
)

func TestReadAWSCloudConfig(t *testing.T) {
_, err1 := readAWSCloudConfig(nil)
_, err1 := readAWSCloudConfig(nil, nil)
if err1 == nil {
t.Errorf("Should error when no config reader is given")
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason this isn't a table driven test?

@zmerlynn zmerlynn self-assigned this Mar 26, 2015
We were specifying a region, but naming it as a zone in util.sh

The zone matters just as much as the region, e.g. for EBS volumes.

We also change the config to require a Zone, not a Region.
But we fallback to get the information from the metadata service.
@justinsb
Copy link
Member Author

Converted the two tests I touched to be table-driven.

@justinsb
Copy link
Member Author

Ping

@zmerlynn
Copy link
Member

Apologies. I should scan my PR queue. :/

@zmerlynn
Copy link
Member

LGTM.

zmerlynn added a commit that referenced this pull request Mar 31, 2015
@zmerlynn zmerlynn merged commit fc8ba8d into kubernetes:master Mar 31, 2015
@justinsb
Copy link
Member Author

Thanks :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants