Merge branch 'main' into cancel-none-fix

Author: sitaowang1998

tools/deployment/package-helm/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: "v2"
 name: "clp"
-version: "0.1.2-dev.7"
+version: "0.1.2-dev.8"
 description: "A Helm chart for CLP's (Compressed Log Processor) package deployment"
 type: "application"
 appVersion: "0.7.1-dev"

tools/deployment/package-helm/templates/configmap.yaml

@@ -30,7 +30,8 @@ data:
       auto_commit: false
       compress: true
       host: {{ include "clp.fullname" . }}-database
-      name: {{ .Values.clpConfig.database.name | quote }}
+      names:
+        clp: {{ .Values.clpConfig.database.names.clp | quote }}
       port: 3306
       ssl_cert: null
       type: {{ .Values.clpConfig.database.type | quote }}
@@ -128,7 +129,7 @@ data:
     {
       "SqlDbHost": "{{ include "clp.fullname" . }}-database",
       "SqlDbPort": 3306,
-      "SqlDbName": {{ .Values.clpConfig.database.name | quote }},
+      "SqlDbName": {{ .Values.clpConfig.database.names.clp | quote }},
       "SqlDbQueryJobsTableName": "query_jobs",
       "SqlDbCompressionJobsTableName": "compression_jobs",
       "MongoDbHost": "{{ include "clp.fullname" . }}-results-cache",

tools/deployment/package-helm/templates/database-statefulset.yaml

@@ -33,7 +33,7 @@ spec:
           imagePullPolicy: "Always"
           env:
             - name: "MYSQL_DATABASE"
-              value: {{ .Values.clpConfig.database.name | quote }}
+              value: {{ .Values.clpConfig.database.names.clp | quote }}
             - name: "MYSQL_USER"
               valueFrom:
                 secretKeyRef:

tools/deployment/package-helm/values.yaml

@@ -37,7 +37,8 @@ clpConfig:
   database:
     type: "mariadb"  # "mariadb" or "mysql"
     port: 30306
-    name: "clp-db"
+    names:
+      clp: "clp-db"
 
   compression_scheduler:
     jobs_poll_delay: 0.1  # seconds