Skip to content

Commit

Permalink
infra/aws: Add reg.k8s.io S3 buckets replication rules
Browse files Browse the repository at this point in the history
Signed-off-by: Gabriel De Obieta <[email protected]>
  • Loading branch information
deobieta committed Sep 9, 2022
1 parent e437068 commit 988b871
Show file tree
Hide file tree
Showing 6 changed files with 173 additions and 15 deletions.
70 changes: 61 additions & 9 deletions infra/aws/terraform/registry.k8s.io/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ module "us-west-1" {
aws = aws.us-west-1
}

region = "us-west-1"
prefix = var.prefix
}

Expand All @@ -47,7 +46,6 @@ module "us-west-2" {
aws = aws.us-west-2
}

region = "us-west-2"
prefix = var.prefix
}

Expand All @@ -58,7 +56,6 @@ module "us-east-1" {
aws = aws.us-east-1
}

region = "us-east-1"
prefix = var.prefix
}

Expand All @@ -69,8 +66,68 @@ module "us-east-2" {
aws = aws.us-east-2
}

region = "us-east-2"
prefix = var.prefix

s3_replication_iam_role_arn = "arn:aws:iam::513428760722:role/registry.k8s.io_s3writer"

s3_replication_rules = [
{
id = "registry-k8s-io-us-east-2-to-registry-k8s-io-us-west-1"
status = "Enabled"
priority = 1
destination_bucket_arn = "arn:aws:s3:::${var.prefix}registry-k8s-io-us-west-1"
destination_bucket_storage_class = "STANDARD"
},
{
id = "registry-k8s-io-us-east-2-to-registry-k8s-io-us-west-2"
status = "Enabled"
priority = 2
destination_bucket_arn = "arn:aws:s3:::${var.prefix}registry-k8s-io-us-west-2"
destination_bucket_storage_class = "STANDARD"
},
{
id = "registry-k8s-io-us-east-2-to-registry-k8s-io-us-east-1"
status = "Enabled"
priority = 3
destination_bucket_arn = "arn:aws:s3:::${var.prefix}registry-k8s-io-us-east-1"
destination_bucket_storage_class = "STANDARD"
},
{
id = "registry-k8s-io-us-east-2-to-registry-k8s-io-eu-west-1"
status = "Enabled"
priority = 4
destination_bucket_arn = "arn:aws:s3:::${var.prefix}registry-k8s-io-eu-west-1"
destination_bucket_storage_class = "STANDARD"
},
{
id = "registry-k8s-io-us-east-2-to-registry-k8s-io-eu-central-1"
status = "Enabled"
priority = 5
destination_bucket_arn = "arn:aws:s3:::${var.prefix}registry-k8s-io-eu-central-1"
destination_bucket_storage_class = "STANDARD"
},
{
id = "registry-k8s-io-us-east-2-to-registry-k8s-io-ap-southeast-1"
status = "Enabled"
priority = 6
destination_bucket_arn = "arn:aws:s3:::${var.prefix}registry-k8s-io-ap-southeast-1"
destination_bucket_storage_class = "STANDARD"
},
{
id = "registry-k8s-io-us-east-2-to-registry-k8s-io-ap-northeast-1"
status = "Enabled"
priority = 7
destination_bucket_arn = "arn:aws:s3:::${var.prefix}registry-k8s-io-ap-northeast-1"
destination_bucket_storage_class = "STANDARD"
},
{
id = "registry-k8s-io-us-east-2-to-registry-k8s-io-ap-south-1"
status = "Enabled"
priority = 8
destination_bucket_arn = "arn:aws:s3:::${var.prefix}registry-k8s-io-ap-south-1"
destination_bucket_storage_class = "STANDARD"
},
]
}

module "eu-west-1" {
Expand All @@ -80,7 +137,6 @@ module "eu-west-1" {
aws = aws.eu-west-1
}

region = "eu-west-1"
prefix = var.prefix
}

Expand All @@ -91,7 +147,6 @@ module "eu-central-1" {
aws = aws.eu-central-1
}

region = "eu-central-1"
prefix = var.prefix
}

Expand All @@ -102,7 +157,6 @@ module "ap-southeast-1" {
aws = aws.ap-southeast-1
}

region = "ap-southeast-1"
prefix = var.prefix
}

Expand All @@ -113,7 +167,6 @@ module "ap-northeast-1" {
aws = aws.ap-northeast-1
}

region = "ap-northeast-1"
prefix = var.prefix
}

Expand All @@ -124,6 +177,5 @@ module "ap-south-1" {
aws = aws.ap-south-1
}

region = "ap-south-1"
prefix = var.prefix
}
4 changes: 3 additions & 1 deletion infra/aws/terraform/registry.k8s.io/providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ terraform {
region = "us-east-2"
}

required_version = ">= 1.0.0"

required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 3.0"
version = "~> 4.0"
}
}
}
Expand Down
54 changes: 53 additions & 1 deletion infra/aws/terraform/registry.k8s.io/s3/bucket.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ limitations under the License.
*/

resource "aws_s3_bucket" "registry-k8s-io" {
bucket = "${var.prefix}registry-k8s-io-${var.region}"
bucket = "${var.prefix}registry-k8s-io-${data.aws_region.current.name}"
force_destroy = true
}

resource "aws_s3_bucket_acl" "registry-k8s-io" {
Expand Down Expand Up @@ -70,3 +71,54 @@ resource "aws_s3_bucket_ownership_controls" "registry-k8s-io" {
aws_s3_bucket_policy.registry-k8s-io-public-read
]
}

# Versioning must be enabled for S3 replication
resource "aws_s3_bucket_versioning" "registry-k8s-io" {
bucket = aws_s3_bucket.registry-k8s-io.id
versioning_configuration {
status = "Enabled"
}
}

resource "aws_s3_bucket_replication_configuration" "registry-k8s-io" {
count = length(var.s3_replication_rules) > 0 ? 1 : 0

# Must have bucket versioning enabled first
depends_on = [aws_s3_bucket_versioning.registry-k8s-io]

role = var.s3_replication_iam_role_arn

bucket = aws_s3_bucket.registry-k8s-io.id

dynamic "rule" {
for_each = var.s3_replication_rules

content {
id = rule.value.id

status = rule.value.status

# Set priority, filter and delete_marker_replication to use V2 schema for multiple
# destination bucket rules
priority = rule.value.priority

filter {}

delete_marker_replication {
status = "Enabled"
}



destination {
bucket = rule.value.destination_bucket_arn
storage_class = rule.value.destination_bucket_storage_class

metrics {
status = "Enabled"
}
}
}
}
}

17 changes: 17 additions & 0 deletions infra/aws/terraform/registry.k8s.io/s3/data.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
Copyright 2022 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

data "aws_region" "current" {}
16 changes: 12 additions & 4 deletions infra/aws/terraform/registry.k8s.io/s3/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,19 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

variable "region" {
type = string
}

variable "prefix" {
type = string
default = ""
}

variable "s3_replication_iam_role_arn" {
description = "IAM role assumed by S3 service for replication"
type = string
default = ""
}

variable "s3_replication_rules" {
description = "List of maps for S3 replication rules"
type = list(map(string))
default = []
}
27 changes: 27 additions & 0 deletions infra/aws/terraform/registry.k8s.io/s3/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
Copyright 2022 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

terraform {

required_version = ">= 1.0.0"

required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 4.0"
}
}
}

0 comments on commit 988b871

Please sign in to comment.