Skip to content

Commit 5a92314

Browse files
mjnagelUnicornChance
authored andcommitted
fix: eks iac issues, document storage class pre-reqs (#812)
## Description EBS impose a 1Gi size limitation on restored PVCs. This adds a short note to pre-reqs about checking CSI limitations. While testing with our EKS IAC I also discovered a few other issues: - IRSA annotations were not correct - Config did not properly variablize region - Config had an unmatched `"` around one of the values - Gitignore did not exclude terraform/tfstate files that shouldn't be committed ## Related Issue Fixes #718 ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Other (security config, docs update, etc) ## Checklist before merging - [x] Test, docs, adr added or updated as needed - [x] [Contributor Guide](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md) followed
1 parent eaa629c commit 5a92314

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

.github/bundles/uds-bundle.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ packages:
2727
path: credentials.useSecret
2828
- name: VELERO_IRSA_ANNOTATION
2929
description: "IRSA ARN annotation to use for Velero"
30-
path: serviceAccount.server.annotations.irsa/role-arn
30+
path: serviceAccount.server.annotations.eks\.amazonaws\.com/role-arn
3131
loki:
3232
loki:
3333
values:
@@ -52,4 +52,4 @@ packages:
5252
path: loki.storage.s3.region
5353
- name: LOKI_IRSA_ANNOTATION
5454
description: "The irsa role annotation"
55-
path: serviceAccount.annotations.irsa/role-arn
55+
path: serviceAccount.annotations.eks\.amazonaws\.com/role-arn

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ tmp-tasks.yaml
1515
cacert.b64
1616
run/
1717
extract-terraform.sh
18+
**/.terraform*
19+
cluster-config.yaml
20+
**.tfstate

docs/deployment/prerequisites.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,11 @@ Several UDS Core components require persistent volumes that will be provisioned
4545
```console
4646
kubectl get storageclass
4747
NAME PROVISIONER RECLAIMPOLICY VOLUMEBINDINGMODE ALLOWVOLUMEEXPANSION AGE
48-
local-path (default) rancher.io/local-path Delete WaitForFirstConsumer false 55s
48+
local-path (default) rancher.io/local-path Delete WaitForFirstConsumer true 55s
4949
```
5050

51+
It’s generally beneficial if your storage class supports volume expansion (set `allowVolumeExpansion: true`, provided your provisioner allows it). This enables you to resize volumes when needed. Additionally, be mindful of any size restrictions imposed by your provisioner. For instance, EBS volumes have a minimum size of 1Gi, which could lead to unexpected behavior, especially during Velero’s CSI backup and restore process. These constraints may also necessitate adjustments to default PVC sizes, such as Keycloak’s PVCs, which default to 512Mi in `devMode`.
52+
5153
#### Network Policy Support
5254

5355
The UDS Operator will dynamically provision network policies to secure traffic between components in UDS Core. To ensure these are effective, validate that your CNI supports enforcing network policies. In addition, UDS Core makes use of some CIDR based policies for communication with the KubeAPI server. If you are using Cilium, support for node addressability with CIDR based policies must be enabled with a [feature flag](https://docs.cilium.io/en/stable/security/policy/language/#selecting-nodes-with-cidr-ipblock).

tasks/iac.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ tasks:
2525
2626
metadata:
2727
name: ${CLUSTER_NAME}
28-
region: us-west-2
28+
region: ${REGION}
2929
version: "1.30"
3030
tags:
3131
PermissionsBoundary: ${PERMISSIONS_BOUNDARY_NAME}
@@ -148,7 +148,7 @@ tasks:
148148
loki_s3_region: ${LOKI_S3_AWS_REGION}
149149
loki_irsa_annotation: "${LOKI_S3_ROLE_ARN}"
150150
velero_use_secret: false
151-
velero_irsa_annotation: ${VELERO_S3_ROLE_ARN}"
151+
velero_irsa_annotation: "${VELERO_S3_ROLE_ARN}"
152152
velero_bucket: ${VELERO_S3_BUCKET}
153153
velero_bucket_region: ${VELERO_S3_AWS_REGION}
154154
velero_bucket_provider_url: ""

0 commit comments

Comments
 (0)