update from base

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   test:
     docker:
-      - image: circleci/golang:1.10
+      - image: circleci/golang:1.12
     working_directory: /go/src/github.com/lrills/helm-unittest
     steps:
       - checkout

CHANGELOG.md

@@ -1,3 +1,7 @@
+0.1.5 / 2019-04-09
+==================
+- update sprig (#72, #73)
+
 0.1.4 / 2019-03-30
 ==================
 - fix slash problem in windows (#70)

__fixtures__/basic/values.yaml

@@ -12,6 +12,7 @@ service:
   externalPort: 80
   internalPort: 80
 ingress:
+  class: foo
   enabled: false
   # Used to create an Ingress record.
   hosts:

__fixtures__/with-subchart/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 description: An example chart with customized subchart
-name: with-subchart
+name: parent-chart
 version: 0.1.0

__fixtures__/with-subchart/charts/childchart/Chart.yaml → __fixtures__/with-subchart/charts/child-chart/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 description: An customized subchart
-name: childchart
+name: child-chart
 version: 0.1.0

__fixtures__/with-subchart/charts/childchart/templates/NOTES.txt → __fixtures__/with-subchart/charts/child-chart/templates/NOTES.txt

@@ -4,16 +4,16 @@
   http://{{ . }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "basic.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "child-chart.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 svc -w {{ template "basic.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "basic.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ template "child-chart.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "child-chart.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "basic.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "child-chart.name" . }},release={{ .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:{{ .Values.service.internalPort }}
 {{- end }}

__fixtures__/with-subchart/charts/childchart/templates/_helpers.tpl → __fixtures__/with-subchart/charts/child-chart/templates/_helpers.tpl

@@ -2,15 +2,25 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "basic.name" -}}
+{{- define "child-chart.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).
 */}}
-{{- define "basic.fullname" -}}
+{{- define "child-chart.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "child-chart.ingressClass" -}}
+  {{- $ingressClass := .Values.ingress.class -}}
+  {{- if .Values.global -}}
+    {{- if .Values.global.ingressClass -}}
+      {{- $ingressClass = .Values.global.ingressClass -}}
+    {{- end -}}
+  {{- end -}}
+  {{- printf "%s" $ingressClass -}}
+{{- end -}}