Skip to content

Allow S3 buckets in different regions #172

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.

Sign up for GitHub

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

Closed
frodeanonsen wants to merge 5 commits into from
Closed

Allow S3 buckets in different regions #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
777f83f
Missing quote
frodeanonsen May 10, 2017
b04a97e
Add region parameter to allow s3 buckets in different regions
frodeanonsen May 10, 2017
c5d7313
Allow ssh to Bastion security group to contain several ip ranges, com…
frodeanonsen May 10, 2017
4a108d7
Revert commit
May 10, 2017
0a39035
Specify region parameter on aws s3 commands
May 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modules.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ module "bastion" {

# variables
ami-id = "${ var.coreos-aws["ami"] }"
aws = "${ var.aws }"
instance-type = "${ var.instance-type["bastion"] }"
internal-tld = "${ var.internal-tld }"
key-name = "${ var.aws["key-name"] }"
Expand Down
1 change: 1 addition & 0 deletions modules/bastion/cloud-config.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ data "template_file" "cloud-config" {
template = "${ file( "${ path.module }/cloud-config.yml" )}"

vars {
region = "${ var.aws["region"] }"
internal-tld = "${ var.internal-tld }"
s3-bucket = "${ var.s3-bucket }"
}
Expand Down
2 changes: 1 addition & 1 deletion modules/bastion/cloud-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ write-files:
--trust-keys-from-https \
--volume=dns,kind=host,source=/etc/resolv.conf,readOnly=true --mount volume=dns,target=/etc/resolv.conf \
--volume=ssl,kind=host,source=/etc/kubernetes/ssl,readOnly=false --mount=volume=ssl,target=/etc/kubernetes/ssl \
quay.io/coreos/awscli -- aws s3 cp s3://${ s3-bucket }/$1 /etc/kubernetes/ssl
quay.io/coreos/awscli -- aws s3 cp s3://${ s3-bucket }/$1 /etc/kubernetes/ssl --region ${ region }
do
echo "retrying"
sleep 5.2
Expand Down
3 changes: 3 additions & 0 deletions modules/bastion/io.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
variable "ami-id" {}
variable "aws" {
type = "map"
}
variable "depends-id" {}
variable "instance-profile-name" {}
variable "instance-type" {}
Expand Down
2 changes: 1 addition & 1 deletion modules/etcd/cloud-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ write-files:
--trust-keys-from-https \
--volume=dns,kind=host,source=/etc/resolv.conf,readOnly=true --mount volume=dns,target=/etc/resolv.conf \
--volume=ssl,kind=host,source=/etc/kubernetes/ssl,readOnly=false --mount=volume=ssl,target=/etc/kubernetes/ssl \
quay.io/coreos/awscli -- aws s3 cp s3://${ s3-bucket }/$1 /etc/kubernetes/ssl
quay.io/coreos/awscli -- aws s3 cp s3://${ s3-bucket }/$1 /etc/kubernetes/ssl --region ${ region }
do
echo "retrying"
sleep 5.2
Expand Down
1 change: 1 addition & 0 deletions modules/pki/cloud-config.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ data "template_file" "cloud-config" {
template = "${ file( "${ path.module }/cloud-config.yml" ) }"

vars {
region = "${ var.aws["region"] }"
internal-tld = "${ var.internal-tld }"
s3-bucket = "${ var.s3-bucket }"
}
Expand Down
4 changes: 2 additions & 2 deletions modules/pki/cloud-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ coreos:
--trust-keys-from-https \
--volume=dns,kind=host,source=/etc/resolv.conf,readOnly=true --mount volume=dns,target=/etc/resolv.conf \
--volume=ssl,kind=host,source=/etc/cfssl,readOnly=true --mount=volume=ssl,target=/etc/cfssl \
quay.io/coreos/awscli -- aws s3 cp /etc/cfssl/service-account-key.pem s3://${ s3-bucket }/
quay.io/coreos/awscli -- aws s3 cp /etc/cfssl/service-account-key.pem s3://${ s3-bucket }/ --region ${ region }

- name: download-cfssl.service
command: start
Expand Down Expand Up @@ -61,7 +61,7 @@ coreos:
--trust-keys-from-https \
--volume=dns,kind=host,source=/etc/resolv.conf,readOnly=true --mount volume=dns,target=/etc/resolv.conf \
--volume=ssl,kind=host,source=/etc/cfssl,readOnly=true --mount=volume=ssl,target=/etc/cfssl \
quay.io/coreos/awscli -- aws s3 cp /etc/cfssl/ca.pem s3://${ s3-bucket }/
quay.io/coreos/awscli -- aws s3 cp /etc/cfssl/ca.pem s3://${ s3-bucket }/ --region ${ region }

- name: cfssl.service
command: start
Expand Down
2 changes: 1 addition & 1 deletion modules/worker/cloud-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ write-files:
--trust-keys-from-https \
--volume=dns,kind=host,source=/etc/resolv.conf,readOnly=true --mount volume=dns,target=/etc/resolv.conf \
--volume=ssl,kind=host,source=/etc/kubernetes/ssl,readOnly=false --mount=volume=ssl,target=/etc/kubernetes/ssl \
quay.io/coreos/awscli -- aws s3 cp s3://${ s3-bucket }/$1 /etc/kubernetes/ssl
quay.io/coreos/awscli -- aws s3 cp s3://${ s3-bucket }/$1 /etc/kubernetes/ssl --region ${ region }
do
echo "retrying"
sleep 5.2
Expand Down
2 changes: 1 addition & 1 deletion scripts/create-admin-certificate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ trap finish EXIT
# test cfssl connection -- retry until up
#
until printf "." && curl -d '{"label":"primary"}' http://localhost:8888/api/v1/cfssl/info &>/dev/null
do sleep 2.5; done; echo "✓
do sleep 2.5; done; echo "✓"
Copy link

@ryanmaclean ryanmaclean Jul 14, 2017

Choose a reason for hiding this comment

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

This seems to have been resolved, at least 😂


function csr {
cat <<EOF
Expand Down