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.

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

Allow service role to be passed in #116

Merged
merged 16 commits into from
Jun 15, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Changed var.eks_service_role_arn description and updated main.tf to u…
…se it instead of the originally proposed map.
  • Loading branch information
Ben Leibig committed Nov 11, 2020
commit 8284061962455feba8358ce9790d81361a2b5a74
2 changes: 1 addition & 1 deletion iam.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ data "aws_iam_policy_document" "assume_role" {
}
}
locals {
eks_service_role = var.eks_cluster_service_role != null ? var.eks_cluster_service_role : aws_iam_role.default
eks_service_role = var.eks_cluster_service_role_arn != null ? var.eks_cluster_service_role_arn : aws_iam_role.default.arn
}
resource "aws_iam_role" "default" {
count = var.eks_cluster_service_role != null && local.enabled ? 1 : 0
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ variable "workers_role_arns" {

variable "eks_cluster_service_role_arn" {
type = string
description = "The entire output map of aws_iam_role for the eks service role, or leave blank to create one"
description = "The arn of an externally created eks service role to use, or leave blank to create one"
nitrocode marked this conversation as resolved.
Show resolved Hide resolved
default = null
}

Expand Down