diff --git a/addons/mysql/templates/_helpers.tpl b/addons/mysql/templates/_helpers.tpl index 336866062..ff56b82cb 100644 --- a/addons/mysql/templates/_helpers.tpl +++ b/addons/mysql/templates/_helpers.tpl @@ -302,7 +302,7 @@ env: value: $(MYSQL_ROOT_PASSWORD) - name: EXPORTER_WEB_PORT value: "{{ .Values.metrics.service.port }}" -imagePullPolicy: IfNotPresent +imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} ports: - name: http-metrics containerPort: {{ .Values.metrics.service.port }} diff --git a/addons/mysql/templates/_orc.tpl b/addons/mysql/templates/_orc.tpl index e788685ae..d5bb8f80a 100644 --- a/addons/mysql/templates/_orc.tpl +++ b/addons/mysql/templates/_orc.tpl @@ -248,7 +248,7 @@ switchover: cp -r /usr/bin/jq /kubeblocks/jq cp -r /scripts/orchestrator-client /kubeblocks/orchestrator-client cp -r /usr/local/bin/curl /kubeblocks/curl - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} name: init-jq volumeMounts: - mountPath: /kubeblocks @@ -256,7 +256,7 @@ switchover: {{- end }} {{- define "mysql-orc.spec.runtime.mysql" -}} -imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} +imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} command: - bash - -c diff --git a/addons/mysql/templates/cmpd-mysql57-orc.yaml b/addons/mysql/templates/cmpd-mysql57-orc.yaml index 25b5c0579..0ae19afb7 100644 --- a/addons/mysql/templates/cmpd-mysql57-orc.yaml +++ b/addons/mysql/templates/cmpd-mysql57-orc.yaml @@ -29,7 +29,7 @@ spec: - | mkdir -p {{ .Values.dataMountPath }}/{log,binlog,auditlog,temp} cp /usr/lib/mysql/plugin/ {{ .Values.dataMountPath }}/plugin -r - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} volumeMounts: - mountPath: {{ .Values.dataMountPath }} name: data diff --git a/addons/mysql/templates/cmpd-mysql57.yaml b/addons/mysql/templates/cmpd-mysql57.yaml index 635ff108a..3a510f28c 100644 --- a/addons/mysql/templates/cmpd-mysql57.yaml +++ b/addons/mysql/templates/cmpd-mysql57.yaml @@ -26,7 +26,7 @@ spec: - | mkdir -p {{ .Values.dataMountPath }}/{log,binlog,auditlog} cp /usr/lib/mysql/plugin/ {{ .Values.dataMountPath }}/plugin -r - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} volumeMounts: - mountPath: {{ .Values.dataMountPath }} name: data @@ -53,7 +53,7 @@ spec: {{- include "mysql.spec.runtime.common" . | nindent 6 }} containers: - name: mysql - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} command: - syncer - --port diff --git a/addons/mysql/templates/cmpd-mysql80-mgr.yaml b/addons/mysql/templates/cmpd-mysql80-mgr.yaml index 54c509e3f..321e69da2 100644 --- a/addons/mysql/templates/cmpd-mysql80-mgr.yaml +++ b/addons/mysql/templates/cmpd-mysql80-mgr.yaml @@ -26,7 +26,7 @@ spec: - | mkdir -p {{ .Values.dataMountPath }}/{log,binlog,auditlog} cp /usr/lib/mysql/plugin/ {{ .Values.dataMountPath }}/plugin -r - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} volumeMounts: - mountPath: {{ .Values.dataMountPath }} name: data @@ -43,7 +43,7 @@ spec: {{- include "mysql.spec.runtime.common" . | nindent 6 }} containers: - name: mysql - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} command: - syncer - --port diff --git a/addons/mysql/templates/cmpd-mysql80-orc.yaml b/addons/mysql/templates/cmpd-mysql80-orc.yaml index 4931ef62c..062a779d0 100644 --- a/addons/mysql/templates/cmpd-mysql80-orc.yaml +++ b/addons/mysql/templates/cmpd-mysql80-orc.yaml @@ -29,7 +29,7 @@ spec: - | mkdir -p {{ .Values.dataMountPath }}/{log,binlog,auditlog,temp} cp /usr/lib/mysql/plugin/ {{ .Values.dataMountPath }}/plugin -r - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} volumeMounts: - mountPath: {{ .Values.dataMountPath }} name: data diff --git a/addons/mysql/templates/cmpd-mysql80.yaml b/addons/mysql/templates/cmpd-mysql80.yaml index 60259a702..df84d8d22 100644 --- a/addons/mysql/templates/cmpd-mysql80.yaml +++ b/addons/mysql/templates/cmpd-mysql80.yaml @@ -26,7 +26,7 @@ spec: - | mkdir -p {{ .Values.dataMountPath }}/{log,binlog,auditlog} cp /usr/lib/mysql/plugin/ {{ .Values.dataMountPath }}/plugin -r - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} volumeMounts: - mountPath: {{ .Values.dataMountPath }} name: data @@ -53,7 +53,7 @@ spec: {{- include "mysql.spec.runtime.common" . | nindent 6 }} containers: - name: mysql - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} command: - syncer - --port diff --git a/addons/mysql/templates/cmpd-mysql84-mgr.yaml b/addons/mysql/templates/cmpd-mysql84-mgr.yaml index f0048f35d..610930de6 100644 --- a/addons/mysql/templates/cmpd-mysql84-mgr.yaml +++ b/addons/mysql/templates/cmpd-mysql84-mgr.yaml @@ -32,7 +32,7 @@ spec: {{- include "mysql.spec.runtime.common" . | nindent 6 }} containers: - name: mysql - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} command: - syncer - --port diff --git a/addons/mysql/templates/cmpd-mysql84.yaml b/addons/mysql/templates/cmpd-mysql84.yaml index 2e4a0857f..a897868b5 100644 --- a/addons/mysql/templates/cmpd-mysql84.yaml +++ b/addons/mysql/templates/cmpd-mysql84.yaml @@ -42,7 +42,7 @@ spec: {{- include "mysql.spec.runtime.common" . | nindent 6 }} containers: - name: mysql - imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }} + imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }} command: - syncer - --port