github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10181 from swagiaal/aws-ebs-name

Browse Source 
Use instance availability zone for AWS EBS
This commit is contained in:
Yu-Ju Hong 2015-07-06 11:39:33 -07:00
commit 736b3cb050
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/aws_ebs/aws-ebs-web.yaml
View File

@ -16,6 +16,6 @@ spec:
volumes: volumes:
- name: html-volume - name: html-volume
awsElasticBlockStore: awsElasticBlockStore:
# Enter the volume region and ID below # Enter the volume ID below
volumeID: aws://{region}/{volume ID} volumeID: volume_ID
fsType: ext4 fsType: ext4

13
pkg/cloudprovider/aws/aws.go
View File

@ -1106,7 +1106,10 @@ type awsDisk struct {
az string az string
} }
func newAWSDisk(ec2 EC2, name string) (*awsDisk, error) { func newAWSDisk(aws *AWSCloud, name string) (*awsDisk, error) {
if !strings.HasPrefix(name, "aws://") {
name = "aws://" + aws.availabilityZone + "/" + name
}
// name looks like aws://availability-zone/id // name looks like aws://availability-zone/id
url, err := url.Parse(name) url, err := url.Parse(name)
if err != nil { if err != nil {
@ -1133,7 +1136,7 @@ func newAWSDisk(ec2 EC2, name string) (*awsDisk, error) {
if az == "" { if az == "" {
return nil, fmt.Errorf("Invalid format for AWS volume (%s)", name) return nil, fmt.Errorf("Invalid format for AWS volume (%s)", name)
} }
disk := &awsDisk{ec2: ec2, name: name, awsID: awsID, az: az} disk := &awsDisk{ec2: aws.ec2, name: name, awsID: awsID, az: az}
return disk, nil return disk, nil
} }
@ -1261,7 +1264,7 @@ func (aws *AWSCloud) getAwsInstance(nodeName string) (*awsInstance, error) {
// Implements Volumes.AttachDisk // Implements Volumes.AttachDisk
func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly bool) (string, error) { func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly bool) (string, error) {
disk, err := newAWSDisk(aws.ec2, diskName) disk, err := newAWSDisk(aws, diskName)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -1316,7 +1319,7 @@ func (aws *AWSCloud) AttachDisk(instanceName string, diskName string, readOnly b
// Implements Volumes.DetachDisk // Implements Volumes.DetachDisk
func (aws *AWSCloud) DetachDisk(instanceName string, diskName string) error { func (aws *AWSCloud) DetachDisk(instanceName string, diskName string) error {
disk, err := newAWSDisk(aws.ec2, diskName) disk, err := newAWSDisk(aws, diskName)
if err != nil { if err != nil {
return err return err
} }
@ -1370,7 +1373,7 @@ func (aws *AWSCloud) CreateVolume(volumeOptions *VolumeOptions) (string, error)
// Implements Volumes.DeleteVolume // Implements Volumes.DeleteVolume
func (aws *AWSCloud) DeleteVolume(volumeName string) error { func (aws *AWSCloud) DeleteVolume(volumeName string) error {
awsDisk, err := newAWSDisk(aws.ec2, volumeName) awsDisk, err := newAWSDisk(aws, volumeName)
if err != nil { if err != nil {
return err return err
} }