Skip to content
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

Migrate to v5 blueprints #779

Merged
merged 3 commits into from
Aug 28, 2023
Merged

Migrate to v5 blueprints #779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c3fe91
migrate to v5 blueprints
ananth102 Aug 15, 2023
9684ab6
moving the ebs csi irsa to a common module
ananth102 Aug 24, 2023
cdd7c2a
ran terraform fmt
ananth102 Aug 28, 2023
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
84 changes: 58 additions & 26 deletions deployments/cognito-rds-s3/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,54 +126,76 @@ module "eks_blueprints" {
tags = local.tags
}

module "ebs_csi_driver_irsa" {
source = "../../../iaac/terraform/aws-infra/ebs-csi-driver-irsa"
cluster_name = local.cluster_name
cluster_region = local.region
tags = local.tags
eks_oidc_provider_arn = module.eks_blueprints.eks_oidc_provider_arn
}

module "eks_blueprints_kubernetes_addons" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.32.1"
source = "aws-ia/eks-blueprints-addons/aws"
version = "~> 1.0" #ensure to update this to the latest/desired version

eks_cluster_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
eks_oidc_provider = module.eks_blueprints.oidc_provider
eks_cluster_version = module.eks_blueprints.eks_cluster_version
cluster_name = local.cluster_name
cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
cluster_version = module.eks_blueprints.eks_cluster_version
oidc_provider_arn = module.eks_blueprints.eks_oidc_provider_arn

# EKS Managed Add-ons
enable_amazon_eks_vpc_cni = true
enable_amazon_eks_coredns = true
enable_amazon_eks_kube_proxy = true
enable_amazon_eks_aws_ebs_csi_driver = true
depends_on = [module.ebs_csi_driver_irsa, module.eks_data_addons]

eks_addons = {
aws-ebs-csi-driver = {
most_recent = true
service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
}
coredns = {
most_recent = true
}
vpc-cni = {
most_recent = true
}
kube-proxy = {
most_recent = true
}
}

# EKS Blueprints Add-ons
enable_cert_manager = true
enable_aws_load_balancer_controller = true
enable_cert_manager = true

