diff --git a/addons/mysql/templates/_helpers.tpl b/addons/mysql/templates/_helpers.tpl index fe5b63394..be00b97de 100644 --- a/addons/mysql/templates/_helpers.tpl +++ b/addons/mysql/templates/_helpers.tpl @@ -302,19 +302,6 @@ exporter: {{- define "mysql-orc.spec.lifecycle.common" }} -accountProvision: - exec: - container: mysql - image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:8.0.33 - command: - - /bin/sh - - -c - - | - set -ex - eval statement=\"${KB_ACCOUNT_STATEMENT}\" - mysql -u${MYSQL_ROOT_USER} -p${MYSQL_ROOT_PASSWORD} -P3306 -h127.0.0.1 -e "${statement}" - targetPodSelector: Role - matchingKey: primary roleProbe: periodSeconds: {{ .Values.roleProbe.periodSeconds }} timeoutSeconds: {{ .Values.roleProbe.timeoutSeconds }} diff --git a/addons/mysql/templates/cmpd-mysql57-orc.yaml b/addons/mysql/templates/cmpd-mysql57-orc.yaml index 7e0fd0ce2..d4cdbf52e 100644 --- a/addons/mysql/templates/cmpd-mysql57-orc.yaml +++ b/addons/mysql/templates/cmpd-mysql57-orc.yaml @@ -11,6 +11,19 @@ spec: serviceVersion: 5.7.44 lifecycleActions: {{- include "mysql-orc.spec.lifecycle.common" . | nindent 4 }} + accountProvision: + exec: + container: mysql + image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:5.7.44 + command: + - /bin/sh + - -c + - | + set -ex + eval statement=\"${KB_ACCOUNT_STATEMENT}\" + mysql -u${MYSQL_ROOT_USER} -p${MYSQL_ROOT_PASSWORD} -P3306 -h127.0.0.1 -e "${statement}" + targetPodSelector: Role + matchingKey: primary postProvision: exec: image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:5.7.44 diff --git a/addons/mysql/templates/cmpd-mysql80-orc.yaml b/addons/mysql/templates/cmpd-mysql80-orc.yaml index 192f4ce6f..6036d1864 100644 --- a/addons/mysql/templates/cmpd-mysql80-orc.yaml +++ b/addons/mysql/templates/cmpd-mysql80-orc.yaml @@ -11,6 +11,19 @@ spec: serviceVersion: 8.0.33 lifecycleActions: {{- include "mysql-orc.spec.lifecycle.common" . | nindent 4 }} + accountProvision: + exec: + container: mysql + image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:8.0.33 + command: + - /bin/sh + - -c + - | + set -ex + eval statement=\"${KB_ACCOUNT_STATEMENT}\" + mysql -u${MYSQL_ROOT_USER} -p${MYSQL_ROOT_PASSWORD} -P3306 -h127.0.0.1 -e "${statement}" + targetPodSelector: Role + matchingKey: primary postProvision: exec: image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:8.0.33