fix: mount the existing config map if provided (#79)

Signed-off-by: arkbriar <[email protected]>
risingwavelabs · May 6, 2024 · d02a214 · d02a214
1 parent c51f478
commit d02a214
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 0 deletions.
diff --git a/charts/risingwave/templates/_helpers.tpl b/charts/risingwave/templates/_helpers.tpl
@@ -333,7 +333,11 @@ Create the etcd endpoints
 Create the name of the AzureBlob credentials Secret to use
 */}}
 {{- define "risingwave.configurationConfigMapName" -}}
+{{- if not .Values.existingConfigMap }}
 {{- printf "%s-configuration" (include "risingwave.fullname" .) | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- .Values.existingConfigMap | quote }}
+{{- end }}
 {{- end }}
 
 {{/*

diff --git a/charts/risingwave/tests/configmap_workload_test.yaml b/charts/risingwave/tests/configmap_workload_test.yaml
@@ -0,0 +1,73 @@
+suite: Test config map
+templates:
+- meta-sts.yaml
+- compute-sts.yaml
+- frontend-deploy.yaml
+- compactor-deploy.yaml
+- standalone/standalone-sts.yaml
+chart:
+  appVersion: 1.0.0
+  version: 0.0.1
+tests:
+- it: cluster workloads mount the config map
+  templates:
+  - meta-sts.yaml
+  - compute-sts.yaml
+  - frontend-deploy.yaml
+  - compactor-deploy.yaml
+  set:
+    configuration: |
+      [example]
+      a = b
+  asserts:
+  - contains:
+      path: spec.template.spec.volumes
+      content:
+        name: config
+        configMap:
+          name: RELEASE-NAME-risingwave-configuration
+- it: cluster workloads mount the existing config map
+  templates:
+  - meta-sts.yaml
+  - compute-sts.yaml
+  - frontend-deploy.yaml
+  - compactor-deploy.yaml
+  set:
+    existingConfigMap: "a"
+  asserts:
+  - contains:
+      path: spec.template.spec.volumes
+      content:
+        name: config
+        configMap:
+          name: a
+- it: standalone sts mount the config map
+  templates:
+  - standalone/standalone-sts.yaml
+  set:
+    standalone:
+      enabled: true
+    configuration: |
+      [example]
+      a = b
+  asserts:
+  - contains:
+      path: spec.template.spec.volumes
+      content:
+        name: config
+        configMap:
+          name: RELEASE-NAME-risingwave-configuration
+- it: standalone workloads mount the existing config map
+  templates:
+  - standalone/standalone-sts.yaml
+  set:
+    standalone:
+      enabled: true
+    existingConfigMap: "a"
+  asserts:
+  - contains:
+      path: spec.template.spec.volumes
+      content:
+        name: config
+        configMap:
+          name: a