Skip to content

Update main.tf #99

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

Open
david-rafay wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Update main.tf #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12c8bd4
Update main.tf
david-rafay Nov 20, 2024
d154711
Update main.tf
david-rafay Nov 20, 2024
e693a46
Update main.tf
david-rafay Nov 20, 2024
c835cbb
Update variables.tf
david-rafay Nov 20, 2024
6a88a9d
Update main.tf
david-rafay Nov 20, 2024
9712256
Update variables.tf
david-rafay Nov 20, 2024
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
117 changes: 2 additions & 115 deletions terraform/caas_terraform/eks/modules/eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,124 +41,12 @@ resource "rafay_eks_cluster" "cluster" {
username = "cluster-admin"
}
}
dynamic "arns" {
for_each = var.instance_profile != null ? [0] : []
content {
arn = var.instance_profile
group = ["system:bootstrappers", "system:nodes"]
username = "system:node:{{EC2PrivateDNSName}}"
}
}
}
iam {
with_oidc = "true"
dynamic "service_accounts" {
for_each = var.instance_profile != null ? [0] : []
content {
metadata {
name = "karpenter"
namespace = "karpenter"
}
attach_policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"ec2:CreateLaunchTemplate",
"ec2:CreateFleet",
"ec2:RunInstances",
"ec2:CreateTags",
"iam:PassRole",
"iam:CreateInstanceProfile",
"iam:GetInstanceProfile",
"iam:TagInstanceProfile",
"iam:AddRoleToInstanceProfile",
"iam:RemoveRoleFromInstanceProfile",
"iam:DeleteInstanceProfile",
"ec2:TerminateInstances",
"ec2:DescribeLaunchTemplates",
"ec2:DescribeInstances",
"ec2:DescribeSecurityGroups",
"ec2:DescribeSubnets",
"ec2:DescribeImage",
"ec2:DescribeImages",
"ec2:DescribeInstanceTypes",
"ec2:DescribeInstanceTypeOfferings",
"ec2:DescribeAvailabilityZones",
"ec2:DeleteLaunchTemplate",
"ssm:GetParameter",
"eks:DescribeCluster",
"pricing:GetProducts",
"pricing:DescribeServices",
"pricing:GetAttributeValues",
"ec2:DescribeSpotPriceHistory"
],
"Resource": [
"*"
]
}
]
}
EOF
}
}
dynamic "service_accounts" {
for_each = var.s3_bucket != null ? [0] : []
content {
metadata {
name = "velero-rafay"
namespace = "rafay-system"
}
attach_policy = <<EOF
{
"Version": "2012-10-17",
"Statement": [
{
"Effect": "Allow",
"Action": [
"ec2:DescribeVolumes",
"ec2:DescribeSnapshots",
"ec2:CreateTags",
"ec2:CreateVolume",
"ec2:CreateSnapshot",
"ec2:DeleteSnapshot"
],
"Resource": "*"
},
{
"Effect": "Allow",
"Action": [
"s3:GetObject",
"s3:DeleteObject",
"s3:PutObject",
"s3:AbortMultipartUpload",
"s3:ListMultipartUploadParts"
],
"Resource": [
"arn:aws:s3:::${var.s3_bucket}/*"
]
},
{
"Effect": "Allow",
"Action": [
"s3:ListBucket"
],
"Resource": [
"arn:aws:s3:::${var.s3_bucket}"
]
}
]
}
EOF
}
}
}
vpc {
dynamic "subnets" {
for_each = var.create_vpc ? {} : {}
content {
subnets {
dynamic "private" {
for_each = var.private_subnet_ids
content {
Expand All @@ -173,7 +61,6 @@ resource "rafay_eks_cluster" "cluster" {
id = public.key
}
}
}
}
cluster_endpoints {
private_access = true
Expand All @@ -184,7 +71,7 @@ resource "rafay_eks_cluster" "cluster" {
for_each = var.managed_nodegroups
content {
name = managed_nodegroups.value.ng_name
ami_family = "AmazonLinux2"
ami_family = "AmazonLinux2023"
iam {
iam_node_group_with_addon_policies {
image_builder = true
Expand Down
17 changes: 0 additions & 17 deletions terraform/caas_terraform/eks/modules/eks/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,15 @@ variable "cluster_admin_iam_roles" {
description = "IAM Roles to be granted cluster-admin access."
}

variable "instance_profile" {
type = string
default = "null"
}

variable "k8s_version" {
type = string
}

variable "s3_bucket" {
type = string
default = "null"
description = "The name of the AWS S3 bucket for storing backups"
}

variable "cluster_labels" {
type = map(string)
description = "Map of cluster labels for cluster"
}

variable "create_vpc" {
type = bool
default = true
description = "Create VPC & Subnets"
}

variable "private_subnet_ids" {
type = map(string)
default = {}
Expand Down
4 changes: 2 additions & 2 deletions terraform/pas_terraform/eks/modules/eks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ resource "rafay_eks_cluster" "cluster" {
for_each = var.managed_nodegroups
content {
name = managed_nodegroups.value.ng_name
ami_family = "AmazonLinux2"
ami_family = "AmazonLinux2023"
iam {
iam_node_group_with_addon_policies {
image_builder = true
Expand Down Expand Up @@ -113,4 +113,4 @@ resource "rafay_eks_cluster" "cluster" {
configuration_values = "{\"controller\":{\"tolerations\":[{\"key\":\"CriticalAddonsOnly\",\"operator\":\"Exists\"},{\"operator\":\"Exists\"}]}}"
}
}
}
}