Fix extraFlags implementation

Author: liyaka

README.md.gotmpl

@@ -171,24 +171,50 @@ initJob:
 
 ### MySQL Command-Line Arguments
 
-You can pass additional command-line arguments directly to the `mysqld` process:
+You can pass additional command-line arguments to MySQL in two ways:
+
+#### Method 1: Using `primary.extraFlags` (Appends to Configuration)
+
+The `extraFlags` property automatically converts command-line flags to MySQL configuration format and **appends** them to the existing configuration (default or custom):
+
+```yaml
+primary:
+  extraFlags: "--max-connections=500 --max-allowed-packet=64M --log-bin-trust-function-creators=1 --thread-stack=256K"
+```
+
+**Benefits:**
+- Flags are automatically converted to `my.cnf` format
+- **Appends** to the default configuration (or your custom `primary.configuration`)
+
+#### Method 2: Direct Configuration (Complete Override)
+
+You can provide a complete MySQL configuration that **replaces** the default:
 
 ```yaml
 primary:
-  extraFlags:
-    - "--max-connections=500"
-    - "--max-allowed-packet=64M"
-    - "--log-bin-trust-function-creators=1"
-    - "--thread-stack=256K"
+  configuration: |-
+    [mysqld]
+    authentication_policy='* ,,'
+    skip-name-resolve
+    port=3306
+    datadir=/var/lib/mysql
+    max-connections=500
+    max-allowed-packet=64M
+    log-bin-trust-function-creators=1
+    thread-stack=256K
 ```
 
 **Use cases:**
-- Override configuration values at runtime
-- Set values that can't be configured in `my.cnf`
-- Apply temporary settings without changing the config file
-- Test different MySQL settings
+- Complete control over the MySQL configuration
+- When you need to override the entire default configuration
+- Custom configurations that differ significantly from defaults
+
+**Note:** 
+- `primary.extraFlags` **appends** flags to the existing configuration (default or custom)
+- `primary.configuration` **completely replaces** the default configuration
+- You can use both together: `primary.configuration` provides the base config, and `primary.extraFlags` adds additional flags on top
 
-**Note:** Command-line arguments take precedence over `my.cnf` configuration. See `examples/extra-args-values.yaml` for a complete example.
+See `examples/extra-args-values.yaml` for a complete example.
 
 ### Automated Backups
 

examples/extra-args-values.yaml

@@ -1,19 +1,16 @@
-# Example: MySQL with additional command-line arguments
+# Example: MySQL with extra flags, custom configuration, and environment variables
 # Usage: helm install mysql ./ -f examples/extra-args-values.yaml
 
 auth:
   rootPassword: "changeme"
 
 primary:
   # Additional command-line arguments passed to mysqld
-  # These override or supplement settings in my.cnf
-  extraFlags:
-    - "--max-connections=500"
-    - "--max-allowed-packet=64M"
-    - "--log-bin-trust-function-creators=1"
-    - "--thread-stack=256K"
-    - "--group-concat-max-len=1000000"
+  # These are automatically converted to my.cnf format and appended to the configuration
+  extraFlags: "--max-connections=500 --max-allowed-packet=64M --log-bin-trust-function-creators=1 --thread-stack=256K --group-concat-max-len=1000000"
 
+  # Custom MySQL configuration (completely replaces default configuration)
+  # extraFlags will be appended to this configuration
   configuration: |-
     [mysqld]
     authentication_policy='* ,,'
@@ -24,7 +21,39 @@ primary:
     character-set-server=utf8mb4
     collation-server=utf8mb4_unicode_ci
 
