Use HTTPS url for Grafana dashboards on OpenShift to avoid problems w…

…hen browsers redirect Signed-off-by: Alexander Schwartz <aschwart@redhat.com>
andyuk1986 · Jan 3, 2024 · 5e88c4a · 5e88c4a
1 parent dae3de0
commit 5e88c4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/doc/kubernetes/modules/ROOT/pages/openshift/installation-openshift.adoc b/doc/kubernetes/modules/ROOT/pages/openshift/installation-openshift.adoc
@@ -65,7 +65,7 @@ The Grafana dashboard is then available on:
 
 [source,subs=+quotes]
 ----
-http://grafana.apps.**<domain name>**
+https://grafana.apps.**<domain name>**
 ----
 
 NOTE: This is a shared resource for all users using the OpenShift cluster.

diff --git a/provision/openshift/Taskfile.yaml b/provision/openshift/Taskfile.yaml
@@ -150,6 +150,8 @@ tasks:
       - >
         helm -n monitoring upgrade --install grafana grafana/grafana --version 6.55.0 -f grafana.yaml
         --set ingress.hosts[0]=grafana.{{.KC_HOSTNAME_SUFFIX}}
+        --set ingress.annotations."route\.openshift\.io/termination"=edge
+        --set ingress.annotations."route\.openshift\.io/insecureEdgeTerminationPolicy"=Redirect
         --set securityContext.runAsUser=$(cat .task/monitoring-uids)
         --set securityContext.runAsGroup=$(cat .task/monitoring-uids)
         --set securityContext.fsGroup=$(cat .task/monitoring-uids)