From 8394f726dbaf0c64f605e0a019ab1ac6eadbdc32 Mon Sep 17 00:00:00 2001 From: Martin Hickey Date: Fri, 31 Jan 2020 11:42:40 +0000 Subject: [PATCH] Refactor unit test Refactor unit test to use an existing chart as dependency Signed-off-by: Martin Hickey --- cmd/helm/dependency_build_test.go | 10 +- .../issue-7233/charts/alpine-0.1.0.tgz | Bin 0 -> 1167 bytes .../issue-7233/charts/mysql-1.6.2.tgz | Bin 11058 -> 0 bytes .../testcharts/issue-7233/requirements.lock | 10 +- .../testcharts/issue-7233/requirements.yaml | 6 +- .../testcharts/issue-7233/templates/NOTES.txt | 21 -- .../issue-7233/templates/_helpers.tpl | 56 ---- .../issue-7233/templates/configmap.yaml | 7 + .../issue-7233/templates/deployment.yaml | 57 ---- .../issue-7233/templates/ingress.yaml | 41 --- .../issue-7233/templates/service.yaml | 16 -- .../issue-7233/templates/serviceaccount.yaml | 8 - .../templates/tests/test-connection.yaml | 15 -- .../testcharts/issue-7233/values.yaml | 69 +---- .../testdata/testcharts/mysql/.helmignore | 2 - cmd/helm/testdata/testcharts/mysql/Chart.yaml | 21 -- cmd/helm/testdata/testcharts/mysql/README.md | 241 ----------------- .../testcharts/mysql/templates/NOTES.txt | 43 --- .../testcharts/mysql/templates/_helpers.tpl | 43 --- .../configurationFiles-configmap.yaml | 12 - .../mysql/templates/deployment.yaml | 248 ------------------ .../initializationFiles-configmap.yaml | 12 - .../testcharts/mysql/templates/pvc.yaml | 29 -- .../testcharts/mysql/templates/secrets.yaml | 51 ---- .../mysql/templates/serviceaccount.yaml | 11 - .../mysql/templates/servicemonitor.yaml | 26 -- .../testcharts/mysql/templates/svc.yaml | 36 --- .../mysql/templates/tests/test-configmap.yaml | 23 -- .../mysql/templates/tests/test.yaml | 54 ---- .../testdata/testcharts/mysql/values.yaml | 227 ---------------- pkg/downloader/manager.go | 4 +- 31 files changed, 27 insertions(+), 1372 deletions(-) create mode 100644 cmd/helm/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz delete mode 100644 cmd/helm/testdata/testcharts/issue-7233/charts/mysql-1.6.2.tgz delete mode 100644 cmd/helm/testdata/testcharts/issue-7233/templates/NOTES.txt delete mode 100644 cmd/helm/testdata/testcharts/issue-7233/templates/_helpers.tpl create mode 100644 cmd/helm/testdata/testcharts/issue-7233/templates/configmap.yaml delete mode 100644 cmd/helm/testdata/testcharts/issue-7233/templates/deployment.yaml delete mode 100644 cmd/helm/testdata/testcharts/issue-7233/templates/ingress.yaml delete mode 100644 cmd/helm/testdata/testcharts/issue-7233/templates/service.yaml delete mode 100644 cmd/helm/testdata/testcharts/issue-7233/templates/serviceaccount.yaml delete mode 100644 cmd/helm/testdata/testcharts/issue-7233/templates/tests/test-connection.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/.helmignore delete mode 100644 cmd/helm/testdata/testcharts/mysql/Chart.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/README.md delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/NOTES.txt delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/_helpers.tpl delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/configurationFiles-configmap.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/deployment.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/initializationFiles-configmap.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/pvc.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/secrets.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/serviceaccount.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/servicemonitor.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/svc.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/tests/test-configmap.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/templates/tests/test.yaml delete mode 100644 cmd/helm/testdata/testcharts/mysql/values.yaml diff --git a/cmd/helm/dependency_build_test.go b/cmd/helm/dependency_build_test.go index 3e092ae00..0e76381f4 100644 --- a/cmd/helm/dependency_build_test.go +++ b/cmd/helm/dependency_build_test.go @@ -102,7 +102,9 @@ func TestDependencyBuildCmd(t *testing.T) { } func TestDependencyBuildCmdWithHelmV2Hash(t *testing.T) { - cmd := fmt.Sprintf("dependency build '%s'", "testdata/testcharts/issue-7233") + chartName := "testdata/testcharts/issue-7233" + + cmd := fmt.Sprintf("dependency build '%s'", chartName) _, out, err := executeActionCommand(cmd) // Want to make sure the build can verify Helm v2 hash @@ -110,4 +112,10 @@ func TestDependencyBuildCmdWithHelmV2Hash(t *testing.T) { t.Logf("Output: %s", out) t.Fatal(err) } + + // Make sure the child chart file got downloaded. + expect := filepath.Join(chartName, "charts/alpine-0.1.0.tgz") + if _, err := os.Stat(expect); err != nil { + t.Fatal(err) + } } diff --git a/cmd/helm/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz b/cmd/helm/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..925018e84f0365b92d64f347d355248a5839f42e GIT binary patch literal 1167 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 pq<(czXKwmazZ^{D;Sa!(=%*A+8`G{twsdn6dx> diff --git a/cmd/helm/testdata/testcharts/issue-7233/requirements.lock b/cmd/helm/testdata/testcharts/issue-7233/requirements.lock index 67c951584..62744125b 100644 --- a/cmd/helm/testdata/testcharts/issue-7233/requirements.lock +++ b/cmd/helm/testdata/testcharts/issue-7233/requirements.lock @@ -1,6 +1,6 @@ dependencies: -- name: mysql - repository: file://../mysql - version: 1.6.2 -digest: sha256:add2a8a6b181881747598aabe3bebab079c86624a083bb87ef8ece3fc3207026 -generated: "2020-01-30T17:21:42.015287763Z" +- name: alpine + repository: file://../alpine + version: 0.1.0 +digest: sha256:7b380b1a826e7be1eecb089f66209d6d3df54be4bf879d4a8e6f8a9e871710e5 +generated: "2020-01-31T11:30:21.911547651Z" diff --git a/cmd/helm/testdata/testcharts/issue-7233/requirements.yaml b/cmd/helm/testdata/testcharts/issue-7233/requirements.yaml index f2de5d35d..f0195cb15 100644 --- a/cmd/helm/testdata/testcharts/issue-7233/requirements.yaml +++ b/cmd/helm/testdata/testcharts/issue-7233/requirements.yaml @@ -1,4 +1,4 @@ dependencies: -- name: mysql - version: 1.6.2 - repository: file://../mysql +- name: alpine + version: 0.1.0 + repository: file://../alpine diff --git a/cmd/helm/testdata/testcharts/issue-7233/templates/NOTES.txt b/cmd/helm/testdata/testcharts/issue-7233/templates/NOTES.txt deleted file mode 100644 index 9533aaa50..000000000 --- a/cmd/helm/testdata/testcharts/issue-7233/templates/NOTES.txt +++ /dev/null @@ -1,21 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "issue-7233.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "issue-7233.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "issue-7233.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "issue-7233.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl port-forward $POD_NAME 8080:80 -{{- end }} diff --git a/cmd/helm/testdata/testcharts/issue-7233/templates/_helpers.tpl b/cmd/helm/testdata/testcharts/issue-7233/templates/_helpers.tpl deleted file mode 100644 index 78b9df4b9..000000000 --- a/cmd/helm/testdata/testcharts/issue-7233/templates/_helpers.tpl +++ /dev/null @@ -1,56 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "issue-7233.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "issue-7233.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "issue-7233.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Common labels -*/}} -{{- define "issue-7233.labels" -}} -app.kubernetes.io/name: {{ include "issue-7233.name" . }} -helm.sh/chart: {{ include "issue-7233.chart" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "issue-7233.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} - {{ default (include "issue-7233.fullname" .) .Values.serviceAccount.name }} -{{- else -}} - {{ default "default" .Values.serviceAccount.name }} -{{- end -}} -{{- end -}} diff --git a/cmd/helm/testdata/testcharts/issue-7233/templates/configmap.yaml b/cmd/helm/testdata/testcharts/issue-7233/templates/configmap.yaml new file mode 100644 index 000000000..53880b25d --- /dev/null +++ b/cmd/helm/testdata/testcharts/issue-7233/templates/configmap.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Release.Name }}-configmap +data: + myvalue: "Hello World" + drink: {{ .Values.favoriteDrink }} diff --git a/cmd/helm/testdata/testcharts/issue-7233/templates/deployment.yaml b/cmd/helm/testdata/testcharts/issue-7233/templates/deployment.yaml deleted file mode 100644 index 8eb73636c..000000000 --- a/cmd/helm/testdata/testcharts/issue-7233/templates/deployment.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "issue-7233.fullname" . }} - labels: -{{ include "issue-7233.labels" . | indent 4 }} -spec: - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "issue-7233.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "issue-7233.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ template "issue-7233.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: 80 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - readinessProbe: - httpGet: - path: / - port: http - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/cmd/helm/testdata/testcharts/issue-7233/templates/ingress.yaml b/cmd/helm/testdata/testcharts/issue-7233/templates/ingress.yaml deleted file mode 100644 index 9b56c8d90..000000000 --- a/cmd/helm/testdata/testcharts/issue-7233/templates/ingress.yaml +++ /dev/null @@ -1,41 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "issue-7233.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - labels: -{{ include "issue-7233.labels" . | indent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: -{{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} -{{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ . }} - backend: - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} -{{- end }} diff --git a/cmd/helm/testdata/testcharts/issue-7233/templates/service.yaml b/cmd/helm/testdata/testcharts/issue-7233/templates/service.yaml deleted file mode 100644 index aea07f5a4..000000000 --- a/cmd/helm/testdata/testcharts/issue-7233/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "issue-7233.fullname" . }} - labels: -{{ include "issue-7233.labels" . | indent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: http - protocol: TCP - name: http - selector: - app.kubernetes.io/name: {{ include "issue-7233.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} diff --git a/cmd/helm/testdata/testcharts/issue-7233/templates/serviceaccount.yaml b/cmd/helm/testdata/testcharts/issue-7233/templates/serviceaccount.yaml deleted file mode 100644 index 0d6e8df58..000000000 --- a/cmd/helm/testdata/testcharts/issue-7233/templates/serviceaccount.yaml +++ /dev/null @@ -1,8 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ template "issue-7233.serviceAccountName" . }} - labels: -{{ include "issue-7233.labels" . | indent 4 }} -{{- end -}} diff --git a/cmd/helm/testdata/testcharts/issue-7233/templates/tests/test-connection.yaml b/cmd/helm/testdata/testcharts/issue-7233/templates/tests/test-connection.yaml deleted file mode 100644 index ca844cca7..000000000 --- a/cmd/helm/testdata/testcharts/issue-7233/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "issue-7233.fullname" . }}-test-connection" - labels: -{{ include "issue-7233.labels" . | indent 4 }} - annotations: - "helm.sh/hook": test-success -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "issue-7233.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/cmd/helm/testdata/testcharts/issue-7233/values.yaml b/cmd/helm/testdata/testcharts/issue-7233/values.yaml index cc8472208..b1aa168d7 100644 --- a/cmd/helm/testdata/testcharts/issue-7233/values.yaml +++ b/cmd/helm/testdata/testcharts/issue-7233/values.yaml @@ -1,68 +1 @@ -# Default values for issue-7233. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -replicaCount: 1 - -image: - repository: nginx - tag: stable - pullPolicy: IfNotPresent - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - # Specifies whether a service account should be created - create: true - # The name of the service account to use. - # If not set and create is true, a name is generated using the fullname template - name: - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 80 - -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - hosts: - - host: chart-example.local - paths: [] - - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -nodeSelector: {} - -tolerations: [] - -affinity: {} +favoriteDrink: coffee diff --git a/cmd/helm/testdata/testcharts/mysql/.helmignore b/cmd/helm/testdata/testcharts/mysql/.helmignore deleted file mode 100644 index a1c17ae45..000000000 --- a/cmd/helm/testdata/testcharts/mysql/.helmignore +++ /dev/null @@ -1,2 +0,0 @@ -.git -OWNERS \ No newline at end of file diff --git a/cmd/helm/testdata/testcharts/mysql/Chart.yaml b/cmd/helm/testdata/testcharts/mysql/Chart.yaml deleted file mode 100644 index ad89e5187..000000000 --- a/cmd/helm/testdata/testcharts/mysql/Chart.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -appVersion: 5.7.28 -description: Fast, reliable, scalable, and easy to use open-source relational database - system. -engine: gotpl -home: https://www.mysql.com/ -icon: https://www.mysql.com/common/logos/logo-mysql-170x115.png -keywords: -- mysql -- database -- sql -maintainers: -- email: o.with@sportradar.com - name: olemarkus -- email: viglesias@google.com - name: viglesiasce -name: mysql -sources: -- https://github.com/kubernetes/charts -- https://github.com/docker-library/mysql -version: 1.6.2 diff --git a/cmd/helm/testdata/testcharts/mysql/README.md b/cmd/helm/testdata/testcharts/mysql/README.md deleted file mode 100644 index 8d729cbc4..000000000 --- a/cmd/helm/testdata/testcharts/mysql/README.md +++ /dev/null @@ -1,241 +0,0 @@ -# MySQL - -[MySQL](https://MySQL.org) is one of the most popular database servers in the world. Notable users include Wikipedia, Facebook and Google. - -## Introduction - -This chart bootstraps a single node MySQL deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - -## Prerequisites - -- Kubernetes 1.10+ with Beta APIs enabled -- PV provisioner support in the underlying infrastructure - -## Installing the Chart - -To install the chart with the release name `my-release`: - -```bash -$ helm install --name my-release stable/mysql -``` - -The command deploys MySQL on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. - -By default a random password will be generated for the root user. If you'd like to set your own password change the mysqlRootPassword -in the values.yaml. - -You can retrieve your root password by running the following command. Make sure to replace [YOUR_RELEASE_NAME]: - - printf $(printf '\%o' `kubectl get secret [YOUR_RELEASE_NAME]-mysql -o jsonpath="{.data.mysql-root-password[*]}"`) - -> **Tip**: List all releases using `helm list` - -## Uninstalling the Chart - -To uninstall/delete the `my-release` deployment: - -```bash -$ helm delete --purge my-release -``` - -The command removes all the Kubernetes components associated with the chart and deletes the release completely. - -## Configuration - -The following table lists the configurable parameters of the MySQL chart and their default values. - -| Parameter | Description | Default | -| -------------------------------------------- | -------------------------------------------------------------------------------------------- | ---------------------------------------------------- | -| `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` | -| `busybox.image` | `busybox` image repository. | `busybox` | -| `busybox.tag` | `busybox` image tag. | `1.29.3` | -| `testFramework.enabled` | `test-framework` switch. | `true` | -| `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 | | -| `extraVolumeMounts` | Additional volumeMounts as a string to be passed to the `tpl` function | | -| `extraInitContainers` | Additional init containers as a string to be passed to the `tpl` function | | -| `mysqlRootPassword` | Password for the `root` user. Ignored if existing secret is provided | Random 10 characters | -| `mysqlUser` | Username of new user to create. | `nil` | -| `mysqlPassword` | Password for the new user. Ignored if existing secret is provided | Random 10 characters | -| `mysqlDatabase` | Name for new database to create. | `nil` | -| `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | 30 | -| `livenessProbe.periodSeconds` | How often to perform the probe | 10 | -| `livenessProbe.timeoutSeconds` | When the probe times out | 5 | -| `livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | 1 | -| `livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | 3 | -| `readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated | 5 | -| `readinessProbe.periodSeconds` | How often to perform the probe | 10 | -| `readinessProbe.timeoutSeconds` | When the probe times out | 1 | -| `readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | 1 | -| `readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | 3 | -| `schedulerName` | Name of the k8s scheduler (other than default) | `nil` | -| `persistence.enabled` | Create a volume to store data | true | -| `persistence.size` | Size of persistent volume claim | 8Gi RW | -| `persistence.storageClass` | Type of persistent volume claim | nil | -| `persistence.accessMode` | ReadWriteOnce or ReadOnly | ReadWriteOnce | -| `persistence.existingClaim` | Name of existing persistent volume | `nil` | -| `persistence.subPath` | Subdirectory of the volume to mount | `nil` | -| `persistence.annotations` | Persistent Volume annotations | {} | -| `nodeSelector` | Node labels for pod assignment | {} | -| `tolerations` | Pod taint tolerations for deployment | {} | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image` | Exporter image | `prom/mysqld-exporter` | -| `metrics.imageTag` | Exporter image | `v0.10.0` | -| `metrics.imagePullPolicy` | Exporter image pull policy | `IfNotPresent` | -| `metrics.resources` | Exporter resource requests/limit | `nil` | -| `metrics.livenessProbe.initialDelaySeconds` | Delay before metrics liveness probe is initiated | 15 | -| `metrics.livenessProbe.timeoutSeconds` | When the probe times out | 5 | -| `metrics.readinessProbe.initialDelaySeconds` | Delay before metrics readiness probe is initiated | 5 | -| `metrics.readinessProbe.timeoutSeconds` | When the probe times out | 1 | -| `metrics.flags` | Additional flags for the mysql exporter to use | `[]` | -| `metrics.serviceMonitor.enabled` | Set this to `true` to create ServiceMonitor for Prometheus operator | `false` | -| `metrics.serviceMonitor.additionalLabels` | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | `{}` | -| `resources` | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `100m` | -| `configurationFiles` | List of mysql configuration files | `nil` | -| `configurationFilesPath` | Path of mysql configuration files | `/etc/mysql/conf.d/` | -| `securityContext.enabled` | Enable security context (mysql pod) | `false` | -| `securityContext.fsGroup` | Group ID for the container (mysql pod) | 999 | -| `securityContext.runAsUser` | User ID for the container (mysql pod) | 999 | -| `service.annotations` | Kubernetes annotations for mysql | {} | -| `service.type` | Kubernetes service type | ClusterIP | -| `service.loadBalancerIP` | LoadBalancer service IP | `""` | -| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `false` | -| `serviceAccount.name` | The name of the ServiceAccount to create | Generated using the mysql.fullname template | -| `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` | -| `ssl.certificates[0].ca` | CA certificate | `nil` | -| `ssl.certificates[0].cert` | Server certificate (public key) | `nil` | -| `ssl.certificates[0].key` | Server key (private key) | `nil` | -| `imagePullSecrets` | Name of Secret resource containing private registry credentials | `nil` | -| `initializationFiles` | List of SQL files which are run after the container started | `nil` | -| `timezone` | Container and mysqld timezone (TZ env) | `nil` (UTC depending on image) | -| `podAnnotations` | Map of annotations to add to the pods | `{}` | -| `podLabels` | Map of labels to add to the pods | `{}` | -| `priorityClassName` | Set pod priorityClassName | `{}` | -| `deploymentAnnotations` | Map of annotations for deployment | `{}` | -| `strategy` | Update strategy policy | `{type: "Recreate"}` | - -Some of the parameters above map to the env variables defined in the [MySQL DockerHub image](https://hub.docker.com/_/mysql/). - -Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, - -```bash -$ helm install --name my-release \ - --set mysqlRootPassword=secretpassword,mysqlUser=my-user,mysqlPassword=my-password,mysqlDatabase=my-database \ - stable/mysql -``` - -The above command sets the MySQL `root` account password to `secretpassword`. Additionally it creates a standard database user named `my-user`, with the password `my-password`, who has access to a database named `my-database`. - -Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example, - -```bash -$ helm install --name my-release -f values.yaml stable/mysql -``` - -> **Tip**: You can use the default [values.yaml](values.yaml) - -## Persistence - -The [MySQL](https://hub.docker.com/_/mysql/) image stores the MySQL data and configurations at the `/var/lib/mysql` path of the container. - -By default a PersistentVolumeClaim is created and mounted into that directory. In order to disable this functionality -you can change the values.yaml to disable persistence and use an emptyDir instead. - -> *"An emptyDir volume is first created when a Pod is assigned to a Node, and exists as long as that Pod is running on that node. When a Pod is removed from a node for any reason, the data in the emptyDir is deleted forever."* - -**Notice**: You may need to increase the value of `livenessProbe.initialDelaySeconds` when enabling persistence by using PersistentVolumeClaim from PersistentVolume with varying properties. Since its IO performance has impact on the database initialization performance. The default limit for database initialization is `60` seconds (`livenessProbe.initialDelaySeconds` + `livenessProbe.periodSeconds` * `livenessProbe.failureThreshold`). Once such initialization process takes more time than this limit, kubelet will restart the database container, which will interrupt database initialization then causing persisent data in an unusable state. - -## Custom MySQL configuration files - -The [MySQL](https://hub.docker.com/_/mysql/) image accepts custom configuration files at the path `/etc/mysql/conf.d`. If you want to use a customized MySQL configuration, you can create your alternative configuration files by passing the file contents on the `configurationFiles` attribute. Note that according to the MySQL documentation only files ending with `.cnf` are loaded. - -```yaml -configurationFiles: - mysql.cnf: |- - [mysqld] - skip-host-cache - skip-name-resolve - sql-mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION - mysql_custom.cnf: |- - [mysqld] -``` - -## MySQL initialization files - -The [MySQL](https://hub.docker.com/_/mysql/) image accepts *.sh, *.sql and *.sql.gz files at the path `/docker-entrypoint-initdb.d`. -These files are being run exactly once for container initialization and ignored on following container restarts. -If you want to use initialization scripts, you can create initialization files by passing the file contents on the `initializationFiles` attribute. - - -```yaml -initializationFiles: - first-db.sql: |- - CREATE DATABASE IF NOT EXISTS first DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; - second-db.sql: |- - CREATE DATABASE IF NOT EXISTS second DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; -``` - -## SSL - -This chart supports configuring MySQL to use [encrypted connections](https://dev.mysql.com/doc/refman/5.7/en/encrypted-connections.html) with TLS/SSL certificates provided by the user. This is accomplished by storing the required Certificate Authority file, the server public key certificate, and the server private key as a Kubernetes secret. The SSL options for this chart support the following use cases: - -* Manage certificate secrets with helm -* Manage certificate secrets outside of helm - -## Manage certificate secrets with helm - -Include your certificate data in the `ssl.certificates` section. For example: - -``` -ssl: - enabled: false - secret: mysql-ssl-certs - certificates: - - name: mysql-ssl-certs - ca: |- - -----BEGIN CERTIFICATE----- - ... - -----END CERTIFICATE----- - cert: |- - -----BEGIN CERTIFICATE----- - ... - -----END CERTIFICATE----- - key: |- - -----BEGIN RSA PRIVATE KEY----- - ... - -----END RSA PRIVATE KEY----- -``` - -> **Note**: Make sure your certificate data has the correct formatting in the values file. - -## Manage certificate secrets outside of helm - -1. Ensure the certificate secret exist before installation of this chart. -2. Set the name of the certificate secret in `ssl.secret`. -3. Make sure there are no entries underneath `ssl.certificates`. - -To manually create the certificate secret from local files you can execute: -``` -kubectl create secret generic mysql-ssl-certs \ - --from-file=ca.pem=./ssl/certificate-authority.pem \ - --from-file=server-cert.pem=./ssl/server-public-key.pem \ - --from-file=server-key.pem=./ssl/server-private-key.pem -``` -> **Note**: `ca.pem`, `server-cert.pem`, and `server-key.pem` **must** be used as the key names in this generic secret. - -If you are using a certificate your configurationFiles must include the three ssl lines under [mysqld] - -``` -[mysqld] - ssl-ca=/ssl/ca.pem - ssl-cert=/ssl/server-cert.pem - ssl-key=/ssl/server-key.pem -``` diff --git a/cmd/helm/testdata/testcharts/mysql/templates/NOTES.txt b/cmd/helm/testdata/testcharts/mysql/templates/NOTES.txt deleted file mode 100644 index d33753aa9..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/NOTES.txt +++ /dev/null @@ -1,43 +0,0 @@ -MySQL can be accessed via port 3306 on the following DNS name from within your cluster: -{{ template "mysql.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local - -{{- if .Values.existingSecret }} -If you have not already created the mysql password secret: - - kubectl create secret generic {{ .Values.existingSecret }} --namespace {{ .Release.Namespace }} --from-file=./mysql-root-password --from-file=./mysql-password -{{ else }} - -To get your root password run: - - MYSQL_ROOT_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mysql.fullname" . }} -o jsonpath="{.data.mysql-root-password}" | base64 --decode; echo) -{{- end }} - -To connect to your database: - -1. Run an Ubuntu pod that you can use as a client: - - kubectl run -i --tty ubuntu --image=ubuntu:16.04 --restart=Never -- bash -il - -2. Install the mysql client: - - $ apt-get update && apt-get install mysql-client -y - -3. Connect using the mysql cli, then provide your password: - $ mysql -h {{ template "mysql.fullname" . }} -p - -To connect to your database directly from outside the K8s cluster: - {{- if contains "NodePort" .Values.service.type }} - MYSQL_HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath='{.items[0].status.addresses[0].address}') - MYSQL_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "mysql.fullname" . }} -o jsonpath='{.spec.ports[0].nodePort}') - - {{- else if contains "ClusterIP" .Values.service.type }} - MYSQL_HOST=127.0.0.1 - MYSQL_PORT={{ .Values.service.port }} - - # Execute the following command to route the connection: - kubectl port-forward svc/{{ template "mysql.fullname" . }} {{ .Values.service.port }} - - {{- end }} - - mysql -h ${MYSQL_HOST} -P${MYSQL_PORT} -u root -p${MYSQL_ROOT_PASSWORD} - diff --git a/cmd/helm/testdata/testcharts/mysql/templates/_helpers.tpl b/cmd/helm/testdata/testcharts/mysql/templates/_helpers.tpl deleted file mode 100644 index f10842577..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/_helpers.tpl +++ /dev/null @@ -1,43 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Expand the name of the chart. -*/}} -{{- define "mysql.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} -{{- end -}} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "mysql.fullname" -}} -{{- if .Values.fullnameOverride -}} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- if contains $name .Release.Name -}} -{{- printf .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} -{{- end -}} -{{- end -}} - -{{/* -Generate chart secret name -*/}} -{{- define "mysql.secretName" -}} -{{ default (include "mysql.fullname" .) .Values.existingSecret }} -{{- end -}} - -{{/* -Create the name of the service account to use -*/}} -{{- define "mysql.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} -{{ default (include "mysql.fullname" .) .Values.serviceAccount.name }} -{{- else -}} -{{ default "default" .Values.serviceAccount.name }} -{{- end -}} -{{- end -}} diff --git a/cmd/helm/testdata/testcharts/mysql/templates/configurationFiles-configmap.yaml b/cmd/helm/testdata/testcharts/mysql/templates/configurationFiles-configmap.yaml deleted file mode 100644 index ebed8cc7b..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/configurationFiles-configmap.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.configurationFiles }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "mysql.fullname" . }}-configuration - namespace: {{ .Release.Namespace }} -data: -{{- range $key, $val := .Values.configurationFiles }} - {{ $key }}: |- -{{ $val | indent 4}} -{{- end }} -{{- end -}} \ No newline at end of file diff --git a/cmd/helm/testdata/testcharts/mysql/templates/deployment.yaml b/cmd/helm/testdata/testcharts/mysql/templates/deployment.yaml deleted file mode 100644 index 48dc369a3..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/deployment.yaml +++ /dev/null @@ -1,248 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ template "mysql.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: {{ template "mysql.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -{{- with .Values.deploymentAnnotations }} - annotations: -{{ toYaml . | indent 4 }} -{{- end }} - -spec: - strategy: -{{ toYaml .Values.strategy | indent 4 }} - selector: - matchLabels: - app: {{ template "mysql.fullname" . }} - release: {{ .Release.Name }} - template: - metadata: - labels: - app: {{ template "mysql.fullname" . }} - release: {{ .Release.Name }} -{{- with .Values.podLabels }} -{{ toYaml . | indent 8 }} -{{- end }} -{{- with .Values.podAnnotations }} - annotations: -{{ toYaml . | indent 8 }} -{{- end }} - spec: - {{- if .Values.schedulerName }} - schedulerName: "{{ .Values.schedulerName }}" - {{- end }} - {{- if .Values.imagePullSecrets }} - imagePullSecrets: -{{ toYaml .Values.imagePullSecrets | indent 8 }} - {{- end }} - {{- if .Values.priorityClassName }} - priorityClassName: "{{ .Values.priorityClassName }}" - {{- end }} - {{- if .Values.securityContext.enabled }} - securityContext: - fsGroup: {{ .Values.securityContext.fsGroup }} - runAsUser: {{ .Values.securityContext.runAsUser }} - {{- end }} - serviceAccountName: {{ template "mysql.serviceAccountName" . }} - initContainers: - - name: "remove-lost-found" - image: "{{ .Values.busybox.image}}:{{ .Values.busybox.tag }}" - imagePullPolicy: {{ .Values.imagePullPolicy | quote }} - resources: -{{ toYaml .Values.initContainer.resources | indent 10 }} - command: ["rm", "-fr", "/var/lib/mysql/lost+found"] - volumeMounts: - - name: data - mountPath: /var/lib/mysql - {{- if .Values.persistence.subPath }} - subPath: {{ .Values.persistence.subPath }} - {{- end }} - {{- if .Values.extraInitContainers }} -{{ tpl .Values.extraInitContainers . | indent 6 }} - {{- end }} - {{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 8 }} - {{- end }} - {{- if .Values.tolerations }} - tolerations: -{{ toYaml .Values.tolerations | indent 8 }} - {{- end }} - containers: - - name: {{ template "mysql.fullname" . }} - image: "{{ .Values.image }}:{{ .Values.imageTag }}" - imagePullPolicy: {{ .Values.imagePullPolicy | quote }} - - {{- with .Values.args }} - args: - {{- range . }} - - {{ . | quote }} - {{- end }} - {{- end }} - resources: -{{ toYaml .Values.resources | indent 10 }} - env: - {{- if .Values.mysqlAllowEmptyPassword }} - - name: MYSQL_ALLOW_EMPTY_PASSWORD - value: "true" - {{- end }} - {{- if not (and .Values.allowEmptyRootPassword (not .Values.mysqlRootPassword)) }} - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mysql.secretName" . }} - key: mysql-root-password - {{- if .Values.mysqlAllowEmptyPassword }} - optional: true - {{- end }} - {{- end }} - {{- if not (and .Values.allowEmptyRootPassword (not .Values.mysqPassword)) }} - - name: MYSQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mysql.secretName" . }} - key: mysql-password - {{- if or .Values.mysqlAllowEmptyPassword (empty .Values.mysqlUser) }} - optional: true - {{- end }} - {{- end }} - - name: MYSQL_USER - value: {{ default "" .Values.mysqlUser | quote }} - - name: MYSQL_DATABASE - value: {{ default "" .Values.mysqlDatabase | quote }} - {{- if .Values.timezone }} - - name: TZ - value: {{ .Values.timezone }} - {{- end }} - ports: - - name: mysql - containerPort: 3306 - livenessProbe: - exec: - command: - {{- if .Values.mysqlAllowEmptyPassword }} - - mysqladmin - - ping - {{- else }} - - sh - - -c - - "mysqladmin ping -u root -p${MYSQL_ROOT_PASSWORD}" - {{- end }} - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.livenessProbe.failureThreshold }} - readinessProbe: - exec: - command: - {{- if .Values.mysqlAllowEmptyPassword }} - - mysqladmin - - ping - {{- else }} - - sh - - -c - - "mysqladmin ping -u root -p${MYSQL_ROOT_PASSWORD}" - {{- end }} - initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.readinessProbe.failureThreshold }} - volumeMounts: - - name: data - mountPath: /var/lib/mysql - {{- if .Values.persistence.subPath }} - subPath: {{ .Values.persistence.subPath }} - {{- end }} - {{- if .Values.configurationFiles }} - {{- range $key, $val := .Values.configurationFiles }} - - name: configurations - mountPath: {{ $.Values.configurationFilesPath }}{{ $key }} - subPath: {{ $key }} - {{- end -}} - {{- end }} - {{- if .Values.initializationFiles }} - - name: migrations - mountPath: /docker-entrypoint-initdb.d - {{- end }} - {{- if .Values.ssl.enabled }} - - name: certificates - mountPath: /ssl - {{- end }} - {{- if .Values.extraVolumeMounts }} -{{ tpl .Values.extraVolumeMounts . | indent 8 }} - {{- end }} - {{- if .Values.metrics.enabled }} - - name: metrics - image: "{{ .Values.metrics.image }}:{{ .Values.metrics.imageTag }}" - imagePullPolicy: {{ .Values.metrics.imagePullPolicy | quote }} - {{- if .Values.mysqlAllowEmptyPassword }} - command: - - 'sh' - - '-c' - - 'DATA_SOURCE_NAME="root@(localhost:3306)/" /bin/mysqld_exporter' - {{- else }} - env: - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mysql.secretName" . }} - key: mysql-root-password - command: - - 'sh' - - '-c' - - 'DATA_SOURCE_NAME="root:$MYSQL_ROOT_PASSWORD@(localhost:3306)/" /bin/mysqld_exporter' - {{- end }} - {{- range $f := .Values.metrics.flags }} - - {{ $f | quote }} - {{- end }} - ports: - - name: metrics - containerPort: 9104 - livenessProbe: - httpGet: - path: / - port: metrics - initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }} - timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }} - readinessProbe: - httpGet: - path: / - port: metrics - initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }} - timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }} - resources: -{{ toYaml .Values.metrics.resources | indent 10 }} - {{- end }} - volumes: - {{- if .Values.configurationFiles }} - - name: configurations - configMap: - name: {{ template "mysql.fullname" . }}-configuration - {{- end }} - {{- if .Values.initializationFiles }} - - name: migrations - configMap: - name: {{ template "mysql.fullname" . }}-initialization - {{- end }} - {{- if .Values.ssl.enabled }} - - name: certificates - secret: - secretName: {{ .Values.ssl.secret }} - {{- end }} - - name: data - {{- if .Values.persistence.enabled }} - persistentVolumeClaim: - claimName: {{ .Values.persistence.existingClaim | default (include "mysql.fullname" .) }} - {{- else }} - emptyDir: {} - {{- end -}} - {{- if .Values.extraVolumes }} -{{ tpl .Values.extraVolumes . | indent 6 }} - {{- end }} diff --git a/cmd/helm/testdata/testcharts/mysql/templates/initializationFiles-configmap.yaml b/cmd/helm/testdata/testcharts/mysql/templates/initializationFiles-configmap.yaml deleted file mode 100644 index 38c3795c7..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/initializationFiles-configmap.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.initializationFiles }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "mysql.fullname" . }}-initialization - namespace: {{ .Release.Namespace }} -data: -{{- range $key, $val := .Values.initializationFiles }} - {{ $key }}: |- -{{ $val | indent 4}} -{{- end }} -{{- end -}} \ No newline at end of file diff --git a/cmd/helm/testdata/testcharts/mysql/templates/pvc.yaml b/cmd/helm/testdata/testcharts/mysql/templates/pvc.yaml deleted file mode 100644 index 39e9bf8e2..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/pvc.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }} -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: {{ template "mysql.fullname" . }} - namespace: {{ .Release.Namespace }} -{{- with .Values.persistence.annotations }} - annotations: -{{ toYaml . | indent 4 }} -{{- end }} - labels: - app: {{ template "mysql.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -spec: - accessModes: - - {{ .Values.persistence.accessMode | quote }} - resources: - requests: - storage: {{ .Values.persistence.size | quote }} -{{- if .Values.persistence.storageClass }} -{{- if (eq "-" .Values.persistence.storageClass) }} - storageClassName: "" -{{- else }} - storageClassName: "{{ .Values.persistence.storageClass }}" -{{- end }} -{{- end }} -{{- end }} diff --git a/cmd/helm/testdata/testcharts/mysql/templates/secrets.yaml b/cmd/helm/testdata/testcharts/mysql/templates/secrets.yaml deleted file mode 100644 index d9dfd126d..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/secrets.yaml +++ /dev/null @@ -1,51 +0,0 @@ -{{- if not .Values.existingSecret }} -{{- if or (not .Values.allowEmptyRootPassword) (or .Values.mysqlRootPassword .Values.mysqlPassword) }} -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "mysql.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: {{ template "mysql.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -type: Opaque -data: - {{ if .Values.mysqlRootPassword }} - mysql-root-password: {{ .Values.mysqlRootPassword | b64enc | quote }} - {{ else }} - {{ if not .Values.allowEmptyRootPassword }} - mysql-root-password: {{ randAlphaNum 10 | b64enc | quote }} - {{ end }} - {{ end }} - {{ if .Values.mysqlPassword }} - mysql-password: {{ .Values.mysqlPassword | b64enc | quote }} - {{ else }} - {{ if not .Values.allowEmptyRootPassword }} - mysql-password: {{ randAlphaNum 10 | b64enc | quote }} - {{ end }} - {{ end }} -{{ end }} -{{- if .Values.ssl.enabled }} -{{ if .Values.ssl.certificates }} -{{- range .Values.ssl.certificates }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: {{ .name }} - labels: - app: {{ template "mysql.fullname" $ }} - chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}" - release: "{{ $.Release.Name }}" - heritage: "{{ $.Release.Service }}" -type: Opaque -data: - ca.pem: {{ .ca | b64enc }} - server-cert.pem: {{ .cert | b64enc }} - server-key.pem: {{ .key | b64enc }} -{{- end }} -{{- end }} -{{- end }} -{{- end }} diff --git a/cmd/helm/testdata/testcharts/mysql/templates/serviceaccount.yaml b/cmd/helm/testdata/testcharts/mysql/templates/serviceaccount.yaml deleted file mode 100644 index 36ce6b3b7..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/serviceaccount.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- if .Values.serviceAccount.create }} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ template "mysql.serviceAccountName" . }} - labels: - app: {{ template "mysql.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -{{- end }} diff --git a/cmd/helm/testdata/testcharts/mysql/templates/servicemonitor.yaml b/cmd/helm/testdata/testcharts/mysql/templates/servicemonitor.yaml deleted file mode 100644 index bd830be65..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/servicemonitor.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }} -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - name: {{ include "mysql.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: {{ template "mysql.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - {{- if .Values.metrics.serviceMonitor.additionalLabels }} -{{ toYaml .Values.metrics.serviceMonitor.additionalLabels | indent 4 }} - {{- end }} -spec: - endpoints: - - port: metrics - interval: 30s - namespaceSelector: - matchNames: - - {{ .Release.Namespace }} - selector: - matchLabels: - app: {{ include "mysql.fullname" . }} - release: {{ .Release.Name }} -{{- end }} diff --git a/cmd/helm/testdata/testcharts/mysql/templates/svc.yaml b/cmd/helm/testdata/testcharts/mysql/templates/svc.yaml deleted file mode 100644 index b9687f2a9..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/svc.yaml +++ /dev/null @@ -1,36 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ template "mysql.fullname" . }} - namespace: {{ .Release.Namespace }} - labels: - app: {{ template "mysql.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" - 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: - type: {{ .Values.service.type }} - {{- if (and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP))) }} - loadBalancerIP: {{ .Values.service.loadBalancerIP }} - {{- end }} - ports: - - name: mysql - port: {{ .Values.service.port }} - targetPort: mysql - {{- if .Values.service.nodePort }} - nodePort: {{ .Values.service.nodePort }} - {{- end }} - {{- if .Values.metrics.enabled }} - - name: metrics - port: 9104 - targetPort: metrics - {{- end }} - selector: - app: {{ template "mysql.fullname" . }} diff --git a/cmd/helm/testdata/testcharts/mysql/templates/tests/test-configmap.yaml b/cmd/helm/testdata/testcharts/mysql/templates/tests/test-configmap.yaml deleted file mode 100644 index ece5a4705..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/tests/test-configmap.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if .Values.testFramework.enabled }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ template "mysql.fullname" . }}-test - namespace: {{ .Release.Namespace }} - labels: - app: {{ template "mysql.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - heritage: "{{ .Release.Service }}" - release: "{{ .Release.Name }}" -data: - run.sh: |- - {{- if .Values.ssl.enabled | and .Values.mysqlRootPassword }} - @test "Testing SSL MySQL Connection" { - mysql --host={{ template "mysql.fullname" . }} --port={{ .Values.service.port | default "3306" }} --ssl-cert=/ssl/server-cert.pem --ssl-key=ssl/server-key.pem -u root -p{{ .Values.mysqlRootPassword }} - } - {{- else if .Values.mysqlRootPassword }} - @test "Testing MySQL Connection" { - mysql --host={{ template "mysql.fullname" . }} --port={{ .Values.service.port | default "3306" }} -u root -p{{ .Values.mysqlRootPassword }} - } - {{- end }} -{{- end }} diff --git a/cmd/helm/testdata/testcharts/mysql/templates/tests/test.yaml b/cmd/helm/testdata/testcharts/mysql/templates/tests/test.yaml deleted file mode 100644 index 30392a940..000000000 --- a/cmd/helm/testdata/testcharts/mysql/templates/tests/test.yaml +++ /dev/null @@ -1,54 +0,0 @@ -{{- if .Values.testFramework.enabled }} -apiVersion: v1 -kind: Pod -metadata: - name: {{ template "mysql.fullname" . }}-test - namespace: {{ .Release.Namespace }} - labels: - app: {{ template "mysql.fullname" . }} - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - heritage: "{{ .Release.Service }}" - release: "{{ .Release.Name }}" - 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 - containers: - - name: {{ .Release.Name }}-test - image: "{{ .Values.image }}:{{ .Values.imageTag }}" - command: ["/tools/bats/bats", "-t", "/tests/run.sh"] - volumeMounts: - - mountPath: /tests - name: tests - readOnly: true - - mountPath: /tools - name: tools - {{- if .Values.ssl.enabled }} - - name: certificates - mountPath: /ssl - {{- end }} - volumes: - - name: tests - configMap: - name: {{ template "mysql.fullname" . }}-test - - name: tools - emptyDir: {} - {{- if .Values.ssl.enabled }} - - name: certificates - secret: - secretName: {{ .Values.ssl.secret }} - {{- end }} - restartPolicy: Never -{{- end }} diff --git a/cmd/helm/testdata/testcharts/mysql/values.yaml b/cmd/helm/testdata/testcharts/mysql/values.yaml deleted file mode 100644 index 7fe76a2d1..000000000 --- a/cmd/helm/testdata/testcharts/mysql/values.yaml +++ /dev/null @@ -1,227 +0,0 @@ -## mysql image version -## ref: https://hub.docker.com/r/library/mysql/tags/ -## -image: "mysql" -imageTag: "5.7.28" - -strategy: - type: Recreate - -busybox: - image: "busybox" - tag: "1.29.3" - -testFramework: - enabled: true - image: "dduportal/bats" - tag: "0.4.0" - -## Specify password for root user -## -## Default: random 10 character string -# mysqlRootPassword: testing - -## Create a database user -## -# mysqlUser: -## Default: random 10 character string -# mysqlPassword: - -## Allow unauthenticated access, uncomment to enable -## -# mysqlAllowEmptyPassword: true - -## Create a database -## -# mysqlDatabase: - -## Specify an imagePullPolicy (Required) -## It's recommended to change this to 'Always' if the image tag is 'latest' -## ref: http://kubernetes.io/docs/user-guide/images/#updating-images -## -imagePullPolicy: IfNotPresent - -## Additionnal arguments that are passed to the MySQL container. -## For example use --default-authentication-plugin=mysql_native_password if older clients need to -## connect to a MySQL 8 instance. -args: [] - -extraVolumes: | - # - name: extras - # emptyDir: {} - -extraVolumeMounts: | - # - name: extras - # mountPath: /usr/share/extras - # readOnly: true - -extraInitContainers: | - # - name: do-something - # image: busybox - # command: ['do', 'something'] - -# Optionally specify an array of imagePullSecrets. -# Secrets must be manually created in the namespace. -# ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod -# imagePullSecrets: - # - name: myRegistryKeySecretName - -## Node selector -## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector -nodeSelector: {} - -## Tolerations for pod assignment -## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ -## -tolerations: [] - -livenessProbe: - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 3 - -readinessProbe: - initialDelaySeconds: 5 - periodSeconds: 10 - timeoutSeconds: 1 - successThreshold: 1 - failureThreshold: 3 - -## Persist data to a persistent volume -persistence: - enabled: true - ## database data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" - accessMode: ReadWriteOnce - size: 8Gi - annotations: {} - -## Use an alternate scheduler, e.g. "stork". -## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ -## -# schedulerName: - -## Security context -securityContext: - enabled: false - runAsUser: 999 - fsGroup: 999 - -## Configure resource requests and limits -## ref: http://kubernetes.io/docs/user-guide/compute-resources/ -## -resources: - requests: - memory: 256Mi - cpu: 100m - -# Custom mysql configuration files path -configurationFilesPath: /etc/mysql/conf.d/ - -# Custom mysql configuration files used to override default mysql settings -configurationFiles: {} -# mysql.cnf: |- -# [mysqld] -# skip-name-resolve -# ssl-ca=/ssl/ca.pem -# ssl-cert=/ssl/server-cert.pem -# ssl-key=/ssl/server-key.pem - -# Custom mysql init SQL files used to initialize the database -initializationFiles: {} -# first-db.sql: |- -# CREATE DATABASE IF NOT EXISTS first DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; -# second-db.sql: |- -# CREATE DATABASE IF NOT EXISTS second DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; - -metrics: - enabled: false - image: prom/mysqld-exporter - imageTag: v0.10.0 - imagePullPolicy: IfNotPresent - resources: {} - annotations: {} - # prometheus.io/scrape: "true" - # prometheus.io/port: "9104" - livenessProbe: - initialDelaySeconds: 15 - timeoutSeconds: 5 - readinessProbe: - initialDelaySeconds: 5 - timeoutSeconds: 1 - flags: [] - serviceMonitor: - enabled: false - additionalLabels: {} - -## 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 - port: 3306 - # nodePort: 32000 - # loadBalancerIP: - -## Pods Service Account -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ -serviceAccount: - ## Specifies whether a ServiceAccount should be created - ## - create: false - ## The name of the ServiceAccount to use. - ## If not set and create is true, a name is generated using the mariadb.fullname template - # name: - -ssl: - enabled: false - secret: mysql-ssl-certs - certificates: -# - name: mysql-ssl-certs -# ca: |- -# -----BEGIN CERTIFICATE----- -# ... -# -----END CERTIFICATE----- -# cert: |- -# -----BEGIN CERTIFICATE----- -# ... -# -----END CERTIFICATE----- -# key: |- -# -----BEGIN RSA PRIVATE KEY----- -# ... -# -----END RSA PRIVATE KEY----- - -## Populates the 'TZ' system timezone environment variable -## ref: https://dev.mysql.com/doc/refman/5.7/en/time-zone-support.html -## -## Default: nil (mysql will use image's default timezone, normally UTC) -## Example: 'Australia/Sydney' -# timezone: - -# Deployment Annotations -deploymentAnnotations: {} - -# To be added to the database server pod(s) -podAnnotations: {} -podLabels: {} - -## Set pod priorityClassName -# priorityClassName: {} - - -## Init container resources defaults -initContainer: - resources: - requests: - memory: 10Mi - cpu: 10m diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index 083c44a21..b8b67790c 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -93,10 +93,10 @@ func (m *Manager) Build() error { if c.Metadata.APIVersion == chart.APIVersionV1 { log.Println("warning: a valid Helm v3 hash was not found. Checking against Helm v2 hash...") if sum, err := resolver.HashV2Req(req); err != nil || sum != lock.Digest { - return errors.New("Chart.lock is out of sync with Chart.yaml") + return errors.New("the lock file is out of sync with the dependencies file. Please update the dependencies") } } else { - return errors.New("Chart.lock is out of sync with Chart.yaml") + return errors.New("the lock file is out of sync with the dependencies file. Please update the dependencies") } }