feat: add values to helm chart

snapp-incubator · Jan 15, 2023 · af4a36e · af4a36e
1 parent 09e1fca
commit af4a36e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 17 deletions.
diff --git a/.deploy/helm/templates/configmap.yaml b/.deploy/helm/templates/configmap.yaml
@@ -7,12 +7,19 @@ metadata:
 data:
   config.yaml: |-
     database:
-      conn-str: {{ .Values.database.connStr | quote }}
       driver: {{ .Values.database.driver | quote }}
-      options:
-        connection-lifetime: {{ .Values.database.options.connectionLifetime | quote }}
-        max-idle-connections: {{ .Values.database.options.maxIdleConnections }}
-        max-open-connections: {{ .Values.database.options.maxOpenConnections }}
+      host: {{ .Values.database.host | quote }}
+      port: {{ .Values.database.port }}
+      db_name: {{ .Values.database.dbName | quote }}
+      username: {{ .Values.database.username | quote }}
+      password: {{ .Values.database.password | quote }}
+      timeout: {{ .Values.database.timeout | quote }}
+      read_timeout: {{ .Values.database.readTimeout | quote }}
+      write_timeout: {{ .Values.database.writeTimeout | quote }}
+      connection_lifetime: {{ .Values.database.connectionLifetime | quote }}
+      max_open_connections: {{ .Values.database.maxIdleConnections }}
+      max_idle_connections: {{ .Values.database.maxOpenConnections }}
+
     matrix:
       display-name: {{ .Values.matrix.displayName | quote }}
       token: {{ .Values.matrix.token | quote }}

diff --git a/.deploy/helm/values.yaml b/.deploy/helm/values.yaml
@@ -56,14 +56,22 @@ tolerations: []
 affinity: {}
 
 database:
-  connStr: on-call:secret@tcp(localhost:3306)/on-call?readTimeout=3s&timeout=30s&parseTime=True
   driver: mysql
-  options:
-    connectionLifetime: 10m
-    maxIdleConnections: 5
-    maxOpenConnections: 10
+  host: "localhost"
+  port: 3306
+  dbName: "on-call"
+  username: "on-call"
+  password: "secret"
+  timeout: "30s"
+  readTimeout: "3s"
+  writeTimeout: "1s"
+  connectionLifetime: 10m
+  maxIdleConnections: 5
+  maxOpenConnections: 10
 matrix:
   displayName: user
   token: secret
   url: https://example.com
   userID: '@some_bot:example.com'
+
+envs: {}
diff --git a/internal/cmd/migrate/migrate.go b/internal/cmd/migrate/migrate.go
@@ -21,12 +21,7 @@ const (
 var ErrFlags = errors.New("error parsing flags")
 
 func main(path string, cfg config.Database) error {
-	oncallDB := database.WithRetry(
-		database.Create,
-		cfg.Driver,
-		cfg.ConnStr,
-		cfg.Options,
-	)
+	oncallDB := database.WithRetry(database.Create, cfg)
 
 	sqlDB, err := oncallDB.DB()
 	if err != nil {

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -55,7 +55,7 @@ func (c Config) Validate() error {
 	return errors.Wrap(validator.New().Struct(c), "config validation failed")
 }
 
-// MySQLConnectionURI returns URI for connecting to a MySQL liked database
+// MySQLConnectionURI returns URI for connecting to a MySQL liked database.
 func (d Database) MySQLConnectionURI() string {
 	return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?timeout=%s&readTimeout=%s&writeTimeout=%s&parseTime=True",
 		d.Username,