Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

feat(eks): add the EBS CSI driver to the addon version catalog (#4371)

Simone Primarosa52b34d012624
diff --git a/docs/services/eks.md b/docs/services/eks.md
index 38d9cd3918..96ab58c3cc 100644
--- a/docs/services/eks.md
+++ b/docs/services/eks.md
@@ -134,7 +134,7 @@ Floci supports the EKS cluster addon management plane for AWS SDKs and Terraform
### Supported operations
-- **Creation**: `CreateAddon` creates an addon on an ACTIVE cluster. Supported addons include `vpc-cni`, `coredns`, `kube-proxy`, and `eks-pod-identity-agent`. If `addonVersion` is omitted, the default version compatible with the cluster Kubernetes version is resolved automatically. Referenced `serviceAccountRoleArn` must exist in IAM. Idempotency is supported via `clientRequestToken`.
+- **Creation**: `CreateAddon` creates an addon on an ACTIVE cluster. Supported addons include `vpc-cni`, `coredns`, `kube-proxy`, `eks-pod-identity-agent`, and `aws-ebs-csi-driver`. If `addonVersion` is omitted, the default version compatible with the cluster Kubernetes version is resolved automatically. Referenced `serviceAccountRoleArn` must exist in IAM. Idempotency is supported via `clientRequestToken`.
- **Retrieval**: `DescribeAddon` returns the complete addon resource shape, including ARN, cluster name, version, status (`ACTIVE`), health issues, tags, service account role ARN, configuration values, pod identity associations, owner, and publisher.
- **Listing**: `ListAddons` lists installed addon names with pagination (`maxResults` and `nextToken`).
- **Updating**: `UpdateAddon` updates the addon version, configuration values, service account role ARN, or resolve-conflicts strategy. It returns an `Update` tracking object and updates the addon metadata.
@@ -144,7 +144,7 @@ Floci supports the EKS cluster addon management plane for AWS SDKs and Terraform
### Metadata recording only
-Addons in Floci are recorded metadata only. Creating or updating an addon does not install or reconcile Kubernetes DaemonSets, Deployments, or custom resources inside the cluster container.
+Addons in Floci are recorded metadata only. Creating or updating an addon does not install or reconcile Kubernetes DaemonSets, Deployments, or custom resources inside the cluster container. In particular, creating the EBS CSI addon records metadata and installs no driver, so a cluster needs the driver installed separately for storage to work.
## Cluster security group
diff --git a/src/main/resources/eks/addon-versions.json b/src/main/resources/eks/addon-versions.json
index a22b850301..10df67bf4e 100644
--- a/src/main/resources/eks/addon-versions.json
+++ b/src/main/resources/eks/addon-versions.json
@@ -255,6 +255,99 @@
"requiresIamPermissions": false
}
]
+ },
+ {
+ "addonName": "aws-ebs-csi-driver",
+ "type": "storage",
+ "owner": "aws",
+ "publisher": "eks",
+ "addonVersions": [
+ {
+ "addonVersion": "v1.38.1-eksbuild.1",
+ "architecture": ["amd64", "arm64"],
+ "compatibilities": [
+ {
+ "clusterVersion": "1.32",
+ "platformVersions": ["*"],
+ "defaultVersion": true
+ },
+ {
+ "clusterVersion": "1.31",
+ "platformVersions": ["*"],
+ "defaultVersion": false
+ }
+ ],
+ "requiresConfiguration": false,
+ "requiresIamPermissions": true
+ },
+ {
+ "addonVersion": "v1.35.0-eksbuild.1",
+ "architecture": ["amd64", "arm64"],
+ "compatibilities": [
+ {
+ "clusterVersion": "1.31",
+ "platformVersions": ["*"],
+ "defaultVersion": true
+ },
+ {
+ "clusterVersion": "1.30",
+ "platformVersions": ["*"],
+ "defaultVersion": false
+ }
+ ],
+ "requiresConfiguration": false,
+ "requiresIamPermissions": true
+ },
+ {
+ "addonVersion": "v1.31.0-eksbuild.1",
+ "architecture": ["amd64", "arm64"],
+ "compatibilities": [
+ {
+ "clusterVersion": "1.30",
+ "platformVersions": ["*"],
+ "defaultVersion": true
+ },
+ {
+ "clusterVersion": "1.29",
+ "platformVersions": ["*"],
+ "defaultVersion": false
+ }
+ ],
+ "requiresConfiguration": false,
+ "requiresIamPermissions": true
+ },
+ {
+ "addonVersion": "v1.28.0-eksbuild.1",
+ "architecture": ["amd64", "arm64"],
+ "compatibilities": [
+ {
+ "clusterVersion": "1.29",
+ "platformVersions": ["*"],
+ "defaultVersion": true
+ },
+ {
+ "clusterVersion": "1.28",
+ "platformVersions": ["*"],
+ "defaultVersion": false
+ }
+ ],
+ "requiresConfiguration": false,
+ "requiresIamPermissions": true
+ },
+ {
+ "addonVersion": "v1.26.1-eksbuild.1",
+ "architecture": ["amd64", "arm64"],
+ "compatibilities": [
+ {
+ "clusterVersion": "1.28",
+ "platformVersions": ["*"],
+ "defaultVersion": true
+ }
+ ],
+ "requiresConfiguration": false,
+ "requiresIamPermissions": true
+ }
+ ]
}
]
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/eks/EksAddonIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/eks/EksAddonIntegrationTest.java
index bb96e22aee..8c3823fd40 100644
--- a/src/test/java/io/github/hectorvent/floci/services/eks/EksAddonIntegrationTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/eks/EksAddonIntegrationTest.java
@@ -187,8 +187,8 @@ class EksAddonIntegrationTest {
.then()
.statusCode(200)
.contentType(containsString("application/json"))
- .body("addons", hasSize(greaterThanOrEqualTo(4)))
- .body("addons.addonName", hasItems("vpc-cni", "coredns", "kube-proxy", "eks-pod-identity-agent"));
+ .body("addons", hasSize(greaterThanOrEqualTo(5)))
+ .body("addons.addonName", hasItems("vpc-cni", "coredns", "kube-proxy", "eks-pod-identity-agent", "aws-ebs-csi-driver"));
// Query with addonName filter
given().header("Authorization", auth(account, "eks"))
@@ -384,6 +384,77 @@ class EksAddonIntegrationTest {
}
}
+ @Test
+ void ebsCsiDriverLifecycleIntegration() {
+ String account = "123456789012";
+ String name = "addon-ebs-" + UUID.randomUUID().toString().substring(0, 8);
+ String roleName = "role-" + name;
+ String roleArn = "arn:aws:iam::" + account + ":role/" + roleName;
+ String basePath = "/clusters/" + name + "/addons";
+
+ createRole(account, roleName);
+ createCluster(account, name, "1.30");
+
+ try {
+ // 1. Create aws-ebs-csi-driver addon without specifying version (resolves default v1.31.0-eksbuild.1)
+ Map<String, Object> createReq = Map.of(
+ "addonName", "aws-ebs-csi-driver",
+ "serviceAccountRoleArn", roleArn
+ );
+
+ given().header("Authorization", auth(account, "eks"))
+ .contentType("application/json")
+ .body(createReq)
+ .post(basePath)
+ .then()
+ .statusCode(200)
+ .contentType(containsString("application/json"))
+ .body("addon.clusterName", equalTo(name))
+ .body("addon.addonName", equalTo("aws-ebs-csi-driver"))
+ .body("addon.addonVersion", equalTo("v1.31.0-eksbuild.1"))
+ .body("addon.status", equalTo("ACTIVE"))
+ .body("addon.owner", equalTo("aws"))
+ .body("addon.publisher", equalTo("eks"))
+ .body("addon.serviceAccountRoleArn", equalTo(roleArn));
+
+ // 2. Describe addon returns it
+ given().header("Authorization", auth(account, "eks"))
+ .get(basePath + "/aws-ebs-csi-driver")
+ .then()
+ .statusCode(200)
+ .contentType(containsString("application/json"))
+ .body("addon.addonName", equalTo("aws-ebs-csi-driver"))
+ .body("addon.addonVersion", equalTo("v1.31.0-eksbuild.1"))
+ .body("addon.status", equalTo("ACTIVE"));
+
+ // 3. Filter describe-addon-versions by addonName
+ given().header("Authorization", auth(account, "eks"))
+ .queryParam("addonName", "aws-ebs-csi-driver")
+ .get("/addons/supported-versions")
+ .then()
+ .statusCode(200)
+ .body("addons", hasSize(1))
+ .body("addons[0].addonName", equalTo("aws-ebs-csi-driver"))
+ .body("addons[0].type", equalTo("storage"))
+ .body("addons[0].owner", equalTo("aws"))
+ .body("addons[0].publisher", equalTo("eks"));
+
+ // 4. Filter describe-addon-versions by addonName and kubernetesVersion
+ given().header("Authorization", auth(account, "eks"))
+ .queryParam("addonName", "aws-ebs-csi-driver")
+ .queryParam("kubernetesVersion", "1.32")
+ .get("/addons/supported-versions")
+ .then()
+ .statusCode(200)
+ .body("addons", hasSize(1))
+ .body("addons[0].addonName", equalTo("aws-ebs-csi-driver"))
+ .body("addons[0].addonVersions.addonVersion", hasItem("v1.38.1-eksbuild.1"));
+ } finally {
+ deleteCluster(account, name);
+ deleteRole(account, roleName);
+ }
+ }
+
private static String auth(String account, String service) {
return "AWS4-HMAC-SHA256 Credential=" + account
+ "/20260920/us-east-1/" + service + "/aws4_request, SignedHeaders=host, Signature=fake";
@@ -401,6 +472,16 @@ class EksAddonIntegrationTest {
.statusCode(200);
}
+ private static void deleteRole(String account, String roleName) {
+ given().header("Authorization", auth(account, "iam"))
+ .contentType("application/x-www-form-urlencoded")
+ .formParam("Action", "DeleteRole")
+ .formParam("RoleName", roleName)
+ .post("/")
+ .then()
+ .statusCode(200);
+ }
+
private static void createCluster(String account, String name, String version) {
Map<String, Object> req = Map.of(
"name", name,
diff --git a/src/test/java/io/github/hectorvent/floci/services/eks/EksAddonServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/eks/EksAddonServiceTest.java
index c466ef4c2f..67c9271103 100644
--- a/src/test/java/io/github/hectorvent/floci/services/eks/EksAddonServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/eks/EksAddonServiceTest.java
@@ -566,6 +566,73 @@ class EksAddonServiceTest {
assertTrue(exTags.getMessage().contains("Too many tags"));
}
+ @Test
+ void ebsCsiDriverAddonSupportedAcrossClusterVersions() {
+ Fixture fixture = fixture();
+
+ // The default version resolves for each cluster version the catalog covers
+ Map<String, String> expectedDefaults = Map.of(
+ "1.28", "v1.26.1-eksbuild.1",
+ "1.29", "v1.28.0-eksbuild.1",
+ "1.30", "v1.31.0-eksbuild.1",
+ "1.31", "v1.35.0-eksbuild.1",
+ "1.32", "v1.38.1-eksbuild.1"
+ );
+ for (Map.Entry<String, String> entry : expectedDefaults.entrySet()) {
+ fixture.cluster.setVersion(entry.getKey());
+ assertEquals(Optional.of(entry.getValue()),
+ fixture.catalog.resolveDefaultVersion("aws-ebs-csi-driver", entry.getKey()));
+ }
+
+ // CreateAddon for aws-ebs-csi-driver succeeds and DescribeAddon returns it
+ fixture.cluster.setVersion("1.30");
+ CreateAddonRequest req = new CreateAddonRequest(
+ "aws-ebs-csi-driver", null, ROLE, null, null, null, null, null);
+ Addon created = fixture.service.create(fixture.cluster, req);
+ assertEquals("aws-ebs-csi-driver", created.addonName());
+ assertEquals("v1.31.0-eksbuild.1", created.addonVersion());
+ assertEquals("ACTIVE", created.status());
+ assertEquals("aws", created.owner());
+ assertEquals("eks", created.publisher());
+
+ Addon described = fixture.service.describe(fixture.cluster, "aws-ebs-csi-driver");
+ assertEquals(created, described);
+
+ // DescribeAddonVersions returns the new addon with its versions and compatibilities
+ EksAddonService.AddonVersionsPage byName = fixture.service.describeAddonVersions(
+ "aws-ebs-csi-driver", null, null, null, null, null, null);
+ assertEquals(1, byName.addons().size());
+ AddonInfo addonInfo = byName.addons().getFirst();
+ assertEquals("aws-ebs-csi-driver", addonInfo.addonName());
+ assertEquals("storage", addonInfo.type());
+ assertEquals("aws", addonInfo.owner());
+ assertEquals("eks", addonInfo.publisher());
+ assertEquals(5, addonInfo.addonVersions().size());
+
+ // Filtering by addon name and cluster version works
+ EksAddonService.AddonVersionsPage byCluster = fixture.service.describeAddonVersions(
+ "aws-ebs-csi-driver", "1.32", null, null, null, null, null);
+ assertEquals(1, byCluster.addons().size());
+ assertEquals(1, byCluster.addons().getFirst().addonVersions().size());
+ assertEquals("v1.38.1-eksbuild.1", byCluster.addons().getFirst().addonVersions().getFirst().addonVersion());
+
+ // The four existing addons are unchanged
+ for (String existing : List.of("vpc-cni", "coredns", "kube-proxy", "eks-pod-identity-agent")) {
+ assertTrue(fixture.catalog.isKnownAddon(existing));
+ assertNotNull(fixture.catalog.findAddon(existing).orElse(null));
+ }
+
+ // An addon name that is still not in the catalog is rejected exactly as before
+ assertFalse(fixture.catalog.isKnownAddon("unsupported-addon"));
+ CreateAddonRequest unsupportedReq = new CreateAddonRequest(
+ "unsupported-addon", null, null, null, null, null, null, null);
+ AwsException ex = assertThrows(AwsException.class, () ->
+ fixture.service.create(fixture.cluster, unsupportedReq));
+ assertEquals("InvalidParameterException", ex.getErrorCode());
+ assertEquals(400, ex.getHttpStatus());
+ assertTrue(ex.getMessage().contains("unsupported-addon"));
+ }
+
private static Fixture fixture() {
Cluster cluster = new Cluster();
cluster.setName("test-cluster");