Skip to content

Commit e229f12

Browse files
committed
added .node.addDependency(cluster.awsAuth) to 2 constructs to fix order of operations edge case
1 parent 129c25b commit e229f12

File tree

2 files changed

+25
-23
lines changed

2 files changed

+25
-23
lines changed

config/eks/dev_eks_config.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,14 @@ export function deploy_workload_dependencies(config: Easy_EKS_Config_Data, stack
8484
]
8585
}
8686
}
87-
new eks.KubernetesManifest(stack, "persistentVolumeClaimManifest",
87+
const pvc_demo_construct = new eks.KubernetesManifest(stack, "persistentVolumeClaimManifest",
8888
{
8989
cluster: cluster,
9090
manifest: [volume_claim_gp3, pod_using_volume_claim],
9191
overwrite: true,
9292
prune: true,
9393
});
94+
pvc_demo_construct.node.addDependency(cluster.awsAuth);
9495
}//end deploy_workload_dependencies()
9596

9697
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

config/eks/my_orgs_baseline_eks_config.ts

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -269,33 +269,34 @@ export function deploy_workload_dependencies(config: Easy_EKS_Config_Data, stack
269269
}`, //end aws-ebs-csi-driver configurationValues override
270270
});
271271
// adding gp3 storage class
272-
const storage_class_gp3 = {
273-
"apiVersion": "storage.k8s.io/v1",
274-
"kind": "StorageClass",
275-
"metadata": {
276-
"name": "kms-encrypted-gp3",
277-
"annotations": {
278-
"storageclass.kubernetes.io/is-default-class": "true"
279-
}
280-
},
281-
"provisioner": "ebs.csi.aws.com",
282-
"volumeBindingMode": "WaitForFirstConsumer",
283-
"allowVolumeExpansion": true,
284-
"reclaimPolicy": "Delete",
285-
"parameters": {
286-
"type": "gp3",
287-
"encrypted": "true",
288-
//"kmsKeyId": `${config.kmsKey.keyArn}` //commentig it out as while we test the logic to add permissions to customer's KMS key
289-
}
290-
}
291-
new eks.KubernetesManifest(stack, "StorageClassManifest",
272+
const storage_class_gp3_manifest = {
273+
"apiVersion": "storage.k8s.io/v1",
274+
"kind": "StorageClass",
275+
"metadata": {
276+
"name": "kms-encrypted-gp3",
277+
"annotations": {
278+
"storageclass.kubernetes.io/is-default-class": "true"
279+
}
280+
},
281+
"provisioner": "ebs.csi.aws.com",
282+
"volumeBindingMode": "WaitForFirstConsumer",
283+
"allowVolumeExpansion": true,
284+
"reclaimPolicy": "Delete",
285+
"parameters": {
286+
"type": "gp3",
287+
"encrypted": "true",
288+
//"kmsKeyId": `${config.kmsKey.keyArn}` //commentig it out as while we test the logic to add permissions to customer's KMS key
289+
}
290+
}
291+
const storage_class_gp3_construct = new eks.KubernetesManifest(stack, "StorageClassManifest",
292292
{
293293
cluster: cluster,
294-
manifest: [storage_class_gp3],
294+
manifest: [storage_class_gp3_manifest],
295295
overwrite: true,
296296
prune: true,
297297
}
298-
);
298+
);
299+
storage_class_gp3_construct.node.addDependency(cluster.awsAuth);
299300
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
300301

301302
// v-- most won't need this, disabling by default

0 commit comments

Comments
 (0)