From 2760b303449249b573a97c44e46b488e00c6db46 Mon Sep 17 00:00:00 2001 From: boxboatmatt <36642033+boxboatmatt@users.noreply.github.com> Date: Fri, 14 Dec 2018 10:59:42 -0500 Subject: [PATCH] Parameterize all images for mysql chart (#9986) * Use chart values for test-framework and busybox image to allow alternate registries Signed-off-by: Matthew DeVenny * Add new values to README Signed-off-by: Matthew DeVenny * Fix spacing Signed-off-by: Matthew DeVenny * Update minor version Signed-off-by: Matthew DeVenny * Set busybox version to 1.29.3 Signed-off-by: Matthew DeVenny --- stable/mysql/Chart.yaml | 2 +- stable/mysql/README.md | 4 ++++ stable/mysql/templates/deployment.yaml | 2 +- stable/mysql/templates/tests/test.yaml | 2 +- stable/mysql/values.yaml | 8 ++++++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/stable/mysql/Chart.yaml b/stable/mysql/Chart.yaml index 57ba383765..2cd106b3cf 100755 --- a/stable/mysql/Chart.yaml +++ b/stable/mysql/Chart.yaml @@ -1,5 +1,5 @@ name: mysql -version: 0.10.2 +version: 0.11.0 appVersion: 5.7.14 description: Fast, reliable, scalable, and easy to use open-source relational database system. diff --git a/stable/mysql/README.md b/stable/mysql/README.md index 9252473aa1..5bba345e51 100755 --- a/stable/mysql/README.md +++ b/stable/mysql/README.md @@ -48,6 +48,10 @@ The following table lists the configurable parameters of the MySQL chart and the | -------------------------------------------- | -------------------------------------------------------------------------------------------- | ---------------------------------------------------- | | `image` | `mysql` image repository. | `mysql` | | `imageTag` | `mysql` image tag. | `5.7.14` | +| `busybox.image` | `busybox` image repository. | `busybox` | +| `busybox.tag` | `busybox` image tag. | `1.29.3` | +| `testFramework.image` | `test-framework` image repository. | `dduportal/bats` | +| `testFramework.tag` | `test-framework` image tag. | `0.4.0` | | `imagePullPolicy` | Image pull policy | `IfNotPresent` | | `existingSecret` | Use Existing secret for Password details | `nil` | | `extraVolumes` | Additional volumes as a string to be passed to the `tpl` function | | diff --git a/stable/mysql/templates/deployment.yaml b/stable/mysql/templates/deployment.yaml index 8c8b689e7b..e07031a10c 100644 --- a/stable/mysql/templates/deployment.yaml +++ b/stable/mysql/templates/deployment.yaml @@ -23,7 +23,7 @@ spec: {{- end }} initContainers: - name: "remove-lost-found" - image: "busybox:1.25.0" + image: "{{ .Values.busybox.image}}:{{ .Values.busybox.tag }}" imagePullPolicy: {{ .Values.imagePullPolicy | quote }} command: ["rm", "-fr", "/var/lib/mysql/lost+found"] volumeMounts: diff --git a/stable/mysql/templates/tests/test.yaml b/stable/mysql/templates/tests/test.yaml index 2e2f8f8466..7f7b758530 100644 --- a/stable/mysql/templates/tests/test.yaml +++ b/stable/mysql/templates/tests/test.yaml @@ -12,7 +12,7 @@ metadata: spec: initContainers: - name: test-framework - image: dduportal/bats:0.4.0 + image: "{{ .Values.testFramework.image}}:{{ .Values.testFramework.tag }}" command: - "bash" - "-c" diff --git a/stable/mysql/values.yaml b/stable/mysql/values.yaml index f5e0660785..ed00b1f01c 100644 --- a/stable/mysql/values.yaml +++ b/stable/mysql/values.yaml @@ -4,6 +4,14 @@ image: "mysql" imageTag: "5.7.14" +busybox: + image: "busybox" + tag: "1.29.3" + +testFramework: + image: "dduportal/bats" + tag: "0.4.0" + ## Specify password for root user ## ## Default: random 10 character string