-
Notifications
You must be signed in to change notification settings - Fork 72
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use Hosted Control Planes for ROSA to speed up cluster creation
- Remove multi-az cluster create options - Remove need for ccoctl when provisioning EFS as the cloud-credential-operator is not installed on HCP clusters Resolves #673 Signed-off-by: Ryan Emerson <[email protected]>
- Loading branch information
1 parent
4e1e1b0
commit 31f246e
Showing
37 changed files
with
1,411 additions
and
194 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
To initiate the remote S3 bucket and Dynamo DB for storing the team's OpenTofu workspaces, | ||
execute the following commands in this directory: | ||
|
||
1. `tofu init` | ||
2. `tofu apply` | ||
|
||
NOTE: This should only be performed once to initiate/recreate the team's S3 state bucket |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
provider "aws" { | ||
region = "eu-west-1" | ||
} | ||
|
||
resource "aws_s3_bucket" "terraform_state" { | ||
bucket = "kcb-tf-state" | ||
|
||
lifecycle { | ||
prevent_destroy = true | ||
} | ||
} | ||
|
||
resource "aws_s3_bucket_versioning" "terraform_state" { | ||
bucket = aws_s3_bucket.terraform_state.id | ||
versioning_configuration { | ||
status = "Enabled" | ||
} | ||
} | ||
|
||
resource "aws_dynamodb_table" "terraform_state_lock" { | ||
name = "app-state" | ||
read_capacity = 1 | ||
write_capacity = 1 | ||
hash_key = "LockID" | ||
|
||
attribute { | ||
name = "LockID" | ||
type = "S" | ||
} | ||
} | ||
|
||
resource "aws_s3_bucket_policy" "terraform_state" { | ||
bucket = "${aws_s3_bucket.terraform_state.id}" | ||
policy =<<EOF | ||
{ | ||
"Version": "2012-10-17", | ||
"Id": "RequireEncryption", | ||
"Statement": [ | ||
{ | ||
"Sid": "RequireEncryptedTransport", | ||
"Effect": "Deny", | ||
"Action": ["s3:*"], | ||
"Resource": ["arn:aws:s3:::${aws_s3_bucket.terraform_state.bucket}/*"], | ||
"Condition": { | ||
"Bool": { | ||
"aws:SecureTransport": "false" | ||
} | ||
}, | ||
"Principal": "*" | ||
}, | ||
{ | ||
"Sid": "RequireEncryptedStorage", | ||
"Effect": "Deny", | ||
"Action": ["s3:PutObject"], | ||
"Resource": ["arn:aws:s3:::${aws_s3_bucket.terraform_state.bucket}/*"], | ||
"Condition": { | ||
"StringNotEquals": { | ||
"s3:x-amz-server-side-encryption": "AES256" | ||
} | ||
}, | ||
"Principal": "*" | ||
} | ||
] | ||
} | ||
EOF | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,3 @@ | ||
manifests | ||
ccoctl | ||
iam-trust.json |
20 changes: 0 additions & 20 deletions
20
provision/aws/efs/credentialRequests/openshift-aws-efs-csi-driver-credential-request.yaml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
{ | ||
"Version": "2012-10-17", | ||
"Statement": [ | ||
{ | ||
"Effect": "Allow", | ||
"Action": [ | ||
"elasticfilesystem:DescribeMountTargets", | ||
"elasticfilesystem:DescribeAccessPoints", | ||
"elasticfilesystem:DescribeFileSystems", | ||
"elasticfilesystem:ClientMount", | ||
"elasticfilesystem:ClientWrite", | ||
"elasticfilesystem:CreateTags", | ||
"elasticfilesystem:CreateMountTarget", | ||
"elasticfilesystem:DeleteMountTarget", | ||
"elasticfilesystem:DeleteTags", | ||
"elasticfilesystem:TagResource", | ||
"elasticfilesystem:UntagResource" | ||
], | ||
"Resource": "*" | ||
}, | ||
{ | ||
"Effect": "Allow", | ||
"Action": [ | ||
"elasticfilesystem:CreateAccessPoint" | ||
], | ||
"Resource": "*", | ||
"Condition": { | ||
"StringLike": { | ||
"aws:RequestTag/efs.csi.aws.com/cluster": "true" | ||
} | ||
} | ||
}, | ||
{ | ||
"Effect": "Allow", | ||
"Action": "elasticfilesystem:DeleteAccessPoint", | ||
"Resource": "*", | ||
"Condition": { | ||
"StringEquals": { | ||
"aws:ResourceTag/efs.csi.aws.com/cluster": "true" | ||
} | ||
} | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.