Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ The experience here is that when you visit Kibana, it redirects you to
login. Then when you login successfully, you are redirected back to Kibana,
which immediately redirects back to login again.

NOTE: The following applies to releases prior to OpenShift 4.2.

The typical reason for this is that the OAuth2 proxy in front of Kibana
is supposed to share a secret with the master's OAuth2 server, in order
to identify it as a valid client. This problem likely indicates that
Expand Down Expand Up @@ -242,6 +244,8 @@ The return address for the client has to be in a whitelist for the server to
securely redirect back after logging in; if there is a mismatch, then this
cryptic error message is shown.

NOTE: The following applies to releases prior to OpenShift 4.2.

As above, this may be caused by an `oauthclient` entry lingering from a
previous deployment, in which case you can replace it:

Expand Down
3 changes: 0 additions & 3 deletions hack/testing/check-EFK-running.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ function get_es_deployments() {
if [ "$USE_OPERATOR" = true ] ; then
oal_expected_deploymentconfigs=( "" )
oal_expected_daemonsets=( "fluentd" )
oal_expected_oauthclients=( "kibana-proxy" )
if [ "$1" = "true" ]; then
oal_expected_deployments=( "kibana-app" "kibana-infra" )
oal_expected_cronjobs=( "curator-app" "curator-infra" )
Expand Down Expand Up @@ -59,7 +58,6 @@ else
oal_expected_cronjobs=( "logging-curator" )
oal_expected_routes=( "logging-kibana" )
oal_expected_services=( "logging-es" "logging-es-cluster" "logging-kibana" )
oal_expected_oauthclients=( "kibana-proxy" )
oal_expected_daemonsets=( "logging-fluentd" )
if [ "$1" = "true" ]; then
# There is an ops cluster set up, so we
Expand Down Expand Up @@ -97,7 +95,6 @@ OAL_EXPECTED_DEPLOYMENTS="${oal_expected_deployments[*]}" \
OAL_EXPECTED_DEPLOYMENTCONFIGS="${oal_expected_deploymentconfigs[*]}" \
OAL_EXPECTED_ROUTES="${oal_expected_routes[*]}" \
OAL_EXPECTED_SERVICES="${oal_expected_services[*]}" \
OAL_EXPECTED_OAUTHCLIENTS="${oal_expected_oauthclients[*]}" \
OAL_EXPECTED_DAEMONSETS="${oal_expected_daemonsets[*]}" \
OAL_EXPECTED_CRONJOBS="${oal_expected_cronjobs[*]}" \
"${OS_O_A_L_DIR}/test/cluster/rollout.sh"
6 changes: 0 additions & 6 deletions test/cluster/rollout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# - OAL_EXPECTED_{
# DEPLOYMENTCONFIGS,
# CRONJOBS,
# OAUTHCLIENTS,
# DAEMONSETS,
# SERVICES,
# ROUTES
Expand Down Expand Up @@ -83,11 +82,6 @@ for service in ${OAL_EXPECTED_SERVICES}; do
os::cmd::expect_success "oc get service ${service}"
done

os::log::info "Checking for OAuthClients..."
for oauthclient in ${OAL_EXPECTED_OAUTHCLIENTS}; do
os::cmd::expect_success "oc get oauthclient ${oauthclient}"
done

os::log::info "Checking for DaemonSets..."
for daemonset in ${OAL_EXPECTED_DAEMONSETS}; do
os::cmd::expect_success "oc get daemonset ${daemonset}"
Expand Down