-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PLAT-6279: CDK->Terraform conversion process changes for deployer com…
…patibility (#134) * Move iam out of main.tf, make order match deployer * Add variables missing relative to deployer * Adding missing outputs relative to deployer * Reorg slightly to better match deployer config * Move main.tf to a json file so deployer can upgrade it * Update variable description
- Loading branch information
1 parent
c92d6e2
commit 542a0c3
Showing
14 changed files
with
157 additions
and
126 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
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 |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| boto3~=1.26.22 | ||
| PyYAML~=6.0 | ||
| retry~=0.9.2 | ||
| boto3>=1.26.22 | ||
| PyYAML>=6.0 | ||
| retry>=0.9.2 |
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,24 @@ | ||
| data "aws_caller_identity" "admin" {} | ||
| data "aws_partition" "current" {} | ||
|
|
||
| resource "aws_iam_role" "grandfathered_creation_role" { | ||
| name = var.grandfathered_creation_role | ||
|
|
||
| assume_role_policy = jsonencode({ | ||
| Version = "2012-10-17" | ||
| Statement = [ | ||
| { | ||
| Action = "sts:AssumeRole" | ||
| Effect = "Allow" | ||
| Sid = "" | ||
| Principal = { | ||
| AWS = "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.admin.account_id}:root" | ||
| } | ||
| }, | ||
| ] | ||
| }) | ||
|
|
||
| lifecycle { | ||
| ignore_changes = [name, inline_policy] | ||
| } | ||
| } |
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,66 @@ | ||
| { | ||
| "//": "This file is JSON for compatibility with Domino tooling", | ||
| "module": { | ||
| "eks": { | ||
| "source": "github.com/dominodatalab/terraform-aws-eks.git?ref=v1.3.0", | ||
| "deploy_id": "${var.deploy_id}", | ||
| "region": "${var.region}", | ||
| "tags": "${var.tags}", | ||
| "k8s_version": "${var.k8s_version}", | ||
| "default_node_groups": "${var.default_node_groups}", | ||
| "route53_hosted_zone_name": "${var.route53_hosted_zone_name}", | ||
| "bastion": {}, | ||
| "s3_force_destroy_on_deletion": "${var.s3_force_destroy_on_deletion}", | ||
| "ssh_pvt_key_path": "${var.ssh_key_path}", | ||
| "kubeconfig_path": "${var.kubeconfig_path}", | ||
| "use_kms": "${var.use_kms}", | ||
| "kms_key_id": "${var.kms_key_id}", | ||
| "ecr_force_destroy_on_deletion": "${var.ecr_force_destroy_on_deletion}", | ||
| "eks_master_role_names": "${var.eks_master_role_names}", | ||
| "vpc_id": "${var.vpc_id}", | ||
| "public_subnets": "${var.public_subnet_ids}", | ||
| "private_subnets": "${var.private_subnet_ids}", | ||
| "pod_subnets": "${var.pod_subnet_ids}", | ||
| "update_kubeconfig_extra_args": "--role-arn ${aws_iam_role.grandfathered_creation_role.arn}", | ||
| "eks_custom_role_maps": "${var.eks_custom_role_maps}" | ||
| } | ||
| }, | ||
| "output": { | ||
| "KEY_PAIR_NAME": { | ||
| "value": "${module.eks.domino_key_pair.key_name}" | ||
| }, | ||
| "S3_BUCKET_NAME": { | ||
| "value": "${module.eks.s3_buckets.blobs.bucket_name}" | ||
| }, | ||
| "S3_LOG_SNAPS_BUCKET_NAME": { | ||
| "value": "${module.eks.s3_buckets.logs.bucket_name}" | ||
| }, | ||
| "S3_BACKUPS_BUCKET_NAME": { | ||
| "value": "${module.eks.s3_buckets.backups.bucket_name}" | ||
| }, | ||
| "S3_REGISTRY_BUCKET_NAME": { | ||
| "value": "${module.eks.s3_buckets.registry.bucket_name}" | ||
| }, | ||
| "S3_MONITORING_BUCKET_NAME": { | ||
| "value": "${module.eks.s3_buckets.monitoring.bucket_name}" | ||
| }, | ||
| "EXECUTOR_EFS_FS_ID": { | ||
| "value": "${module.eks.efs_file_system.id}" | ||
| }, | ||
| "EXECUTOR_EFS_AP_ID": { | ||
| "value": "${module.eks.efs_access_point.id}" | ||
| }, | ||
| "BASTION_IP": { | ||
| "value": "${module.eks.bastion_ip}" | ||
| }, | ||
| "KMS_KEY_ID": { | ||
| "value": "${module.eks.kms_key_id}" | ||
| }, | ||
| "KMS_KEY_ARN": { | ||
| "value": "${module.eks.kms_key_arn}" | ||
| }, | ||
| "CONTAINER_REGISTRY": { | ||
| "value": "${module.eks.container_registry}" | ||
| } | ||
| } | ||
| } |
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,49 +1,4 @@ | ||
| output "domino_eks" { | ||
| description = "EKS module outputs" | ||
| value = module.domino_eks | ||
| } | ||
|
|
||
| output "KEY_PAIR_NAME" { | ||
| description = "Name of Provisioned AWS Keypair" | ||
| value = module.domino_eks.domino_key_pair.key_name | ||
| } | ||
|
|
||
| output "S3_BUCKET_NAME" { | ||
| description = "Blobs bucket name" | ||
| value = module.domino_eks.s3_buckets.blobs.bucket_name | ||
| } | ||
|
|
||
| output "S3_LOG_SNAPS_BUCKET_NAME" { | ||
| description = "Log bucket name" | ||
| value = module.domino_eks.s3_buckets.logs.bucket_name | ||
| } | ||
|
|
||
| output "S3_BACKUPS_BUCKET_NAME" { | ||
| description = "Backup bucket name" | ||
| value = module.domino_eks.s3_buckets.backups.bucket_name | ||
| } | ||
|
|
||
| output "S3_REGISTRY_BUCKET_NAME" { | ||
| description = "Docker Registry bucket name" | ||
| value = module.domino_eks.s3_buckets.registry.bucket_name | ||
| } | ||
|
|
||
| output "S3_MONITORING_BUCKET_NAME" { | ||
| description = "Monitoring bucket name" | ||
| value = module.domino_eks.s3_buckets.monitoring.bucket_name | ||
| } | ||
|
|
||
| output "EXECUTOR_EFS_FS_ID" { | ||
| description = "EFS filesystem ID" | ||
| value = module.domino_eks.efs_file_system.id | ||
| } | ||
|
|
||
| output "EXECUTOR_EFS_AP_ID" { | ||
| description = "EFS access point ID" | ||
| value = module.domino_eks.efs_access_point.id | ||
| } | ||
|
|
||
| output "BASTION_IP" { | ||
| description = "Bastion instance IP address" | ||
| value = module.domino_eks.bastion_ip | ||
| value = module.eks | ||
| } |
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