From 156ef759f83ef6fc4c9fe199b3d667c09eb608be Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Fri, 25 Mar 2022 22:48:00 +0200 Subject: [PATCH] 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 --- charts/dependency/mariadb/Chart.yaml | 6 ++-- .../lib/dependencies/_mariadbInit.tpl | 33 ++++++++++-------- docs/_static/img/appicons/mariadb.png | Bin 0 -> 8473 bytes 3 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 docs/_static/img/appicons/mariadb.png diff --git a/charts/dependency/mariadb/Chart.yaml b/charts/dependency/mariadb/Chart.yaml index 550bd4733cb..860014498da 100644 --- a/charts/dependency/mariadb/Chart.yaml +++ b/charts/dependency/mariadb/Chart.yaml @@ -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 diff --git a/charts/library/common/templates/lib/dependencies/_mariadbInit.tpl b/charts/library/common/templates/lib/dependencies/_mariadbInit.tpl index e60471bdedf..84da2d169c5 100644 --- a/charts/library/common/templates/lib/dependencies/_mariadbInit.tpl +++ b/charts/library/common/templates/lib/dependencies/_mariadbInit.tpl @@ -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 -}} diff --git a/docs/_static/img/appicons/mariadb.png b/docs/_static/img/appicons/mariadb.png new file mode 100644 index 0000000000000000000000000000000000000000..72707425f4049a847885102602d7074bd5c3395e GIT binary patch literal 8473 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