Always add parseTime=true for mysql query string (#352)

spiffe · Jun 20, 2023 · 1333b6a · 1333b6a
1 parent ac3be71
commit 1333b6a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/.github/tests/production-external-mysql/install.sh b/.github/tests/production-external-mysql/install.sh
@@ -29,8 +29,6 @@ spire-server:
       password: ${DBPW}
       host: mysql
       port: 3306
-      options:
-      - parseTime: true
 EOF
 
 helm install mysql mysql --namespace "spire-server" --version "$VERSION_MYSQL" --repo "$HELM_REPO_MYSQL" \

diff --git a/charts/spire/charts/spire-server/templates/_helpers.tpl b/charts/spire/charts/spire-server/templates/_helpers.tpl
@@ -114,9 +114,8 @@ Create the name of the service account to use
 {{- $lst = append $lst $entry }}
 {{- end }}
 {{- end }}
-{{- if gt (len $lst) 0 }}
-{{- printf "?%s" (join "&" $lst) }}
-{{- end }}
+{{- $lst = append $lst "parseTime=true" }}
+{{- printf "?%s" (join "&" (uniq $lst)) }}
 {{- end }}
 
 {{- define "spire-server.config-postgresql-options" }}

diff --git a/examples/external-mysql/values.yaml b/examples/external-mysql/values.yaml
@@ -6,5 +6,3 @@ spire-server:
       host: mysql
       port: 3306
       username: spire
-      options:
-        - parseTime: true