From c0e82f799e06db53954628ef00432516453b32eb Mon Sep 17 00:00:00 2001 From: rrrkharse Date: Mon, 8 May 2023 23:15:54 +0000 Subject: [PATCH] Update the EKS blueprints module version in use to release v4.31 --- .../cognito-rds-s3-components/main.tf | 6 ++-- deployments/cognito-rds-s3/terraform/main.tf | 4 +-- deployments/cognito/terraform/main.tf | 4 +-- deployments/rds-s3/terraform/main.tf | 4 +-- .../terraform/rds-s3-components/main.tf | 6 ++-- deployments/vanilla/terraform/main.tf | 4 +-- iaac/terraform/apps/admission-webhook/main.tf | 2 +- iaac/terraform/apps/central-dashboard/main.tf | 2 +- iaac/terraform/apps/jupyter-web-app/main.tf | 2 +- iaac/terraform/apps/katib/main.tf | 2 +- .../terraform/apps/kubeflow-pipelines/main.tf | 2 +- iaac/terraform/apps/models-web-app/main.tf | 2 +- .../apps/notebook-controller/main.tf | 2 +- iaac/terraform/apps/profiles-and-kfam/main.tf | 4 +-- .../apps/tensorboard-controller/main.tf | 2 +- .../apps/tensorboards-web-app/main.tf | 2 +- iaac/terraform/apps/training-operator/main.tf | 2 +- iaac/terraform/apps/volumes-web-app/main.tf | 2 +- .../common/ack-sagemaker-controller/main.tf | 4 +-- iaac/terraform/common/aws-authservice/main.tf | 2 +- .../common/aws-secrets-manager/main.tf | 2 +- iaac/terraform/common/aws-telemetry/main.tf | 2 +- .../common/cluster-local-gateway/main.tf | 2 +- iaac/terraform/common/dex/main.tf | 2 +- iaac/terraform/common/istio/main.tf | 2 +- .../terraform/common/knative-eventing/main.tf | 2 +- iaac/terraform/common/knative-serving/main.tf | 2 +- iaac/terraform/common/kserve/main.tf | 2 +- iaac/terraform/common/kubeflow-issuer/main.tf | 2 +- .../common/kubeflow-istio-resources/main.tf | 2 +- iaac/terraform/common/kubeflow-roles/main.tf | 2 +- .../terraform/common/oidc-authservice/main.tf | 2 +- iaac/terraform/common/user-namespace/main.tf | 2 +- tests/e2e/utils/auto-efs-setup.py | 29 ++++++++++++++----- 34 files changed, 65 insertions(+), 50 deletions(-) diff --git a/deployments/cognito-rds-s3/terraform/cognito-rds-s3-components/main.tf b/deployments/cognito-rds-s3/terraform/cognito-rds-s3-components/main.tf index 72c934575..75a67f2c0 100644 --- a/deployments/cognito-rds-s3/terraform/cognito-rds-s3-components/main.tf +++ b/deployments/cognito-rds-s3/terraform/cognito-rds-s3-components/main.tf @@ -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 @@ -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 @@ -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 diff --git a/deployments/cognito-rds-s3/terraform/main.tf b/deployments/cognito-rds-s3/terraform/main.tf index a6790cb4a..25a75339b 100644 --- a/deployments/cognito-rds-s3/terraform/main.tf +++ b/deployments/cognito-rds-s3/terraform/main.tf @@ -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 @@ -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 diff --git a/deployments/cognito/terraform/main.tf b/deployments/cognito/terraform/main.tf index 16c7ac86e..d1b932a41 100644 --- a/deployments/cognito/terraform/main.tf +++ b/deployments/cognito/terraform/main.tf @@ -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 @@ -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 diff --git a/deployments/rds-s3/terraform/main.tf b/deployments/rds-s3/terraform/main.tf index 60fa07fe7..9ac833de5 100644 --- a/deployments/rds-s3/terraform/main.tf +++ b/deployments/rds-s3/terraform/main.tf @@ -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 @@ -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 diff --git a/deployments/rds-s3/terraform/rds-s3-components/main.tf b/deployments/rds-s3/terraform/rds-s3-components/main.tf index e307c1fe2..bf90e095e 100644 --- a/deployments/rds-s3/terraform/rds-s3-components/main.tf +++ b/deployments/rds-s3/terraform/rds-s3-components/main.tf @@ -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 @@ -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 @@ -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 diff --git a/deployments/vanilla/terraform/main.tf b/deployments/vanilla/terraform/main.tf index 55860b4dc..a08c76307 100644 --- a/deployments/vanilla/terraform/main.tf +++ b/deployments/vanilla/terraform/main.tf @@ -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 @@ -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 diff --git a/iaac/terraform/apps/admission-webhook/main.tf b/iaac/terraform/apps/admission-webhook/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/admission-webhook/main.tf +++ b/iaac/terraform/apps/admission-webhook/main.tf @@ -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 } diff --git a/iaac/terraform/apps/central-dashboard/main.tf b/iaac/terraform/apps/central-dashboard/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/central-dashboard/main.tf +++ b/iaac/terraform/apps/central-dashboard/main.tf @@ -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 } diff --git a/iaac/terraform/apps/jupyter-web-app/main.tf b/iaac/terraform/apps/jupyter-web-app/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/jupyter-web-app/main.tf +++ b/iaac/terraform/apps/jupyter-web-app/main.tf @@ -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 } diff --git a/iaac/terraform/apps/katib/main.tf b/iaac/terraform/apps/katib/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/katib/main.tf +++ b/iaac/terraform/apps/katib/main.tf @@ -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 } diff --git a/iaac/terraform/apps/kubeflow-pipelines/main.tf b/iaac/terraform/apps/kubeflow-pipelines/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/kubeflow-pipelines/main.tf +++ b/iaac/terraform/apps/kubeflow-pipelines/main.tf @@ -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 } diff --git a/iaac/terraform/apps/models-web-app/main.tf b/iaac/terraform/apps/models-web-app/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/models-web-app/main.tf +++ b/iaac/terraform/apps/models-web-app/main.tf @@ -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 } diff --git a/iaac/terraform/apps/notebook-controller/main.tf b/iaac/terraform/apps/notebook-controller/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/notebook-controller/main.tf +++ b/iaac/terraform/apps/notebook-controller/main.tf @@ -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 } diff --git a/iaac/terraform/apps/profiles-and-kfam/main.tf b/iaac/terraform/apps/profiles-and-kfam/main.tf index 904a9c766..9aaf9c8a0 100644 --- a/iaac/terraform/apps/profiles-and-kfam/main.tf +++ b/iaac/terraform/apps/profiles-and-kfam/main.tf @@ -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 @@ -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 } diff --git a/iaac/terraform/apps/tensorboard-controller/main.tf b/iaac/terraform/apps/tensorboard-controller/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/tensorboard-controller/main.tf +++ b/iaac/terraform/apps/tensorboard-controller/main.tf @@ -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 } diff --git a/iaac/terraform/apps/tensorboards-web-app/main.tf b/iaac/terraform/apps/tensorboards-web-app/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/tensorboards-web-app/main.tf +++ b/iaac/terraform/apps/tensorboards-web-app/main.tf @@ -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 } diff --git a/iaac/terraform/apps/training-operator/main.tf b/iaac/terraform/apps/training-operator/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/training-operator/main.tf +++ b/iaac/terraform/apps/training-operator/main.tf @@ -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 } diff --git a/iaac/terraform/apps/volumes-web-app/main.tf b/iaac/terraform/apps/volumes-web-app/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/apps/volumes-web-app/main.tf +++ b/iaac/terraform/apps/volumes-web-app/main.tf @@ -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 } diff --git a/iaac/terraform/common/ack-sagemaker-controller/main.tf b/iaac/terraform/common/ack-sagemaker-controller/main.tf index d1e228824..8e20c1b8c 100644 --- a/iaac/terraform/common/ack-sagemaker-controller/main.tf +++ b/iaac/terraform/common/ack-sagemaker-controller/main.tf @@ -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 @@ -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 = [ diff --git a/iaac/terraform/common/aws-authservice/main.tf b/iaac/terraform/common/aws-authservice/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/aws-authservice/main.tf +++ b/iaac/terraform/common/aws-authservice/main.tf @@ -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 } diff --git a/iaac/terraform/common/aws-secrets-manager/main.tf b/iaac/terraform/common/aws-secrets-manager/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/aws-secrets-manager/main.tf +++ b/iaac/terraform/common/aws-secrets-manager/main.tf @@ -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 } diff --git a/iaac/terraform/common/aws-telemetry/main.tf b/iaac/terraform/common/aws-telemetry/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/aws-telemetry/main.tf +++ b/iaac/terraform/common/aws-telemetry/main.tf @@ -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 } diff --git a/iaac/terraform/common/cluster-local-gateway/main.tf b/iaac/terraform/common/cluster-local-gateway/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/cluster-local-gateway/main.tf +++ b/iaac/terraform/common/cluster-local-gateway/main.tf @@ -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 } diff --git a/iaac/terraform/common/dex/main.tf b/iaac/terraform/common/dex/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/dex/main.tf +++ b/iaac/terraform/common/dex/main.tf @@ -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 } diff --git a/iaac/terraform/common/istio/main.tf b/iaac/terraform/common/istio/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/istio/main.tf +++ b/iaac/terraform/common/istio/main.tf @@ -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 } diff --git a/iaac/terraform/common/knative-eventing/main.tf b/iaac/terraform/common/knative-eventing/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/knative-eventing/main.tf +++ b/iaac/terraform/common/knative-eventing/main.tf @@ -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 } diff --git a/iaac/terraform/common/knative-serving/main.tf b/iaac/terraform/common/knative-serving/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/knative-serving/main.tf +++ b/iaac/terraform/common/knative-serving/main.tf @@ -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 } diff --git a/iaac/terraform/common/kserve/main.tf b/iaac/terraform/common/kserve/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/kserve/main.tf +++ b/iaac/terraform/common/kserve/main.tf @@ -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 } diff --git a/iaac/terraform/common/kubeflow-issuer/main.tf b/iaac/terraform/common/kubeflow-issuer/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/kubeflow-issuer/main.tf +++ b/iaac/terraform/common/kubeflow-issuer/main.tf @@ -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 } diff --git a/iaac/terraform/common/kubeflow-istio-resources/main.tf b/iaac/terraform/common/kubeflow-istio-resources/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/kubeflow-istio-resources/main.tf +++ b/iaac/terraform/common/kubeflow-istio-resources/main.tf @@ -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 } diff --git a/iaac/terraform/common/kubeflow-roles/main.tf b/iaac/terraform/common/kubeflow-roles/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/kubeflow-roles/main.tf +++ b/iaac/terraform/common/kubeflow-roles/main.tf @@ -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 } diff --git a/iaac/terraform/common/oidc-authservice/main.tf b/iaac/terraform/common/oidc-authservice/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/oidc-authservice/main.tf +++ b/iaac/terraform/common/oidc-authservice/main.tf @@ -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 } diff --git a/iaac/terraform/common/user-namespace/main.tf b/iaac/terraform/common/user-namespace/main.tf index 507708f58..9b8297a26 100644 --- a/iaac/terraform/common/user-namespace/main.tf +++ b/iaac/terraform/common/user-namespace/main.tf @@ -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 } diff --git a/tests/e2e/utils/auto-efs-setup.py b/tests/e2e/utils/auto-efs-setup.py index 138665359..698b3be2b 100755 --- a/tests/e2e/utils/auto-efs-setup.py +++ b/tests/e2e/utils/auto-efs-setup.py @@ -14,8 +14,10 @@ def main(): verify_prerequisites() - setup_iam_authorization() - setup_efs_driver() + if not SETUP_FOR_TERRAFORM: + setup_iam_authorization() + setup_efs_driver() + setup_efs_file_system() setup_efs_provisioning() @@ -51,9 +53,15 @@ def verify_oidc_provider_prerequisite(): def is_oidc_provider_present() -> bool: eks_client = get_eks_client() try: - https_oidc_provider = eks_client.describe_cluster( - name=CLUSTER_NAME, - ).get('cluster').get('identity').get('oidc').get('issuer') + https_oidc_provider = ( + eks_client.describe_cluster( + name=CLUSTER_NAME, + ) + .get("cluster") + .get("identity") + .get("oidc") + .get("issuer") + ) return True if "oidc" in https_oidc_provider else False except: return False @@ -340,7 +348,6 @@ def wait_for_efs_file_system_to_become_available(efs_file_system_creation_token) print("Waiting for EFS file system to become available...") while status != "available": - status = efs_client.describe_file_systems( CreationToken=efs_file_system_creation_token )["FileSystems"][0]["LifeCycleState"] @@ -422,7 +429,6 @@ def create_mount_targets(efs_client, efs_security_group_id, file_system_id, subn def wait_for_mount_target_to_become_available(efs_client, mount_target_ids): for mount_target_id in mount_target_ids: - status = None print(f"Waiting for EFS mount target {mount_target_id} to become available...") @@ -586,6 +592,14 @@ def footer(): help=f"Specify the path to the source files if different. Default is set to empty.", required=False, ) +SETUP_FOR_TERRAFORM_DEFAULT = False +parser.add_argument( + "--setup-for-terraform", + default=SETUP_FOR_TERRAFORM_DEFAULT, + action="store_true", + help=f"Skips the creation of the service account for the EFS controller and skips installing the EFS CSI driver since the default Terraform installation performs these steps by default.", + required=False, +) args, _ = parser.parse_known_args() @@ -599,6 +613,7 @@ def footer(): EFS_GID = args.efs_gid EFS_UID = args.efs_uid DIRECTORY_PATH = args.directory + SETUP_FOR_TERRAFORM = args.setup_for_terraform AWS_ACCOUNT_ID = boto3.client("sts").get_caller_identity()["Account"] EFS_IAM_POLICY_NAME = "AmazonEKS_EFS_CSI_Driver_Policy" + EFS_FILE_SYSTEM_NAME