-
Notifications
You must be signed in to change notification settings - Fork 141
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Vpc upgrade version aws module (#456)
- Loading branch information
Showing
5 changed files
with
106 additions
and
79 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,87 +1,81 @@ | ||
| module "iam_assumable_role_admin" { | ||
| source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc" | ||
| version = "3.6.0" | ||
| create_role = true | ||
| role_name = "cluster-autoscaler-${var.cluster_name}" | ||
| provider_url = replace(var.eks_cluster_oidc_issuer_url, "https://", "") | ||
| role_policy_arns = [aws_iam_policy.cluster_autoscaler.arn] | ||
| oidc_fully_qualified_subjects = ["system:serviceaccount:${var.k8s_service_account_namespace}:${var.k8s_service_account_name}"] | ||
| } | ||
| module "iam_assumable_role_admin" { | ||
| source = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc" | ||
| version = "5.33.0" | ||
| create_role = true | ||
| role_name = "cluster-autoscaler-${var.cluster_name}" | ||
| provider_url = replace(var.eks_cluster_oidc_issuer_url, "https://", "") | ||
| role_policy_arns = [aws_iam_policy.cluster_autoscaler.arn] | ||
| oidc_fully_qualified_subjects = ["system:serviceaccount:${var.k8s_service_account_namespace}:${var.k8s_service_account_name}"] | ||
| } | ||
|
|
||
| resource "aws_iam_policy" "cluster_autoscaler" { | ||
| name_prefix = "cluster-autoscaler-${var.cluster_name}" | ||
| description = "EKS cluster-autoscaler policy for cluster ${var.eks_cluster_id}" | ||
| policy = data.aws_iam_policy_document.cluster_autoscaler.json | ||
| } | ||
| resource "aws_iam_policy" "cluster_autoscaler" { | ||
| name_prefix = "cluster-autoscaler-${var.cluster_name}" | ||
| description = "EKS cluster-autoscaler policy for cluster ${var.eks_cluster_id}" | ||
| policy = data.aws_iam_policy_document.cluster_autoscaler.json | ||
| } | ||
|
|
||
| data "aws_iam_policy_document" "cluster_autoscaler" { | ||
| statement { | ||
| sid = "clusterAutoscalerAll" | ||
| effect = "Allow" | ||
| data "aws_iam_policy_document" "cluster_autoscaler" { | ||
| statement { | ||
| sid = "clusterAutoscalerAll" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "autoscaling:DescribeAutoScalingGroups", | ||
| "autoscaling:DescribeAutoScalingInstances", | ||
| "autoscaling:DescribeLaunchConfigurations", | ||
| "autoscaling:DescribeTags", | ||
| "ec2:DescribeLaunchTemplateVersions", | ||
| ] | ||
| actions = [ | ||
| "autoscaling:DescribeAutoScalingGroups", | ||
| "autoscaling:DescribeAutoScalingInstances", | ||
| "autoscaling:DescribeLaunchConfigurations", | ||
| "autoscaling:DescribeTags", | ||
| "ec2:DescribeLaunchTemplateVersions", | ||
| ] | ||
|
|
||
| resources = ["*"] | ||
| } | ||
| resources = ["*"] | ||
| } | ||
|
|
||
| statement { | ||
| sid = "clusterAutoscalerOwn" | ||
| effect = "Allow" | ||
| statement { | ||
| sid = "clusterAutoscalerOwn" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "autoscaling:SetDesiredCapacity", | ||
| "autoscaling:TerminateInstanceInAutoScalingGroup", | ||
| "autoscaling:UpdateAutoScalingGroup", | ||
| ] | ||
| actions = [ | ||
| "autoscaling:SetDesiredCapacity", | ||
| "autoscaling:TerminateInstanceInAutoScalingGroup", | ||
| "autoscaling:UpdateAutoScalingGroup", | ||
| ] | ||
|
|
||
| resources = ["*"] | ||
| resources = ["*"] | ||
|
|
||
| condition { | ||
| test = "StringEquals" | ||
| variable = "autoscaling:ResourceTag/kubernetes.io/cluster/${var.eks_cluster_id}" | ||
| values = ["owned"] | ||
| } | ||
| condition { | ||
| test = "StringEquals" | ||
| variable = "autoscaling:ResourceTag/kubernetes.io/cluster/${var.eks_cluster_id}" | ||
| values = ["owned"] | ||
| } | ||
|
|
||
| condition { | ||
| test = "StringEquals" | ||
| variable = "autoscaling:ResourceTag/k8s.io/cluster-autoscaler/enabled" | ||
| values = ["true"] | ||
| } | ||
| } | ||
| } | ||
| condition { | ||
| test = "StringEquals" | ||
| variable = "autoscaling:ResourceTag/k8s.io/cluster-autoscaler/enabled" | ||
| values = ["true"] | ||
| } | ||
| } | ||
| } | ||
|
|
||
| data "aws_caller_identity" "current" {} | ||
| data "aws_caller_identity" "current" {} | ||
|
|
||
| # | ||
| # Helm - cluster-autoscaler | ||
| # | ||
| data "template_file" "helm_values" { | ||
| template = file("${path.module}/helm_values.yaml.tpl") | ||
| vars = { | ||
| awsAccountID = data.aws_caller_identity.current.account_id | ||
| awsRegion = var.aws_region | ||
| clusterName = var.cluster_name | ||
| serviceAccountName = var.k8s_service_account_name | ||
| } | ||
| } | ||
| module "cluster-autoscaler" { | ||
| source = "github.com/ManagedKube/kubernetes-ops//terraform-modules/aws/helm/helm_generic?ref=v1.0.9" | ||
|
|
||
| module "cluster-autoscaler" { | ||
| source = "github.com/ManagedKube/kubernetes-ops//terraform-modules/aws/helm/helm_generic?ref=v1.0.9" | ||
|
|
||
| repository = "https://kubernetes.github.io/autoscaler" | ||
| official_chart_name = "cluster-autoscaler" | ||
| user_chart_name = "cluster-autoscaler" | ||
| helm_version = var.cluster-autoscaler_helm_version | ||
| namespace = "kube-system" | ||
| helm_values = data.template_file.helm_values.rendered | ||
|
|
||
| depends_on = [ | ||
| module.iam_assumable_role_admin | ||
| ] | ||
| } | ||
| repository = "https://kubernetes.github.io/autoscaler" | ||
| official_chart_name = "cluster-autoscaler" | ||
| user_chart_name = "cluster-autoscaler" | ||
| helm_version = var.cluster-autoscaler_helm_version | ||
| namespace = "kube-system" | ||
| helm_values = templatefile( | ||
| "${path.module}/helm_values.yaml.tpl", | ||
| { | ||
| awsAccountID = data.aws_caller_identity.current.account_id | ||
| awsRegion = var.aws_region | ||
| clusterName = var.cluster_name | ||
| serviceAccountName = var.k8s_service_account_name | ||
| } | ||
| ) | ||
| depends_on = [ | ||
| module.iam_assumable_role_admin | ||
| ] | ||
| } |
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