From 00ddfd20dc1291774a92543d638eb79d7596df4a Mon Sep 17 00:00:00 2001
From: Rainer 'rei' Schuth <rainer.schuth@digital-results-international.com>
Date: Fri, 23 Feb 2024 10:35:25 +0100
Subject: [PATCH] [ProxySQL] update commands

---
 dysnix/proxysql/templates/daemonset.yaml    | 6 +++---
 dysnix/proxysql/templates/deployment.yaml   | 6 +++---
 dysnix/proxysql/templates/statefullset.yaml | 6 +++---
 dysnix/proxysql/values.yaml                 | 9 +--------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/dysnix/proxysql/templates/daemonset.yaml b/dysnix/proxysql/templates/daemonset.yaml
index 07bf3e97..520a13bb 100644
--- a/dysnix/proxysql/templates/daemonset.yaml
+++ b/dysnix/proxysql/templates/daemonset.yaml
@@ -69,7 +69,7 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: ["/bin/sh", "-c", "/usr/local/bin/wait_queries_to_finish.sh > /proc/1/fd/1"]
+                command: ["/bin/sh", "-c", "/usr/local/bin/wait_queries_to_finish.sh"]
           ports:
             - name: proxy
               containerPort: {{ .Values.service.proxyPort }}
@@ -93,7 +93,7 @@ spec:
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             exec:
-              command: {{ .Values.proxysql_cluster.healthcheck.command }}
+              command: {{ .Values.proxysql_cluster.healthcheck.command | toYaml | nindent 16 }}
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
@@ -103,7 +103,7 @@ spec:
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             exec:
-              command: {{ .Values.proxysql_cluster.healthcheck.command }}
+              command: {{ .Values.proxysql_cluster.healthcheck.command | toYaml | nindent 16 }}
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
diff --git a/dysnix/proxysql/templates/deployment.yaml b/dysnix/proxysql/templates/deployment.yaml
index c709994a..2110c95a 100644
--- a/dysnix/proxysql/templates/deployment.yaml
+++ b/dysnix/proxysql/templates/deployment.yaml
@@ -70,7 +70,7 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: ["/bin/sh", "-c", "/usr/local/bin/wait_queries_to_finish.sh > /proc/1/fd/1"]
+                command: ["/bin/sh", "-c", "/usr/local/bin/wait_queries_to_finish.sh"]
           ports:
             - name: proxy
               containerPort: {{ .Values.service.proxyPort }}
@@ -94,7 +94,7 @@ spec:
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             exec:
-              command: {{ .Values.proxysql_cluster.healthcheck.command }}
+              command: {{ .Values.proxysql_cluster.healthcheck.command | toYaml | nindent 16 }}
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
@@ -104,7 +104,7 @@ spec:
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             exec:
-              command: {{ .Values.proxysql_cluster.healthcheck.command }}
+              command: {{ .Values.proxysql_cluster.healthcheck.command | toYaml | nindent 16 }}
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
diff --git a/dysnix/proxysql/templates/statefullset.yaml b/dysnix/proxysql/templates/statefullset.yaml
index 6fe20fc2..fcc515d9 100644
--- a/dysnix/proxysql/templates/statefullset.yaml
+++ b/dysnix/proxysql/templates/statefullset.yaml
@@ -74,7 +74,7 @@ spec:
           lifecycle:
             preStop:
               exec:
-                command: ["/bin/sh", "-c", "/usr/local/bin/wait_queries_to_finish.sh > /proc/1/fd/1"]
+                command: ["/bin/sh", "-c", "/usr/local/bin/wait_queries_to_finish.sh"]
           ports:
             - name: proxy
               containerPort: {{ .Values.service.proxyPort }}
@@ -98,7 +98,7 @@ spec:
           {{- if .Values.readinessProbe.enabled }}
           readinessProbe:
             exec:
-              command: {{ .Values.proxysql_cluster.healthcheck.command }}
+              command: {{ .Values.proxysql_cluster.healthcheck.command | toYaml | nindent 16 }}
             initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
@@ -108,7 +108,7 @@ spec:
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             exec:
-              command: {{ .Values.proxysql_cluster.healthcheck.command }}
+              command: {{ .Values.proxysql_cluster.healthcheck.command | toYaml | nindent 16 }}
             initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
diff --git a/dysnix/proxysql/values.yaml b/dysnix/proxysql/values.yaml
index 8b995bfb..c35f2e5b 100644
--- a/dysnix/proxysql/values.yaml
+++ b/dysnix/proxysql/values.yaml
@@ -345,12 +345,6 @@ proxysql_cluster:
   #   until the version/checksum is not 0.
   job:
 
-    image:
-      registry: docker.io
-      repository: mysql
-      tag: "8"
-      pullPolicy: IfNotPresent
-
     enabled: true
 
     # Retry 3 times until failed
@@ -383,8 +377,7 @@ proxysql_cluster:
     kill_if_healthcheck_failed: true  # Kill proxysql daemon if the healthcheck fails the test
     verbose: false
 
-    command:
-      - /usr/local/bin/proxysql_cluster_healthcheck.sh
+    command: ["/bin/sh", "-c", "/usr/local/bin/proxysql_cluster_healthcheck.sh"]
 
 # Enable debugging container along the proxysql instance
 #   It may be usefull to access the proxysql admin interface locally to debug issues