Merge pull request #17 from T-Systems-MMS/proxysql_defaults

mikaEz · web-flow · commit c732df7e9a1f · 2022-04-21T16:35:46.000+02:00
set default for hostname
diff --git a/proxysql/Chart.yaml b/proxysql/Chart.yaml
@@ -2,4 +2,4 @@
 apiVersion: v1
 name: proxysql
 description: ProxySQL Configuration
-version: 0.1.5
+version: 0.1.6
diff --git a/proxysql/config/proxysql.conf b/proxysql/config/proxysql.conf
@@ -18,10 +18,10 @@ mysql_variables =
 
 mysql_servers =
 (
-{{- range $mysql_server := $proxysql.mysql_servers }}
+{{- range $key, $mysql_server := $proxysql.mysql_servers }}
   {
     hostgroup_id = {{ default 0 $mysql_server.hostgroup_id }},
-    hostname = {{ $mysql_server.hostname }},
+    hostname = {{ default $key $mysql_server.hostname }},
     port = {{ default 3306 $mysql_server.port }},
     use_ssl = {{ default 1 $mysql_server.use_ssl }},
     weight = {{ default 1 $mysql_server.weight }},

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@ mysql_variables =`
`18`	`18`
`19`	`19`	`mysql_servers =`
`20`	`20`	`(`
`21`		`-{{- range $mysql_server := $proxysql.mysql_servers }}`
	`21`	`+{{- range $key, $mysql_server := $proxysql.mysql_servers }}`
`22`	`22`	`{`
`23`	`23`	`hostgroup_id = {{ default 0 $mysql_server.hostgroup_id }},`
`24`		`- hostname = {{ $mysql_server.hostname }},`
	`24`	`+ hostname = {{ default $key $mysql_server.hostname }},`
`25`	`25`	`port = {{ default 3306 $mysql_server.port }},`
`26`	`26`	`use_ssl = {{ default 1 $mysql_server.use_ssl }},`
`27`	`27`	`weight = {{ default 1 $mysql_server.weight }},`