Update snapshots

pennlabs · Oct 22, 2023 · ef2e1c4 · ef2e1c4
1 parent dc4f477
commit ef2e1c4
Show file tree

Hide file tree

Showing 13 changed files with 1,964 additions and 1,603 deletions.
diff --git a/cdk/kittyhawk/src/application/redis.ts b/cdk/kittyhawk/src/application/redis.ts
@@ -76,40 +76,46 @@ export class RedisApplication extends Application {
       deployment: {
         image: redisProps.deployment?.image ?? "redis",
         tag: redisProps.deployment?.tag ?? "6.0",
-
-        ...((redisProps.persistData && {
-          volumeMounts: [
-            {
-              name: "data",
-              mountPath: "/redis-master-data",
-            },
-            {
-              name: "config",
-              mountPath: "/redis-master",
-            },
-          ],
-          volumes: [
-            {
-              name: "data",
-              persistentVolumeClaim: {
-                claimName: `${appname}-pvc`,
-              },
-            },
-            {
-              name: "config",
-              configMap: {
-                name: CONFIG_MAP_NAME,
-                items: [
-                  {
-                    key: "redis-config",
-                    path: "redis.conf",
+        volumeMounts: [
+          ...(redisProps.persistData
+            ? [
+                {
+                  name: "data",
+                  mountPath: "/redis-master-data",
+                },
+                {
+                  name: "config",
+                  mountPath: "/redis-master",
+                },
+              ]
+            : []),
+          ...(redisProps.deployment?.volumeMounts ?? []),
+        ],
+        volumes: [
+          ...(redisProps.persistData
+            ? [
+                {
+                  name: "data",
+                  persistentVolumeClaim: {
+                    claimName: `${appname}-pvc`,
                   },
-                ],
-              },
-            },
-          ],
-        }) ??
-          {}),
+                },
+                {
+                  name: "config",
+                  configMap: {
+                    name: CONFIG_MAP_NAME,
+                    items: [
+                      {
+                        key: "redis-config",
+                        path: "redis.conf",
+                      },
+                    ],
+                  },
+                },
+              ]
+            : []),
+          ...(redisProps.deployment?.volumes ?? []),
+        ],
         ...redisProps.deployment,
       },
       port: redisProps.port ?? 6379,

diff --git a/cdk/kittyhawk/src/container.ts b/cdk/kittyhawk/src/container.ts
@@ -191,9 +191,9 @@ export class Container implements ContainerInterface {
 }
 
 const secretVolumeName = (vm: VolumeMount) => {
-  const mountString = (a: string) => a.toLowerCase().split("_").join("-");
+  const mountString = (a: string) => a.toLowerCase().split("_").join("-") ?? "";
   return `${mountString(vm.name)}${
-    vm.subPath && `-${mountString(vm.subPath)}`
+    vm.subPath ? `-${mountString(vm.subPath)}` : ""
   }`;
 };
 export class SecretVolume implements VolumeInterface {

diff --git a/cdk/kittyhawk/src/deployment.ts b/cdk/kittyhawk/src/deployment.ts
@@ -24,11 +24,6 @@ export interface DeploymentProps extends ContainerProps {
    */
   readonly secretMounts?: VolumeMount[];
 
-  /**
-   * Volume mounts for deployment container.
-   */
-  readonly volumes?: Volume[];
-
   /**
    * Volume mounts for deployment container.
    *
@@ -38,6 +33,11 @@ export interface DeploymentProps extends ContainerProps {
    */
   readonly volumeMounts?: VolumeMount[];
 
+  /**
+   * Volume mounts for deployment container.
+   */
+  readonly volumes?: Volume[];
+
   /**
    * The service account to be used to attach to any deployment pods.
    * Default serviceAccountName: release name