1
1
provider "aws" {
2
2
region = local. region
3
-
4
- default_tags {
5
- tags = {
6
- ExampleDefaultTag = " ExampleDefaultValue"
7
- }
8
- }
9
3
}
10
4
11
5
provider "kubernetes" {
@@ -196,12 +190,14 @@ module "eks" {
196
190
}
197
191
}
198
192
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
+ # }
205
201
206
202
# aws-auth configmap
207
203
manage_aws_auth_configmap = true
@@ -216,10 +212,30 @@ module "eks" {
216
212
217
213
aws_auth_roles = [
218
214
{
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
+ ]
222
221
},
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
+ }
223
239
]
224
240
225
241
aws_auth_users = [
@@ -261,6 +277,20 @@ module "eks_managed_node_group" {
261
277
module . eks . cluster_security_group_id ,
262
278
]
263
279
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
+
264
294
tags = merge (local. tags , { Separate = " eks-managed-node-group" })
265
295
}
266
296
@@ -282,8 +312,6 @@ module "self_managed_node_group" {
282
312
module . eks . cluster_security_group_id ,
283
313
]
284
314
285
- use_default_tags = true
286
-
287
315
tags = merge (local. tags , { Separate = " self-managed-node-group" })
288
316
}
289
317
0 commit comments