[incubator-openwhisk-deploy-kube] branch master updated: fix dangling links to docs/ingress.md (was split into multiple files). (#381)

[da...@apache.org]

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

daisyguo 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 a1ada93  fix dangling links to docs/ingress.md (was split into multiple files). (#381)
a1ada93 is described below

commit a1ada93c97da279bbb4df2bb5c0888cefe225611
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Sun Dec 2 20:46:36 2018 -0500

    fix dangling links to docs/ingress.md (was split into multiple files). (#381)
    
    Fixes #379.
---
 helm/openwhisk/templates/ow-whisk-cm.yaml |  9 ---------
 helm/openwhisk/values.yaml                | 13 ++++++++++---
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/helm/openwhisk/templates/ow-whisk-cm.yaml b/helm/openwhisk/templates/ow-whisk-cm.yaml
index e8a8fed..f97f8ed 100644
--- a/helm/openwhisk/templates/ow-whisk-cm.yaml
+++ b/helm/openwhisk/templates/ow-whisk-cm.yaml
@@ -1,15 +1,6 @@
 # Licensed to the Apache Software Foundation (ASF) under one or more contributor
 # license agreements; and to You under the Apache License, Version 2.0.
 
-# There are some variables that a user must define for their deployment.
-# Check for those values here and attempt to give helpful error messages.
-#
-{{- if ne .Values.whisk.ingress.type "LoadBalancer" }}
-# whisk.ingress.type is {{ required "You must provide a value for whisk.ingress.type (See docs/ingress.md)" .Values.whisk.ingress.type }}
-# whisk.ingress.apiHostName is {{ required "You must provide a value for whisk.ingress.apiHostName (See docs/ingress.md)" .Values.whisk.ingress.apiHostName }}
-# whisk.ingress.apiHostPort is {{ required "You must provide a value for whisk.ingress.apiHostPort (See docs/ingress.md)" .Values.whisk.ingress.apiHostPort }}
-{{- end }}
-
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/helm/openwhisk/values.yaml b/helm/openwhisk/values.yaml
index 87fb1d9..9dc4e41 100644
--- a/helm/openwhisk/values.yaml
+++ b/helm/openwhisk/values.yaml
@@ -6,9 +6,16 @@
 # used in the OpenWhisk Helm Chart.  The variables are grouped
 # by component into subtrees.
 #
-# You _MUST_ override the default values of whisk.ingress.apiHostName
-# and whisk.ingress.apiHostPort (see docs/ingress.md for a discussion
-# of how to determine values for these variables).
+# You _MUST_ override the default value of some of the whisk.ingress variables
+# to reflect your specific Kubernetes cluster.  For details, see the appropriate
+# one of these files:
+#   docs/k8s-docker-for-mac.md
+#   docs/k8s-dind-cluster.md
+#   docs/k8s-aws.md
+#   docs/k8s-ibm-public.md
+#   docs/k8s-ibm-private.md
+#   docs/k8s-google.md
+#   docs/k8s-minikube.md
 #
 # Production deployments _MUST_ override the default credentials
 # that are used in whisk.auth and db.auth.