aws_efs_csi_driver_helm_config = {
namespace = "kube-system"
version = "2.4.1"
cert_manager = {
chart_version = "v1.10.0"
}

enable_aws_efs_csi_driver = true
enable_aws_fsx_csi_driver = true

aws_fsx_csi_driver_helm_config = {
namespace = "kube-system"
version = "1.5.1"
}

enable_aws_fsx_csi_driver = true
aws_efs_csi_driver = {
namespace = "kube-system"
chart_version = "2.4.1"
surajkota marked this conversation as resolved.
Show resolved Hide resolved
}

enable_nvidia_device_plugin = local.using_gpu
aws_fsx_csi_driver = {
namespace = "kube-system"
chart_version = "1.5.1"
}

secrets_store_csi_driver_helm_config = {
namespace = "kube-system"
version = "1.3.2"
secrets_store_csi_driver = {
namespace = "kube-system"
chart_version = "1.3.2"
set = [
{
name = "syncSecret.enabled",
value = "true"
}
]
}
enable_secrets_store_csi_driver = true

enable_secrets_store_csi_driver = true

csi_secrets_store_provider_aws_helm_config = {
secrets_store_csi_driver_provider_aws = {
namespace = "kube-system"
set = [
{
Expand All @@ -182,10 +204,19 @@ module "eks_blueprints_kubernetes_addons" {
}
]
}

enable_secrets_store_csi_driver_provider_aws = true

tags = local.tags
}

module "eks_data_addons" {
source = "aws-ia/eks-data-addons/aws"
version = "~> 1.0" # ensure to update this to the latest/desired version

oidc_provider_arn = module.eks_blueprints.eks_oidc_provider_arn
surajkota marked this conversation as resolved.
Show resolved Hide resolved

enable_nvidia_gpu_operator = local.using_gpu
}

# todo: update the blueprints repo code to export the desired values as outputs
Expand Down Expand Up @@ -249,6 +280,7 @@ module "kubeflow_components" {

tags = local.tags


ananth102 marked this conversation as resolved.
Show resolved Hide resolved
providers = {
aws = aws
aws.virginia = aws.virginia
Expand Down
72 changes: 51 additions & 21 deletions deployments/cognito/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,42 +127,72 @@ module "eks_blueprints" {
tags = local.tags
}

module "ebs_csi_driver_irsa" {
source = "../../../iaac/terraform/aws-infra/ebs-csi-driver-irsa"
cluster_name = local.cluster_name
cluster_region = local.region
tags = local.tags
eks_oidc_provider_arn = module.eks_blueprints.eks_oidc_provider_arn
}

module "eks_blueprints_kubernetes_addons" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.32.1"
source = "aws-ia/eks-blueprints-addons/aws"
version = "~> 1.0" #ensure to update this to the latest/desired version

eks_cluster_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
eks_oidc_provider = module.eks_blueprints.oidc_provider
eks_cluster_version = module.eks_blueprints.eks_cluster_version
cluster_name = local.cluster_name
cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
cluster_version = module.eks_blueprints.eks_cluster_version
oidc_provider_arn = module.eks_blueprints.eks_oidc_provider_arn

# EKS Managed Add-ons
enable_amazon_eks_vpc_cni = true
enable_amazon_eks_coredns = true
enable_amazon_eks_kube_proxy = true
enable_amazon_eks_aws_ebs_csi_driver = true
depends_on = [module.ebs_csi_driver_irsa, module.eks_data_addons]

eks_addons = {
aws-ebs-csi-driver = {
most_recent = true
service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
}
coredns = {
most_recent = true
}
vpc-cni = {
most_recent = true
}
kube-proxy = {
most_recent = true
}
}

# EKS Blueprints Add-ons
enable_cert_manager = true
enable_aws_load_balancer_controller = true
enable_cert_manager = true

aws_efs_csi_driver_helm_config = {
namespace = "kube-system"
version = "2.4.1"
cert_manager = {
chart_version = "v1.10.0"
}

enable_aws_efs_csi_driver = true
enable_aws_fsx_csi_driver = true

aws_fsx_csi_driver_helm_config = {
namespace = "kube-system"
version = "1.5.1"
}

enable_aws_fsx_csi_driver = true
aws_efs_csi_driver = {
namespace = "kube-system"
chart_version = "2.4.1"
}

enable_nvidia_device_plugin = local.using_gpu
aws_fsx_csi_driver = {
namespace = "kube-system"
chart_version = "1.5.1"
}

tags = local.tags
}

module "eks_data_addons" {
source = "aws-ia/eks-data-addons/aws"
version = "~> 1.0" # ensure to update this to the latest/desired version

oidc_provider_arn = module.eks_blueprints.eks_oidc_provider_arn

enable_nvidia_gpu_operator = local.using_gpu
}

# todo: update the blueprints repo code to export the desired values as outputs
Expand Down
83 changes: 57 additions & 26 deletions deployments/rds-s3/terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,54 +119,76 @@ module "eks_blueprints" {
tags = local.tags
}

module "ebs_csi_driver_irsa" {
source = "../../../iaac/terraform/aws-infra/ebs-csi-driver-irsa"
cluster_name = local.cluster_name
cluster_region = local.region
tags = local.tags
eks_oidc_provider_arn = module.eks_blueprints.eks_oidc_provider_arn
}

module "eks_blueprints_kubernetes_addons" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.32.1"
source = "aws-ia/eks-blueprints-addons/aws"
version = "~> 1.0" #ensure to update this to the latest/desired version

eks_cluster_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
eks_oidc_provider = module.eks_blueprints.oidc_provider
eks_cluster_version = module.eks_blueprints.eks_cluster_version
cluster_name = local.cluster_name
cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
cluster_version = module.eks_blueprints.eks_cluster_version
oidc_provider_arn = module.eks_blueprints.eks_oidc_provider_arn

# EKS Managed Add-ons
enable_amazon_eks_vpc_cni = true
enable_amazon_eks_coredns = true
enable_amazon_eks_kube_proxy = true
enable_amazon_eks_aws_ebs_csi_driver = true
depends_on = [module.ebs_csi_driver_irsa, module.eks_data_addons]

eks_addons = {
aws-ebs-csi-driver = {
most_recent = true
service_account_role_arn = module.ebs_csi_driver_irsa.iam_role_arn
}
coredns = {
most_recent = true
}
vpc-cni = {
most_recent = true
}
kube-proxy = {
most_recent = true
}
}

# EKS Blueprints Add-ons
enable_cert_manager = true
enable_aws_load_balancer_controller = true
enable_cert_manager = true

aws_efs_csi_driver_helm_config = {
namespace = "kube-system"
version = "2.4.1"
cert_manager = {
chart_version = "v1.10.0"
}

enable_aws_efs_csi_driver = true
enable_aws_fsx_csi_driver = true

aws_fsx_csi_driver_helm_config = {
namespace = "kube-system"
version = "1.5.1"
}

enable_aws_fsx_csi_driver = true
aws_efs_csi_driver = {
namespace = "kube-system"
chart_version = "2.4.1"
}

enable_nvidia_device_plugin = local.using_gpu
aws_fsx_csi_driver = {
namespace = "kube-system"
chart_version = "1.5.1"
}

secrets_store_csi_driver_helm_config = {
namespace = "kube-system"
version = "1.3.2"
secrets_store_csi_driver = {
namespace = "kube-system"
chart_version = "1.3.2"
set = [
{
name = "syncSecret.enabled",
value = "true"
}
]
}
enable_secrets_store_csi_driver = true

enable_secrets_store_csi_driver = true

csi_secrets_store_provider_aws_helm_config = {
secrets_store_csi_driver_provider_aws = {
namespace = "kube-system"
set = [
{
Expand All @@ -175,10 +197,19 @@ module "eks_blueprints_kubernetes_addons" {
}
]
}

enable_secrets_store_csi_driver_provider_aws = true

tags = local.tags
}

module "eks_data_addons" {
source = "aws-ia/eks-data-addons/aws"
version = "~> 1.0" # ensure to update this to the latest/desired version

oidc_provider_arn = module.eks_blueprints.eks_oidc_provider_arn

enable_nvidia_gpu_operator = local.using_gpu
}

# todo: update the blueprints repo code to export the desired values as outputs
Expand Down
Loading