Use real LIS CSI EKS addon for instance store metrics integration test#675
Use real LIS CSI EKS addon for instance store metrics integration test#675nathalapooja merged 4 commits intomainfrom
Conversation
| targets: map[string]map[string]struct{}{"arc": {"amd64": {}}}, | ||
| instanceType: "i7i.xlarge", | ||
| ami: "AL2023_x86_64_STANDARD", | ||
| k8sVersion: "1.33", |
There was a problem hiding this comment.
Do we need a override for the k8sVersion at this level? Given we already have to maintain the default in the variables.tf?
Also mind using 1.35 given thats the latest.
There was a problem hiding this comment.
Unfortunately, no — removing the k8sVersion from the test case generator would break CI. Here's why:
The CI workflow always passes the k8s version from the test matrix to Terraform explicitly:
terraform apply -var="k8s_version=${{ matrix.arrays.k8sVersion }}"
If k8sVersion is missing from the Go test config, the generated test matrix row will inherit the default "1.31" from eks_daemon_test_matrix.json (the shared matrix for all EKS daemon tests). That means liscsi would get k8s_version=1.31 passed to Terraform, overriding the 1.35 default in variables.tf.
There was a problem hiding this comment.
Thats fine right? We just update what is in the test matrix then to be 1.35 for all our tests.
Replace mock CSI driver with real aws-ec2-local-instance-store-csi-driver EKS addon for NVMe instance store metrics integration testing. Changes: - terraform: Install LIS CSI addon with metrics enabled, deploy IO workload with ephemeral volume on ec2-instance-store-sc StorageClass - terraform: Use i7i.xlarge (NVMe instance store), K8s 1.33, AL2023 AMI - terraform: Add rollout wait and debug output for CWAgent image patch - terraform: Align providers.tf and resource ordering with EBS CSI test - generator: Add k8sVersion override support to testConfig struct - generator: Set liscsi test overrides (k8sVersion=1.33, i7i.xlarge, AL2023) - test: Increase agent run duration to 5 minutes for metric propagation - test: Remove mock-lis-csi.yaml (no longer needed) Tested: All 9 metrics validated across 3 dimension sets (27 series) + EMF logs Run: https://github.com/aws/amazon-cloudwatch-agent/actions/runs/25131500439/job/73658793882
nathalapooja
force-pushed
the
liscsi-integ-test-real-addon
branch
from
e495a51 to
73318ec
Compare
2 participants
Summary
Replace mock CSI driver with real
aws-ec2-local-instance-store-csi-driverEKS addon for NVMe instance store metrics integration testing.Changes
ec2-instance-store-scStorageClassi7i.xlarge(NVMe instance store), K8s 1.33, AL2023 AMIproviders.tfand resource ordering with EBS CSI test patternk8sVersionoverride support totestConfigstructk8sVersion=1.33,i7i.xlarge,AL2023)mock-lis-csi.yaml(no longer needed)Testing
All 9 metrics validated across 3 dimension sets (27 metric series) + EMF logs ✅
Successful run: https://github.com/aws/amazon-cloudwatch-agent/actions/runs/25131500439/job/73658793882
Dependencies
aws-ec2-local-instance-store-csi-driveraddon allowlisted for the CI account