Fix Redis Persistence (for real) (#189)

pennlabs · Feb 5, 2024 · bd91989 · bd91989
1 parent 281d2f6
commit bd91989
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 47 deletions.
diff --git a/cdk/kittyhawk/LICENSE b/cdk/kittyhawk/LICENSE
diff --git a/cdk/kittyhawk/src/application/redis.ts b/cdk/kittyhawk/src/application/redis.ts
@@ -2,8 +2,8 @@ import { Construct } from "constructs";
 import { DeploymentProps } from "../deployment";
 import {
   KubeConfigMap,
-  KubePersistentVolume,
   KubePersistentVolumeClaim,
+  KubeStorageClass,
   Quantity,
 } from "../imports/k8s";
 import { Application } from "./base";
@@ -52,7 +52,6 @@ export class RedisApplication extends Application {
 
     // Persistence constants
     const storageClassName = `${releaseName}-${appname}-storage`;
-    const pvName = `${releaseName}-${appname}-pv`;
     const pvcName = `${releaseName}-${appname}-pvc`;
 
     if (redisProps.redisConfigMap) {
@@ -65,30 +64,27 @@ export class RedisApplication extends Application {
         },
       });
     }
-
     if (redisProps.persistData) {
-      new KubePersistentVolume(scope, pvName, {
+      new KubeStorageClass(scope, storageClassName, {
         metadata: {
-          name: pvName,
-        },
-        spec: {
-          storageClassName,
-          accessModes: ["ReadWriteMany"], // TODO: ask Redis folks
-          capacity: {
-            storage: Quantity.fromString("1Gi"),
-          },
-          hostPath: {
-            path: `/${releaseName}/redis`,
+          name: storageClassName,
+          annotations: {
+            "storageclass.kubernetes.io/is-default-class": "true",
           },
         },
+        provisioner: "ebs.csi.aws.com",
+        volumeBindingMode: "WaitForFirstConsumer",
+        parameters: {
+          type: "gp3",
+        },
       });
       new KubePersistentVolumeClaim(scope, pvcName, {
         metadata: {
           name: pvcName,
         },
         spec: {
           storageClassName,
-          accessModes: ["ReadWriteMany"], // TODO: ask Redis folks
+          accessModes: ["ReadWriteOnce"], // AWS EBS only supports RWO
           resources: {
             requests: {
               storage: Quantity.fromString("1Gi"),

diff --git a/cdk/kittyhawk/test/application/__snapshots__/redis.test.ts.snap b/cdk/kittyhawk/test/application/__snapshots__/redis.test.ts.snap
diff --git a/cdk/kittyhawk/test/deployment.test.ts b/cdk/kittyhawk/test/deployment.test.ts
@@ -1,7 +1,7 @@
 import { Construct } from "constructs";
 import { Container, Deployment } from "../src";
-import { chartTest, failingTestNoGitSha } from "./utils";
 import { KubeServiceAccount } from "../src/imports/k8s";
+import { chartTest, failingTestNoGitSha } from "./utils";
 
 export function buildDeploymentDefault(scope: Construct) {
   new Deployment(scope, "container", {