+  # Extra environment variables to add to the MySQL container
+  # Supports both simple values and valueFrom (for secrets/configmaps)
+  extraEnvVars:
+    # Simple value example
+    - name: MY_CUSTOM_VAR
+      value: "my-custom-value"
+    
+    # Another simple value
+    - name: DEBUG_MODE
+      value: "true"
+    
+    # Value from Secret
+    - name: MY_SECRET_VAR
+      valueFrom:
+        secretKeyRef:
+          name: my-secret
+          key: my-secret-key
+    
+    # Value from ConfigMap
+    - name: MY_CONFIG_VAR
+      valueFrom:
+        configMapKeyRef:
+          name: my-configmap
+          key: my-config-key
+    
+    # Value from Secret with optional key
+    - name: DATABASE_URL
+      valueFrom:
+        secretKeyRef:
+          name: app-secrets
+          key: database-url
+          optional: false
+
   persistence:
     enabled: true
     size: 20Gi
-

examples/extra-env-vars-values.yaml

@@ -122,3 +122,17 @@ Return the configmap name for MySQL configuration
 {{- end }}
 {{- end }}
 
+{{/*
+Convert extraFlags string to my.cnf format
+Input: "--max-connections=500 --log-bin-trust-function-creators=1"
+Output: "max-connections=500\nlog-bin-trust-function-creators=1"
+*/}}
+{{- define "mysql.extraFlagsToConfig" -}}
+{{- if .Values.primary.extraFlags }}
+{{- $flags := trim .Values.primary.extraFlags }}
+{{- $flags = regexReplaceAll " +--" $flags "\n" }}
+{{- $flags = regexReplaceAll "^--" $flags "" }}
+{{- $flags }}
+{{- end }}
+{{- end }}
+

templates/_helpers.tpl

@@ -15,6 +15,10 @@ data:
     datadir={{ .Values.primary.dataDir }}
     {{- end }}
     {{ $config | nindent 4 }}
+    {{- if .Values.primary.extraFlags }}
+    # Additional flags from primary.extraFlags
+    {{- include "mysql.extraFlagsToConfig" . | nindent 4 }}
+    {{- end }}
     {{- if .Values.tls.enabled }}
     # TLS/SSL Configuration
     ssl-ca=/etc/mysql/ssl/ca.crt

templates/configmap.yaml

@@ -57,6 +57,10 @@ spec:
               
               echo "Initializing databases and users..."
               
+              # Enable log_bin_trust_function_creators to allow triggers/functions without SUPER privilege
+              echo "Setting log_bin_trust_function_creators=1..."
+              mysql -h {{ include "mysql.fullname" . }} -u root -p${MYSQL_ROOT_PASSWORD} -e "SET GLOBAL log_bin_trust_function_creators=1;" || echo "Warning: Could not set log_bin_trust_function_creators (may already be set or binary logging disabled)"
+              
               {{- range $index, $db := .Values.initJob.databases }}
               echo "Creating database '{{ $db.name }}' and user '{{ $db.username }}'..."
               mysql -h {{ include "mysql.fullname" $ }} -u root -p${MYSQL_ROOT_PASSWORD} -e "CREATE DATABASE IF NOT EXISTS \`{{ $db.name }}\` DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci;"

templates/init-job.yaml

@@ -75,10 +75,6 @@ spec:
                   name: {{ include "mysql.secretName" . }}
                   key: mysql-password
             {{- end }}
-            {{- if .Values.primary.extraFlags }}
-            - name: MYSQL_EXTRA_FLAGS
-              value: "{{ .Values.primary.extraFlags }}"
-            {{- end }}
             {{- if .Values.primary.extraEnvVars }}
             {{- range .Values.primary.extraEnvVars }}
             - name: {{ .name }}

templates/statefulset.yaml

@@ -81,8 +81,9 @@ primary:
   existingConfigmap: ""
 
   ## @param primary.extraFlags Additional command-line arguments to pass to mysqld
-  ## Example: ["--max-connections=500", "--log-bin-trust-function-creators=1"]
-  extraFlags: []
+  ## Space-separated string of flags
+  ## Example: "--max-connections=500 --log-bin-trust-function-creators=1"
+  extraFlags: ""
 
   ## @param primary.extraEnvVars Array with extra environment variables to add to MySQL container
   ## Example: