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 576f1d7 Helm chart providers (#372)
576f1d7 is described below
commit 576f1d71621cb2db10f00f9f817d1ccd78a920f8
Author: Neeraj Laad <neeraj.l...@gmail.com>
AuthorDate: Wed Nov 28 15:04:06 2018 +0000
Helm chart providers (#372)
Fixed some linting issue with helm chart and values.yaml
---
helm/openwhisk/Chart.yaml | 2 +-
helm/openwhisk/templates/_helpers.tpl | 2 +-
helm/openwhisk/templates/install-packages-job.yaml | 2 ++
helm/openwhisk/templates/invoker-agent-pod.yaml | 2 +-
helm/openwhisk/values.yaml | 22 +++++++++++++++++-----
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/helm/openwhisk/Chart.yaml b/helm/openwhisk/Chart.yaml
index 68c4a8a..f178a73 100644
--- a/helm/openwhisk/Chart.yaml
+++ b/helm/openwhisk/Chart.yaml
@@ -13,4 +13,4 @@ maintainers:
- name: Apache OpenWhisk committers
email: d...@openwhisk.apache.org
tillerVersion: ">=2.9.0"
-kubeVersion: "1.10 - 1.11.*"
+kubeVersion: ">=1.10.0"
diff --git a/helm/openwhisk/templates/_helpers.tpl
b/helm/openwhisk/templates/_helpers.tpl
index 6e2bfb9..6437287 100644
--- a/helm/openwhisk/templates/_helpers.tpl
+++ b/helm/openwhisk/templates/_helpers.tpl
@@ -131,5 +131,5 @@ app: {{ template "openwhisk.fullname" . }}
{{/* tlssecretname for ingress */}}
{{- define "openwhisk.tls_secret_name" -}}
-{{ .Values.whisk.ingress.tlssecretname | default "ow-ingress-tls-secret" |
quote }}
+{{ .Values.whisk.ingress.tls.secretname | default "ow-ingress-tls-secret" |
quote }}
{{- end -}}
diff --git a/helm/openwhisk/templates/install-packages-job.yaml
b/helm/openwhisk/templates/install-packages-job.yaml
index dac0960..c3ee617 100644
--- a/helm/openwhisk/templates/install-packages-job.yaml
+++ b/helm/openwhisk/templates/install-packages-job.yaml
@@ -6,6 +6,7 @@ kind: Job
metadata:
name: install-packages
labels:
+ name: install-packages
{{ include "openwhisk.label_boilerplate" . | indent 4 }}
spec:
activeDeadlineSeconds: 900
@@ -13,6 +14,7 @@ spec:
metadata:
name: install-packages
labels:
+ name: install-packages
{{ include "openwhisk.label_boilerplate" . | indent 8 }}
spec:
restartPolicy: Never
diff --git a/helm/openwhisk/templates/invoker-agent-pod.yaml
b/helm/openwhisk/templates/invoker-agent-pod.yaml
index 613ec0e..8643e4a 100644
--- a/helm/openwhisk/templates/invoker-agent-pod.yaml
+++ b/helm/openwhisk/templates/invoker-agent-pod.yaml
@@ -40,7 +40,7 @@ spec:
containers:
- name: {{ .Values.invoker.containerFactory.kubernetes.agent.name |
quote }}
image: "{{-
.Values.invoker.containerFactory.kubernetes.agent.imageName -}}:{{-
.Values.invoker.containerFactory.kubernetes.agent.imageTag -}}"
- imagePullPolicy: {{ .Values.invoker.imagePullPolicy | quote }}
+ imagePullPolicy: {{
.Values.invoker.containerFactory.kubernetes.agent.imagePullPolicy | quote }}
securityContext:
privileged: true
ports:
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index d19c8f8..3d1524e 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -28,6 +28,18 @@ whisk:
apiHostPort: 31001
apiHostProto: "https"
type: NodePort
+ annotations:
+ key: value
+ domain: "domain"
+ tls:
+ enabled: false
+ secretenabled: false
+ createsecret: false
+ secretname: "ow-ingress-tls-secret"
+ secrettype: "type"
+ crt: "crt"
+ key: "key"
+
# Production deployments _MUST_ override these default auth values
auth:
@@ -243,11 +255,11 @@ providers:
db:
external: false
# Define the rest of these values if you are using external couchdb
instance
- # host: "10.10.10.10"
- # port: 5984
- # protocol: "http"
- # username: "admin"
- # password: "secret"
+ host: "10.10.10.10"
+ port: 5984
+ protocol: "http"
+ username: "admin"
+ password: "secret"
# Alarm provider configurations
alarm:
enabled: false
