diff --git a/stable/mysql/Chart.yaml b/stable/mysql/Chart.yaml index f4de1f18c0..0b20c06a31 100755 --- a/stable/mysql/Chart.yaml +++ b/stable/mysql/Chart.yaml @@ -1,5 +1,5 @@ name: mysql -version: 0.12.0 +version: 0.13.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 f1abaa2705..1247d7a737 100755 --- a/stable/mysql/README.md +++ b/stable/mysql/README.md @@ -90,6 +90,7 @@ The following table lists the configurable parameters of the MySQL chart and the | `metrics.readinessProbe.timeoutSeconds` | When the probe times out | 1 | | `resources` | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `100m` | | `configurationFiles` | List of mysql configuration files | `nil` | +| `service.annotations` | Kubernetes annotations for mysql | {} | | `ssl.enabled` | Setup and use SSL for MySQL connections | `false` | | `ssl.secret` | Name of the secret containing the SSL certificates | mysql-ssl-certs | | `ssl.certificates[0].name` | Name of the secret containing the SSL certificates | `nil` | diff --git a/stable/mysql/templates/svc.yaml b/stable/mysql/templates/svc.yaml index de5669e30f..8cc9afc3b3 100644 --- a/stable/mysql/templates/svc.yaml +++ b/stable/mysql/templates/svc.yaml @@ -7,8 +7,11 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" -{{- if .Values.metrics.enabled }} annotations: +{{- if .Values.service.annotations }} +{{ toYaml .Values.service.annotations | indent 4 }} +{{- end }} +{{- if and (.Values.metrics.enabled) (.Values.metrics.annotations) }} {{ toYaml .Values.metrics.annotations | indent 4 }} {{- end }} spec: diff --git a/stable/mysql/values.yaml b/stable/mysql/values.yaml index a87de83822..cc6c0209ea 100644 --- a/stable/mysql/values.yaml +++ b/stable/mysql/values.yaml @@ -133,6 +133,7 @@ metrics: ## Configure the service ## ref: http://kubernetes.io/docs/user-guide/services/ service: + annotations: {} ## Specify a service type ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services---service-types type: ClusterIP