fix(common): try to fix "did not find expected "-" indicator (#2275)
* fix(common): try to fix "did not find expected "-" indicator * fix mariadbinit command and bump version
This commit is contained in:
parent
d4986184ea
commit
156ef759f8
|
@ -3,11 +3,11 @@ appVersion: "10.7.3"
|
|||
dependencies:
|
||||
- name: common
|
||||
repository: https://truecharts.org
|
||||
version: 9.1.8
|
||||
version: 9.1.13
|
||||
deprecated: false
|
||||
description: Fast, reliable, scalable, and easy to use open-source relational database system.
|
||||
home: https://github.com/truecharts/apps/tree/master/stable/mariadb
|
||||
icon: https://bitnami.com/assets/stacks/mariadb/img/mariadb-stack-220x234.png
|
||||
icon: https://truecharts.org/_static/img/appicons/mariadb.png
|
||||
keywords:
|
||||
- mariadb
|
||||
- mysql
|
||||
|
@ -24,7 +24,7 @@ sources:
|
|||
- https://github.com/prometheus/mysqld_exporter
|
||||
- https://mariadb.org
|
||||
type: application
|
||||
version: 2.0.10
|
||||
version: 2.0.11
|
||||
annotations:
|
||||
truecharts.org/catagories: |
|
||||
- database
|
||||
|
|
|
@ -2,21 +2,20 @@
|
|||
This template ensures pods with postgresql dependency have a delayed start
|
||||
*/}}
|
||||
{{- define "common.dependencies.mariadb.init" -}}
|
||||
{{- $pghost := printf "%v-%v" .Release.Name "mariadb" }}
|
||||
{{- if .Values.mariadb.enabled }}
|
||||
- name: mariadb-init
|
||||
image: "{{ .Values.mariadbImage.repository}}:{{ .Values.mariadbImage.tag }}"
|
||||
env:
|
||||
- name: MARIADB_HOST
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: mariadbcreds
|
||||
key: plainhost
|
||||
- name: MARIADB_ROOT_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: mariadbcreds
|
||||
key: mariadb-root-password
|
||||
- name: MARIADB_HOST
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: mariadbcreds
|
||||
key: plainhost
|
||||
- name: MARIADB_ROOT_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: mariadbcreds
|
||||
key: mariadb-root-password
|
||||
securityContext:
|
||||
capabilities:
|
||||
drop:
|
||||
|
@ -25,10 +24,14 @@ This template ensures pods with postgresql dependency have a delayed start
|
|||
{{- with .Values.resources }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
command:
|
||||
- "bash"
|
||||
- "-ec"
|
||||
- "until mysqladmin -uroot -h"${MARIADB_HOST}" -p"${MARIADB_ROOT_PASSWORD}" ping && mysqladmin -uroot -h"${MARIADB_HOST}" -p"${MARIADB_ROOT_PASSWORD}" status; do sleep 2; done"
|
||||
command: ["bash", "-ec"]
|
||||
args:
|
||||
- >
|
||||
until
|
||||
mysqladmin -uroot -h"${MARIADB_HOST}" -p"${MARIADB_ROOT_PASSWORD}" ping \
|
||||
&& mysqladmin -uroot -h"${MARIADB_HOST}" -p"${MARIADB_ROOT_PASSWORD}" status;
|
||||
do sleep 2;
|
||||
done
|
||||
imagePullPolicy: IfNotPresent
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 8.3 KiB |
Loading…
Reference in New Issue