diff --git a/stable/mysql/Chart.yaml b/stable/mysql/Chart.yaml index 12079a20b3..53b5805c7b 100755 --- a/stable/mysql/Chart.yaml +++ b/stable/mysql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: mysql -version: 1.6.5 +version: 1.6.6 appVersion: 5.7.30 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 50b00f769f..dd9a68825e 100755 --- a/stable/mysql/README.md +++ b/stable/mysql/README.md @@ -49,12 +49,14 @@ The following table lists the configurable parameters of the MySQL chart and the | `args` | Additional arguments to pass to the MySQL container. | `[]` | | `initContainer.resources` | initContainer resource requests/limits | Memory: `10Mi`, CPU: `10m` | | `image` | `mysql` image repository. | `mysql` | -| `imageTag` | `mysql` image tag. | `5.7.14` | +| `imageTag` | `mysql` image tag. | `5.7.30` | | `busybox.image` | `busybox` image repository. | `busybox` | -| `busybox.tag` | `busybox` image tag. | `1.29.3` | +| `busybox.tag` | `busybox` image tag. | `1.32` | | `testFramework.enabled` | `test-framework` switch. | `true` | -| `testFramework.image` | `test-framework` image repository. | `dduportal/bats` | -| `testFramework.tag` | `test-framework` image tag. | `0.4.0` | +| `testFramework.image` | `test-framework` image repository. | `bats/bats` | +| `testFramework.tag` | `test-framework` image tag. | `1.2.1` | +| `testFramework.imagePullPolicy` | `test-framework` image pull policy. | `IfNotPresent` | +| `testFramework.securityContext` | `test-framework` securityContext | `{}` | | `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/tests/test.yaml b/stable/mysql/templates/tests/test.yaml index 30392a9402..1771cd0df2 100644 --- a/stable/mysql/templates/tests/test.yaml +++ b/stable/mysql/templates/tests/test.yaml @@ -12,29 +12,36 @@ metadata: annotations: "helm.sh/hook": test-success spec: - initContainers: - - name: test-framework - image: "{{ .Values.testFramework.image}}:{{ .Values.testFramework.tag }}" - command: - - "bash" - - "-c" - - | - set -ex - # copy bats to tools dir - cp -R /usr/local/libexec/ /tools/bats/ - volumeMounts: - - mountPath: /tools - name: tools + {{- if .Values.testFramework.securityContext }} + securityContext: {{ toYaml .Values.testFramework.securityContext | nindent 4 }} + {{- end }} + {{- if .Values.imagePullSecrets }} + imagePullSecrets: + {{- range .Values.imagePullSecrets }} + - name: {{ . }} + {{- end}} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 4 }} + {{- end }} + {{- with .Values.affinity }} + affinity: +{{ toYaml . | indent 4 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: +{{ toYaml . | indent 4 }} + {{- end }} containers: - name: {{ .Release.Name }}-test - image: "{{ .Values.image }}:{{ .Values.imageTag }}" - command: ["/tools/bats/bats", "-t", "/tests/run.sh"] + image: "{{ .Values.testFramework.image }}:{{ .Values.testFramework.tag }}" + imagePullPolicy: "{{ .Values.testFramework.imagePullPolicy}}" + command: ["/opt/bats/bin/bats", "-t", "/tests/run.sh"] volumeMounts: - mountPath: /tests name: tests readOnly: true - - mountPath: /tools - name: tools {{- if .Values.ssl.enabled }} - name: certificates mountPath: /ssl @@ -43,8 +50,6 @@ spec: - name: tests configMap: name: {{ template "mysql.fullname" . }}-test - - name: tools - emptyDir: {} {{- if .Values.ssl.enabled }} - name: certificates secret: diff --git a/stable/mysql/values.yaml b/stable/mysql/values.yaml index 5a53455570..8d7658eac9 100644 --- a/stable/mysql/values.yaml +++ b/stable/mysql/values.yaml @@ -9,12 +9,14 @@ strategy: busybox: image: "busybox" - tag: "1.31.1" + tag: "1.32" testFramework: enabled: true - image: "dduportal/bats" - tag: "0.4.0" + image: "bats/bats" + tag: "1.2.1" + imagePullPolicy: IfNotPresent + securityContext: {} ## Specify password for root user ##