[GitHub] dgrove-oss closed pull request #372: Helm chart providers

[GitBox <gi...@apache.org>]

dgrove-oss closed pull request #372: Helm chart providers
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/372
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/helm/openwhisk/Chart.yaml b/helm/openwhisk/Chart.yaml
index 9069bac..73cbf7c 100644
--- a/helm/openwhisk/Chart.yaml
+++ b/helm/openwhisk/Chart.yaml
@@ -13,4 +13,4 @@ maintainers:
   - name: Apache OpenWhisk committers
     email: dev@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 07ebb29..e114f29 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:
@@ -242,11 +254,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


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services