From 5e88c4ab1414b6b106e6d862017cd98a0b69c37e Mon Sep 17 00:00:00 2001 From: Alexander Schwartz Date: Wed, 3 Jan 2024 16:52:20 +0100 Subject: [PATCH] Use HTTPS url for Grafana dashboards on OpenShift to avoid problems when browsers redirect Signed-off-by: Alexander Schwartz --- .../modules/ROOT/pages/openshift/installation-openshift.adoc | 2 +- provision/openshift/Taskfile.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/kubernetes/modules/ROOT/pages/openshift/installation-openshift.adoc b/doc/kubernetes/modules/ROOT/pages/openshift/installation-openshift.adoc index f452a9ca4..cb8066b18 100644 --- 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.**** +https://grafana.apps.**** ---- 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 index 006d0627e..50b6f8d2c 100644 --- 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)