Skip to content

Commit

Permalink
Update the EKS blueprints module version in use to release v4.31 (#731)
Browse files Browse the repository at this point in the history
- Updated the EKS Blueprints module version in use to v4.31, which
contains the updated permissions fix for the EFS CSI driver to work
correctly with Kubeflow. Details
[here](aws-ia/terraform-aws-eks-blueprints#1581).
- Added the `--skip-driver-installation` flag to the EFS auto setup script as
a temporary workaround for the missing full Terraform EFS add-on support





By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license.
  • Loading branch information
rrrkharse authored May 10, 2023
1 parent 7b8ac17 commit 88862c0
Show file tree
Hide file tree
Showing 35 changed files with 75 additions and 62 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ data "aws_iam_role" "user_namespace_irsa_iam_role" {
}

module "kubeflow_secrets_manager_irsa" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
kubernetes_namespace = kubernetes_namespace.kubeflow.metadata[0].name
create_kubernetes_namespace = false
create_kubernetes_service_account = true
Expand All @@ -84,7 +84,7 @@ module "kubeflow_secrets_manager_irsa" {

module "kubeflow_pipeline_irsa" {
count = local.use_static ? 0 : 1
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
kubernetes_namespace = kubernetes_namespace.kubeflow.metadata[0].name
create_kubernetes_namespace = false
create_kubernetes_service_account = false
Expand All @@ -99,7 +99,7 @@ module "kubeflow_pipeline_irsa" {

module "user_namespace_irsa" {
count = local.use_static ? 0 : 1
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
kubernetes_namespace = "kubeflow-user-example-com"
create_kubernetes_namespace = false
create_kubernetes_service_account = false
Expand Down
4 changes: 2 additions & 2 deletions deployments/cognito-rds-s3/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ data "aws_ec2_instance_type_offerings" "availability_zones_gpu" {
# EKS Blueprints
#---------------------------------------------------------------
module "eks_blueprints" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.31.0"

cluster_name = local.cluster_name
cluster_version = local.eks_version
Expand All @@ -127,7 +127,7 @@ module "eks_blueprints" {
}

module "eks_blueprints_kubernetes_addons" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.31.0"

eks_cluster_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
Expand Down
4 changes: 2 additions & 2 deletions deployments/cognito/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ data "aws_ec2_instance_type_offerings" "availability_zones_gpu" {
# EKS Blueprints
#---------------------------------------------------------------
module "eks_blueprints" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.31.0"

cluster_name = local.cluster_name
cluster_version = local.eks_version
Expand All @@ -128,7 +128,7 @@ module "eks_blueprints" {
}

module "eks_blueprints_kubernetes_addons" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.31.0"

eks_cluster_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
Expand Down
4 changes: 2 additions & 2 deletions deployments/rds-s3/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ data "aws_ec2_instance_type_offerings" "availability_zones_gpu" {
# EKS Blueprints
#---------------------------------------------------------------
module "eks_blueprints" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.31.0"

cluster_name = local.cluster_name
cluster_version = local.eks_version
Expand All @@ -120,7 +120,7 @@ module "eks_blueprints" {
}

module "eks_blueprints_kubernetes_addons" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.31.0"

eks_cluster_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
Expand Down
6 changes: 3 additions & 3 deletions deployments/rds-s3/terraform/rds-s3-components/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aws_iam_role" "user_namespace_irsa_iam_role" {

module "kubeflow_secrets_manager_irsa" {
count = local.use_static || var.use_rds ? 1 : 0
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
kubernetes_namespace = kubernetes_namespace.kubeflow.metadata[0].name
create_kubernetes_namespace = false
create_kubernetes_service_account = true
Expand All @@ -77,7 +77,7 @@ module "kubeflow_secrets_manager_irsa" {

module "kubeflow_pipeline_irsa" {
count = local.use_static ? 0 : 1
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
kubernetes_namespace = kubernetes_namespace.kubeflow.metadata[0].name
create_kubernetes_namespace = false
create_kubernetes_service_account = false
Expand All @@ -92,7 +92,7 @@ module "kubeflow_pipeline_irsa" {

module "user_namespace_irsa" {
count = local.use_static ? 0 : 1
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
kubernetes_namespace = "kubeflow-user-example-com"
create_kubernetes_namespace = false
create_kubernetes_service_account = false
Expand Down
4 changes: 2 additions & 2 deletions deployments/vanilla/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ data "aws_ec2_instance_type_offerings" "availability_zones_gpu" {
# EKS Blueprints
#---------------------------------------------------------------
module "eks_blueprints" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.31.0"

cluster_name = local.cluster_name
cluster_version = local.eks_version
Expand All @@ -119,7 +119,7 @@ module "eks_blueprints" {
}

module "eks_blueprints_kubernetes_addons" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.31.0"

eks_cluster_id = module.eks_blueprints.eks_cluster_id
eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
Expand Down
2 changes: 1 addition & 1 deletion iaac/terraform/apps/admission-webhook/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/apps/central-dashboard/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/apps/jupyter-web-app/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/apps/katib/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/apps/kubeflow-pipelines/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/apps/models-web-app/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/apps/notebook-controller/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
4 changes: 2 additions & 2 deletions iaac/terraform/apps/profiles-and-kfam/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resource "aws_iam_policy" "profile_controller_policy" {
}

module "irsa" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
kubernetes_namespace = "kubeflow"
create_kubernetes_namespace = false
create_kubernetes_service_account = false
Expand All @@ -19,7 +19,7 @@ module "irsa" {
}

module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
Expand Down
2 changes: 1 addition & 1 deletion iaac/terraform/apps/tensorboard-controller/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/apps/tensorboards-web-app/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/apps/training-operator/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/apps/volumes-web-app/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
4 changes: 2 additions & 2 deletions iaac/terraform/common/ack-sagemaker-controller/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resource "aws_iam_policy" "sagemaker_ack_controller_studio_access" {
}

module "irsa" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
kubernetes_namespace = local.namespace
create_kubernetes_namespace = true
create_kubernetes_service_account = false
Expand All @@ -19,7 +19,7 @@ module "irsa" {
}

module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
manage_via_gitops = false
helm_config = local.helm_config
set_values = [
Expand Down
2 changes: 1 addition & 1 deletion iaac/terraform/common/aws-authservice/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/aws-secrets-manager/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/aws-telemetry/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/cluster-local-gateway/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/dex/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/istio/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/knative-eventing/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/knative-serving/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/kserve/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/kubeflow-issuer/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/kubeflow-istio-resources/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/kubeflow-roles/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/oidc-authservice/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
2 changes: 1 addition & 1 deletion iaac/terraform/common/user-namespace/main.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "helm_addon" {
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
helm_config = local.helm_config
addon_context = var.addon_context
}
Loading

0 comments on commit 88862c0

Please sign in to comment.