[incubator-openwhisk-deploy-kube] branch master updated: Helm lint fixes (#369)

[dgrove]

This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 96745e1  Helm lint fixes (#369)
96745e1 is described below

commit 96745e106bf544a9c8396d2820cf665527d5448a
Author: Neeraj Laad <neeraj.l...@gmail.com>
AuthorDate: Mon Nov 26 22:13:55 2018 +0000

    Helm lint fixes (#369)
    
    * helm lint issue resolution
---
 helm/openwhisk/templates/_helpers.tpl                   | 2 +-
 helm/openwhisk/templates/couchdb-init-job.yaml          | 2 +-
 helm/openwhisk/templates/tests/package-checker-pod.yaml | 2 +-
 helm/openwhisk/templates/tests/smoketest-pod.yaml       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/helm/openwhisk/templates/_helpers.tpl 
b/helm/openwhisk/templates/_helpers.tpl
index 4f2a0ca..6e2bfb9 100644
--- a/helm/openwhisk/templates/_helpers.tpl
+++ b/helm/openwhisk/templates/_helpers.tpl
@@ -6,7 +6,7 @@ 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 "openwhisk.fullname" -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $name := default .Chart.Name -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
diff --git a/helm/openwhisk/templates/couchdb-init-job.yaml 
b/helm/openwhisk/templates/couchdb-init-job.yaml
index d30a46a..b4b3267 100644
--- a/helm/openwhisk/templates/couchdb-init-job.yaml
+++ b/helm/openwhisk/templates/couchdb-init-job.yaml
@@ -29,7 +29,7 @@ spec:
       containers:
       - name: init-couchdb
         image: "{{- .Values.utility.ansibleRunner.imageName -}}:{{- 
.Values.utility.ansibleRunner.imageTag -}}"
-        imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }}
+        imagePullPolicy: {{ .Values.utility.ansibleRunner.imagePullPolicy | 
quote }}
         command: ["/bin/bash", "-c", "set -e; . /task/initdb.sh"]
         volumeMounts:
         - name: task-dir
diff --git a/helm/openwhisk/templates/tests/package-checker-pod.yaml 
b/helm/openwhisk/templates/tests/package-checker-pod.yaml
index c4bbded..4417b5d 100644
--- a/helm/openwhisk/templates/tests/package-checker-pod.yaml
+++ b/helm/openwhisk/templates/tests/package-checker-pod.yaml
@@ -20,7 +20,7 @@ spec:
   containers:
   - name: package-checker
     image: "{{- .Values.utility.scriptRunner.imageName -}}:{{- 
.Values.utility.scriptRunner.imageTag -}}"
-    imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }}
+    imagePullPolicy: {{ .Values.utility.scriptRunner.imagePullPolicy | quote }}
     volumeMounts:
     - name: task-dir
       mountPath: "/task/myTask.sh"
diff --git a/helm/openwhisk/templates/tests/smoketest-pod.yaml 
b/helm/openwhisk/templates/tests/smoketest-pod.yaml
index d772a49..89b78cc 100644
--- a/helm/openwhisk/templates/tests/smoketest-pod.yaml
+++ b/helm/openwhisk/templates/tests/smoketest-pod.yaml
@@ -20,7 +20,7 @@ spec:
   containers:
   - name: smoketest
     image: "{{- .Values.utility.scriptRunner.imageName -}}:{{- 
.Values.utility.scriptRunner.imageTag -}}"
-    imagePullPolicy: {{ .Values.utility.imagePullPolicy | quote }}
+    imagePullPolicy: {{ .Values.utility.scriptRunner.imagePullPolicy | quote }}
     volumeMounts:
     - name: task-dir
       mountPath: "/task/myTask.sh"