Skip to content

fix(mysql): honor image.pullPolicy (reversed sprig default args) #3094

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
weicao wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(mysql): honor image.pullPolicy (reversed sprig default args) #3094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/mysql/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions addons/mysql/templates/_orc.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,15 @@ 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
name: kubeblocks
{{- end }}

{{- define "mysql-orc.spec.runtime.mysql" -}}
imagePullPolicy: {{ default .Values.image.pullPolicy "IfNotPresent" }}
imagePullPolicy: {{ default "IfNotPresent" .Values.image.pullPolicy }}
command:
- bash
- -c
Expand Down
2 changes: 1 addition & 1 deletion addons/mysql/templates/cmpd-mysql57-orc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions addons/mysql/templates/cmpd-mysql57.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions addons/mysql/templates/cmpd-mysql80-mgr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/mysql/templates/cmpd-mysql80-orc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions addons/mysql/templates/cmpd-mysql80.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/mysql/templates/cmpd-mysql84-mgr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion addons/mysql/templates/cmpd-mysql84.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading