Skip to content

Commit 1bc86e1

Browse files
authored
chore: Update examples to better demonstrate questions raised through issues (#2294)
Resolves undefined
1 parent 417788c commit 1bc86e1

File tree

1 file changed

+45
-17
lines changed

1 file changed

+45
-17
lines changed

examples/complete/main.tf

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
provider "aws" {
22
region = local.region
3-
4-
default_tags {
5-
tags = {
6-
ExampleDefaultTag = "ExampleDefaultValue"
7-
}
8-
}
93
}
104

115
provider "kubernetes" {
@@ -196,12 +190,14 @@ module "eks" {
196190
}
197191
}
198192

199-
# OIDC Identity provider
200-
cluster_identity_providers = {
201-
sts = {
202-
client_id = "sts.amazonaws.com"
203-
}
204-
}
193+
# Create a new cluster where both an identity provider and Fargate profile is created
194+
# will result in conflicts since only one can take place at a time
195+
# # OIDC Identity provider
196+
# cluster_identity_providers = {
197+
# sts = {
198+
# client_id = "sts.amazonaws.com"
199+
# }
200+
# }
205201

206202
# aws-auth configmap
207203
manage_aws_auth_configmap = true
@@ -216,10 +212,30 @@ module "eks" {
216212

217213
aws_auth_roles = [
218214
{
219-
rolearn = "arn:aws:iam::66666666666:role/role1"
220-
username = "role1"
221-
groups = ["system:masters"]
215+
rolearn = module.eks_managed_node_group.iam_role_arn
216+
username = "system:node:{{EC2PrivateDNSName}}"
217+
groups = [
218+
"system:bootstrappers",
219+
"system:nodes",
220+
]
222221
},
222+
{
223+
rolearn = module.self_managed_node_group.iam_role_arn
224+
username = "system:node:{{EC2PrivateDNSName}}"
225+
groups = [
226+
"system:bootstrappers",
227+
"system:nodes",
228+
]
229+
},
230+
{
231+
rolearn = module.fargate_profile.fargate_profile_pod_execution_role_arn
232+
username = "system:node:{{SessionName}}"
233+
groups = [
234+
"system:bootstrappers",
235+
"system:nodes",
236+
"system:node-proxier",
237+
]
238+
}
223239
]
224240

225241
aws_auth_users = [
@@ -261,6 +277,20 @@ module "eks_managed_node_group" {
261277
module.eks.cluster_security_group_id,
262278
]
263279

280+
ami_type = "BOTTLEROCKET_x86_64"
281+
platform = "bottlerocket"
282+
283+
# this will get added to what AWS provides
284+
bootstrap_extra_args = <<-EOT
285+
# extra args added
286+
[settings.kernel]
287+
lockdown = "integrity"
288+
289+
[settings.kubernetes.node-labels]
290+
"label1" = "foo"
291+
"label2" = "bar"
292+
EOT
293+
264294
tags = merge(local.tags, { Separate = "eks-managed-node-group" })
265295
}
266296

@@ -282,8 +312,6 @@ module "self_managed_node_group" {
282312
module.eks.cluster_security_group_id,
283313
]
284314

285-
use_default_tags = true
286-
287315
tags = merge(local.tags, { Separate = "self-managed-node-group" })
288316
}
289317

0 commit comments

Comments
 (0)