From ad995d80cc29361d97d28681486146fbfc8d9bfe Mon Sep 17 00:00:00 2001 From: Aurel Canciu Date: Tue, 27 Oct 2020 22:09:09 +0200 Subject: [PATCH] Reorganize helm chart testdata for controllers Signed-off-by: Aurel Canciu --- .github/workflows/e2e.yaml | 2 +- controllers/helmchart_controller_test.go | 20 +++--- controllers/helmrepository_controller_test.go | 8 +-- .../{ => charts}/helmchart/.helmignore | 0 .../{ => charts}/helmchart/Chart.yaml | 0 .../helmchart/templates/NOTES.txt | 0 .../helmchart/templates/_helpers.tpl | 0 .../helmchart/templates/deployment.yaml | 0 .../helmchart/templates/ingress.yaml | 0 .../helmchart/templates/service.yaml | 0 .../helmchart/templates/serviceaccount.yaml | 0 .../templates/tests/test-connection.yaml | 0 .../{ => charts}/helmchart/values.yaml | 0 .../charts/helmchartwithdeps/.helmignore | 22 +++++++ .../charts/helmchartwithdeps/Chart.yaml | 29 ++++++++ .../helmchartwithdeps/templates/NOTES.txt | 21 ++++++ .../helmchartwithdeps/templates/_helpers.tpl | 63 ++++++++++++++++++ .../templates/deployment.yaml | 55 ++++++++++++++++ .../helmchartwithdeps/templates/ingress.yaml | 41 ++++++++++++ .../helmchartwithdeps/templates/service.yaml | 15 +++++ .../templates/serviceaccount.yaml | 8 +++ .../templates/tests/test-connection.yaml | 15 +++++ .../charts/helmchartwithdeps/values.yaml | 66 +++++++++++++++++++ 23 files changed, 350 insertions(+), 15 deletions(-) rename controllers/testdata/{ => charts}/helmchart/.helmignore (100%) rename controllers/testdata/{ => charts}/helmchart/Chart.yaml (100%) rename controllers/testdata/{ => charts}/helmchart/templates/NOTES.txt (100%) rename controllers/testdata/{ => charts}/helmchart/templates/_helpers.tpl (100%) rename controllers/testdata/{ => charts}/helmchart/templates/deployment.yaml (100%) rename controllers/testdata/{ => charts}/helmchart/templates/ingress.yaml (100%) rename controllers/testdata/{ => charts}/helmchart/templates/service.yaml (100%) rename controllers/testdata/{ => charts}/helmchart/templates/serviceaccount.yaml (100%) rename controllers/testdata/{ => charts}/helmchart/templates/tests/test-connection.yaml (100%) rename controllers/testdata/{ => charts}/helmchart/values.yaml (100%) create mode 100644 controllers/testdata/charts/helmchartwithdeps/.helmignore create mode 100644 controllers/testdata/charts/helmchartwithdeps/Chart.yaml create mode 100644 controllers/testdata/charts/helmchartwithdeps/templates/NOTES.txt create mode 100644 controllers/testdata/charts/helmchartwithdeps/templates/_helpers.tpl create mode 100644 controllers/testdata/charts/helmchartwithdeps/templates/deployment.yaml create mode 100644 controllers/testdata/charts/helmchartwithdeps/templates/ingress.yaml create mode 100644 controllers/testdata/charts/helmchartwithdeps/templates/service.yaml create mode 100644 controllers/testdata/charts/helmchartwithdeps/templates/serviceaccount.yaml create mode 100644 controllers/testdata/charts/helmchartwithdeps/templates/tests/test-connection.yaml create mode 100644 controllers/testdata/charts/helmchartwithdeps/values.yaml diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index c673de3a..55328dd1 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -95,7 +95,7 @@ jobs: - name: Run HelmChart from Bucket tests run: | ./mc mb minio/charts - ./mc mirror ./controllers/testdata/helmchart/ minio/charts/helmchart + ./mc mirror ./controllers/testdata/charts/helmchart/ minio/charts/helmchart kubectl -n source-system apply -f ./config/testdata/helmchart-from-bucket/source.yaml kubectl -n source-system wait bucket/charts --for=condition=ready --timeout=1m diff --git a/controllers/helmchart_controller_test.go b/controllers/helmchart_controller_test.go index 0509b8fe..24824ccf 100644 --- a/controllers/helmchart_controller_test.go +++ b/controllers/helmchart_controller_test.go @@ -86,7 +86,7 @@ var _ = Describe("HelmChartReconciler", func() { }) It("Creates artifacts for", func() { - Expect(helmServer.PackageChart(path.Join("testdata/helmchart"))).Should(Succeed()) + Expect(helmServer.PackageChart(path.Join("testdata/charts/helmchart"))).Should(Succeed()) Expect(helmServer.GenerateIndex()).Should(Succeed()) repositoryKey := types.NamespacedName{ @@ -133,7 +133,7 @@ var _ = Describe("HelmChartReconciler", func() { }, timeout, interval).Should(BeTrue()) By("Packaging a new chart version and regenerating the index") - Expect(helmServer.PackageChartWithVersion(path.Join("testdata/helmchart"), "0.2.0")).Should(Succeed()) + Expect(helmServer.PackageChartWithVersion(path.Join("testdata/charts/helmchart"), "0.2.0")).Should(Succeed()) Expect(helmServer.GenerateIndex()).Should(Succeed()) By("Expecting new artifact revision and GC") @@ -189,7 +189,7 @@ var _ = Describe("HelmChartReconciler", func() { It("Filters versions", func() { versions := []string{"0.1.0", "0.1.1", "0.2.0", "0.3.0-rc.1", "1.0.0-alpha.1", "1.0.0"} for k := range versions { - Expect(helmServer.PackageChartWithVersion(path.Join("testdata/helmchart"), versions[k])).Should(Succeed()) + Expect(helmServer.PackageChartWithVersion(path.Join("testdata/charts/helmchart"), versions[k])).Should(Succeed()) } Expect(helmServer.GenerateIndex()).Should(Succeed()) @@ -281,7 +281,7 @@ var _ = Describe("HelmChartReconciler", func() { }) helmServer.Start() - Expect(helmServer.PackageChartWithVersion(path.Join("testdata/helmchart"), "0.1.0")).Should(Succeed()) + Expect(helmServer.PackageChartWithVersion(path.Join("testdata/charts/helmchart"), "0.1.0")).Should(Succeed()) Expect(helmServer.GenerateIndex()).Should(Succeed()) secretKey := types.NamespacedName{ @@ -458,7 +458,7 @@ var _ = Describe("HelmChartReconciler", func() { }) Expect(err).NotTo(HaveOccurred()) - chartDir := "testdata/helmchart" + chartDir := "testdata/charts" Expect(filepath.Walk(chartDir, func(p string, fi os.FileInfo, err error) error { if err != nil { return err @@ -489,7 +489,7 @@ var _ = Describe("HelmChartReconciler", func() { return err })).To(Succeed()) - _, err = wt.Commit("Helm chart", &git.CommitOptions{Author: &object.Signature{ + _, err = wt.Commit("Helm charts", &git.CommitOptions{Author: &object.Signature{ Name: "John Doe", Email: "john@example.com", When: time.Now(), @@ -526,7 +526,7 @@ var _ = Describe("HelmChartReconciler", func() { Namespace: key.Namespace, }, Spec: sourcev1.HelmChartSpec{ - Chart: "testdata/helmchart", + Chart: "testdata/charts/helmchartwithdeps", Version: "*", SourceRef: sourcev1.LocalHelmChartSourceReference{ Kind: sourcev1.GitRepositoryKind, @@ -547,10 +547,10 @@ var _ = Describe("HelmChartReconciler", func() { }, timeout, interval).Should(BeTrue()) By("Committing a new version in the chart metadata") - f, err := fs.OpenFile(fs.Join(chartDir, chartutil.ChartfileName), os.O_RDWR, os.FileMode(0600)) + f, err := fs.OpenFile(fs.Join(chartDir, "helmchartwithdeps", chartutil.ChartfileName), os.O_RDWR, os.FileMode(0600)) Expect(err).NotTo(HaveOccurred()) - b := make([]byte, 1024) + b := make([]byte, 2048) n, err := f.Read(b) Expect(err).NotTo(HaveOccurred()) b = b[0:n] @@ -610,7 +610,7 @@ var _ = Describe("HelmChartReconciler", func() { }) Expect(err).NotTo(HaveOccurred()) - chartDir := "testdata/helmchart" + chartDir := "testdata/charts/helmchart" helmChart, err := loader.LoadDir(chartDir) Expect(err).NotTo(HaveOccurred()) diff --git a/controllers/helmrepository_controller_test.go b/controllers/helmrepository_controller_test.go index 34899125..8979610a 100644 --- a/controllers/helmrepository_controller_test.go +++ b/controllers/helmrepository_controller_test.go @@ -74,7 +74,7 @@ var _ = Describe("HelmRepositoryReconciler", func() { It("Creates artifacts for", func() { helmServer.Start() - Expect(helmServer.PackageChart(path.Join("testdata/helmchart"))).Should(Succeed()) + Expect(helmServer.PackageChart(path.Join("testdata/charts/helmchart"))).Should(Succeed()) Expect(helmServer.GenerateIndex()).Should(Succeed()) key := types.NamespacedName{ @@ -156,7 +156,7 @@ var _ = Describe("HelmRepositoryReconciler", func() { It("Handles timeout", func() { helmServer.Start() - Expect(helmServer.PackageChart(path.Join("testdata/helmchart"))).Should(Succeed()) + Expect(helmServer.PackageChart(path.Join("testdata/charts/helmchart"))).Should(Succeed()) Expect(helmServer.GenerateIndex()).Should(Succeed()) key := types.NamespacedName{ @@ -224,7 +224,7 @@ var _ = Describe("HelmRepositoryReconciler", func() { defer helmServer.Stop() helmServer.Start() - Expect(helmServer.PackageChart(path.Join("testdata/helmchart"))).Should(Succeed()) + Expect(helmServer.PackageChart(path.Join("testdata/charts/helmchart"))).Should(Succeed()) Expect(helmServer.GenerateIndex()).Should(Succeed()) secretKey := types.NamespacedName{ @@ -316,7 +316,7 @@ var _ = Describe("HelmRepositoryReconciler", func() { err = helmServer.StartTLS(examplePublicKey, examplePrivateKey, exampleCA, "example.com") Expect(err).NotTo(HaveOccurred()) - Expect(helmServer.PackageChart(path.Join("testdata/helmchart"))).Should(Succeed()) + Expect(helmServer.PackageChart(path.Join("testdata/charts/helmchart"))).Should(Succeed()) Expect(helmServer.GenerateIndex()).Should(Succeed()) secretKey := types.NamespacedName{ diff --git a/controllers/testdata/helmchart/.helmignore b/controllers/testdata/charts/helmchart/.helmignore similarity index 100% rename from controllers/testdata/helmchart/.helmignore rename to controllers/testdata/charts/helmchart/.helmignore diff --git a/controllers/testdata/helmchart/Chart.yaml b/controllers/testdata/charts/helmchart/Chart.yaml similarity index 100% rename from controllers/testdata/helmchart/Chart.yaml rename to controllers/testdata/charts/helmchart/Chart.yaml diff --git a/controllers/testdata/helmchart/templates/NOTES.txt b/controllers/testdata/charts/helmchart/templates/NOTES.txt similarity index 100% rename from controllers/testdata/helmchart/templates/NOTES.txt rename to controllers/testdata/charts/helmchart/templates/NOTES.txt diff --git a/controllers/testdata/helmchart/templates/_helpers.tpl b/controllers/testdata/charts/helmchart/templates/_helpers.tpl similarity index 100% rename from controllers/testdata/helmchart/templates/_helpers.tpl rename to controllers/testdata/charts/helmchart/templates/_helpers.tpl diff --git a/controllers/testdata/helmchart/templates/deployment.yaml b/controllers/testdata/charts/helmchart/templates/deployment.yaml similarity index 100% rename from controllers/testdata/helmchart/templates/deployment.yaml rename to controllers/testdata/charts/helmchart/templates/deployment.yaml diff --git a/controllers/testdata/helmchart/templates/ingress.yaml b/controllers/testdata/charts/helmchart/templates/ingress.yaml similarity index 100% rename from controllers/testdata/helmchart/templates/ingress.yaml rename to controllers/testdata/charts/helmchart/templates/ingress.yaml diff --git a/controllers/testdata/helmchart/templates/service.yaml b/controllers/testdata/charts/helmchart/templates/service.yaml similarity index 100% rename from controllers/testdata/helmchart/templates/service.yaml rename to controllers/testdata/charts/helmchart/templates/service.yaml diff --git a/controllers/testdata/helmchart/templates/serviceaccount.yaml b/controllers/testdata/charts/helmchart/templates/serviceaccount.yaml similarity index 100% rename from controllers/testdata/helmchart/templates/serviceaccount.yaml rename to controllers/testdata/charts/helmchart/templates/serviceaccount.yaml diff --git a/controllers/testdata/helmchart/templates/tests/test-connection.yaml b/controllers/testdata/charts/helmchart/templates/tests/test-connection.yaml similarity index 100% rename from controllers/testdata/helmchart/templates/tests/test-connection.yaml rename to controllers/testdata/charts/helmchart/templates/tests/test-connection.yaml diff --git a/controllers/testdata/helmchart/values.yaml b/controllers/testdata/charts/helmchart/values.yaml similarity index 100% rename from controllers/testdata/helmchart/values.yaml rename to controllers/testdata/charts/helmchart/values.yaml diff --git a/controllers/testdata/charts/helmchartwithdeps/.helmignore b/controllers/testdata/charts/helmchartwithdeps/.helmignore new file mode 100644 index 00000000..50af0317 --- /dev/null +++ b/controllers/testdata/charts/helmchartwithdeps/.helmignore @@ -0,0 +1,22 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/controllers/testdata/charts/helmchartwithdeps/Chart.yaml b/controllers/testdata/charts/helmchartwithdeps/Chart.yaml new file mode 100644 index 00000000..68bfe8b0 --- /dev/null +++ b/controllers/testdata/charts/helmchartwithdeps/Chart.yaml @@ -0,0 +1,29 @@ +apiVersion: v2 +name: helmchartwithdeps +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. +appVersion: 1.16.0 + +dependencies: + - name: helmchart + version: "0.1.0" + repository: "file://../helmchart" + - name: grafana + version: ">=5.7.0" + repository: "https://grafana.github.io/helm-charts" diff --git a/controllers/testdata/charts/helmchartwithdeps/templates/NOTES.txt b/controllers/testdata/charts/helmchartwithdeps/templates/NOTES.txt new file mode 100644 index 00000000..105423d2 --- /dev/null +++ b/controllers/testdata/charts/helmchartwithdeps/templates/NOTES.txt @@ -0,0 +1,21 @@ +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 "helmchartwithdeps.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 "helmchartwithdeps.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "helmchartwithdeps.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 "helmchartwithdeps.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 --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80 +{{- end }} diff --git a/controllers/testdata/charts/helmchartwithdeps/templates/_helpers.tpl b/controllers/testdata/charts/helmchartwithdeps/templates/_helpers.tpl new file mode 100644 index 00000000..a718f8b3 --- /dev/null +++ b/controllers/testdata/charts/helmchartwithdeps/templates/_helpers.tpl @@ -0,0 +1,63 @@ +{{/* vim: set filetype=mustache: */}} +{{/* +Expand the name of the chart. +*/}} +{{- define "helmchartwithdeps.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 "helmchartwithdeps.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 "helmchartwithdeps.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Common labels +*/}} +{{- define "helmchartwithdeps.labels" -}} +helm.sh/chart: {{ include "helmchartwithdeps.chart" . }} +{{ include "helmchartwithdeps.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end -}} + +{{/* +Selector labels +*/}} +{{- define "helmchartwithdeps.selectorLabels" -}} +app.kubernetes.io/name: {{ include "helmchartwithdeps.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end -}} + +{{/* +Create the name of the service account to use +*/}} +{{- define "helmchartwithdeps.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (include "helmchartwithdeps.fullname" .) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} diff --git a/controllers/testdata/charts/helmchartwithdeps/templates/deployment.yaml b/controllers/testdata/charts/helmchartwithdeps/templates/deployment.yaml new file mode 100644 index 00000000..08f62c74 --- /dev/null +++ b/controllers/testdata/charts/helmchartwithdeps/templates/deployment.yaml @@ -0,0 +1,55 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "helmchartwithdeps.fullname" . }} + labels: + {{- include "helmchartwithdeps.labels" . | nindent 4 }} +spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + {{- include "helmchartwithdeps.selectorLabels" . | nindent 6 }} + template: + metadata: + labels: + {{- include "helmchartwithdeps.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "helmchartwithdeps.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}" + 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/controllers/testdata/charts/helmchartwithdeps/templates/ingress.yaml b/controllers/testdata/charts/helmchartwithdeps/templates/ingress.yaml new file mode 100644 index 00000000..6c1b0314 --- /dev/null +++ b/controllers/testdata/charts/helmchartwithdeps/templates/ingress.yaml @@ -0,0 +1,41 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "helmchartwithdeps.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 "helmchartwithdeps.labels" . | nindent 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/controllers/testdata/charts/helmchartwithdeps/templates/service.yaml b/controllers/testdata/charts/helmchartwithdeps/templates/service.yaml new file mode 100644 index 00000000..2c270c67 --- /dev/null +++ b/controllers/testdata/charts/helmchartwithdeps/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "helmchartwithdeps.fullname" . }} + labels: + {{- include "helmchartwithdeps.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "helmchartwithdeps.selectorLabels" . | nindent 4 }} diff --git a/controllers/testdata/charts/helmchartwithdeps/templates/serviceaccount.yaml b/controllers/testdata/charts/helmchartwithdeps/templates/serviceaccount.yaml new file mode 100644 index 00000000..2eec29c5 --- /dev/null +++ b/controllers/testdata/charts/helmchartwithdeps/templates/serviceaccount.yaml @@ -0,0 +1,8 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "helmchartwithdeps.serviceAccountName" . }} + labels: +{{ include "helmchartwithdeps.labels" . | nindent 4 }} +{{- end -}} diff --git a/controllers/testdata/charts/helmchartwithdeps/templates/tests/test-connection.yaml b/controllers/testdata/charts/helmchartwithdeps/templates/tests/test-connection.yaml new file mode 100644 index 00000000..bbcd0920 --- /dev/null +++ b/controllers/testdata/charts/helmchartwithdeps/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "helmchartwithdeps.fullname" . }}-test-connection" + labels: +{{ include "helmchartwithdeps.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test-success +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "helmchartwithdeps.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/controllers/testdata/charts/helmchartwithdeps/values.yaml b/controllers/testdata/charts/helmchartwithdeps/values.yaml new file mode 100644 index 00000000..8213f28c --- /dev/null +++ b/controllers/testdata/charts/helmchartwithdeps/values.yaml @@ -0,0 +1,66 @@ +# Default values for helmchartwithdeps. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: nginx + 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: {}