update instructions for deploying OpenWhisk on OpenShift 4.5 (#682)
diff --git a/README.md b/README.md
index 6ecf02d..7465eaa 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@
to significantly larger clusters by scaling up the replica count of
the various components and labeling multiple nodes as invoker nodes.
For more detailed documentation, see:
-* [OKD/OpenShift 3.11](docs/okd-311.md)
+* [OKD/OpenShift 4.5](docs/okd-45.md)
### Using a Kubernetes cluster you built yourself
diff --git a/docs/okd-311.md b/docs/okd-45.md
similarity index 95%
rename from docs/okd-311.md
rename to docs/okd-45.md
index dfd1b8c..65fc02d 100644
--- a/docs/okd-311.md
+++ b/docs/okd-45.md
@@ -17,11 +17,11 @@
#
-->
-# Deploying OpenWhisk on OKD/OpenShift 3.11
+# Deploying OpenWhisk on OKD/OpenShift 4.5
## Overview
-The 3.11 version of OKD/OpenShift is based on Kubernetes 1.11.
+The 4.5 version of OKD/OpenShift is based on Kubernetes 1.18.
We assume you have an operational cluster that meets the
[technical requirements](okd-technical-requirements.md) and that you
diff --git a/docs/okd-technical-requirements.md b/docs/okd-technical-requirements.md
index c0a676f..4ac0516 100644
--- a/docs/okd-technical-requirements.md
+++ b/docs/okd-technical-requirements.md
@@ -21,7 +21,7 @@
The OKD/OpenShift cluster on which you are deploying OpenWhisk must meet
the following requirements:
-* OKD/OpenShift version 3.11.x
+* OKD/OpenShift version 4.5 or newer (these instructions were tested on 4.5).
* The ability to create routes to make a Kubernetes service
available outside of the cluster so you can actually use OpenWhisk.
* Unless you disable persistence (see
diff --git a/helm/openwhisk/templates/gen-certs-cm.yaml b/helm/openwhisk/templates/gen-certs-cm.yaml
index b74b568..3c69191 100644
--- a/helm/openwhisk/templates/gen-certs-cm.yaml
+++ b/helm/openwhisk/templates/gen-certs-cm.yaml
@@ -15,6 +15,7 @@
# limitations under the License.
#
+{{- if not (eq .Values.whisk.ingress.type "OpenShift") }}
apiVersion: v1
kind: ConfigMap
metadata:
@@ -32,3 +33,4 @@
{{- else }}
{{ (.Files.Glob "configMapFiles/genCerts/gencerts.sh").AsConfig | indent 2 }}
{{- end }}
+{{- end }}
diff --git a/helm/openwhisk/templates/gen-certs-job.yaml b/helm/openwhisk/templates/gen-certs-job.yaml
index c72ecd5..52023cb 100644
--- a/helm/openwhisk/templates/gen-certs-job.yaml
+++ b/helm/openwhisk/templates/gen-certs-job.yaml
@@ -15,6 +15,7 @@
# limitations under the License.
#
+{{- if not (eq .Values.whisk.ingress.type "OpenShift") }}
{{- if not .Values.nginx.certificate.external }}
apiVersion: batch/v1
kind: Job
@@ -57,3 +58,4 @@
name: {{ .Release.Name }}-whisk.config
key: whisk_api_host_name
{{- end }}
+{{- end }}
