Make AWS region configurable in the operator cofig map (#333)

pkg/cluster/sync.go

@@ -447,7 +447,7 @@ func (c *Cluster) syncVolumes() error {
 	if !act {
 		return nil
 	}
-	if err := c.resizeVolumes(c.Spec.Volume, []volumes.VolumeResizer{&volumes.EBSVolumeResizer{}}); err != nil {
+	if err := c.resizeVolumes(c.Spec.Volume, []volumes.VolumeResizer{&volumes.EBSVolumeResizer{AWSRegion: c.OpConfig.AWSRegion}}); err != nil {
 		return fmt.Errorf("could not sync volumes: %v", err)
 	}
 

pkg/util/config/config.go

@@ -76,6 +76,7 @@ type Config struct {
 	// value of this string must be valid JSON or YAML; see initPodServiceAccount
 	PodServiceAccountDefinition string `name:"pod_service_account_definition" default:""`
 	DbHostedZone                string `name:"db_hosted_zone" default:"db.example.com"`
+	AWSRegion                   string `name:"aws_region" default:"eu-central-1"`
 	WALES3Bucket                string `name:"wal_s3_bucket"`
 	LogS3Bucket                 string `name:"log_s3_bucket"`
 	KubeIAMRole                 string `name:"kube_iam_role"`

pkg/util/constants/aws.go

@@ -4,8 +4,6 @@ import "time"
 
 // AWS specific constants used by other modules
 const (
-	// default region for AWS. TODO: move it to the operator configuration
-	AWSRegion = "eu-central-1"
 	// EBS related constants
 	EBSVolumeIDStart = "/vol-"
 	EBSProvisioner   = "kubernetes.io/aws-ebs"

pkg/util/volumes/ebs.go

@@ -16,11 +16,12 @@ import (
 // EBSVolumeResizer implements volume resizing interface for AWS EBS volumes.
 type EBSVolumeResizer struct {
 	connection *ec2.EC2
+	AWSRegion  string
 }
 
 // ConnectToProvider connects to AWS.
 func (c *EBSVolumeResizer) ConnectToProvider() error {
-	sess, err := session.NewSession(&aws.Config{Region: aws.String(constants.AWSRegion)})
+	sess, err := session.NewSession(&aws.Config{Region: aws.String(c.AWSRegion)})
 	if err != nil {
 		return fmt.Errorf("could not establish AWS session: %v", err)
 	}