[CHANGE] All OpenShift-specific scripts fail when not run on OpenShift (#808)

Author: gsmith-sas

CHANGELOG.md

@@ -13,6 +13,8 @@
   * [UPGRADE] OpenSearch Data Source Plugin to Grafana upgraded from 2.29.1 to 2.31.1
 * **Logging**
   * [FIX] Log messages from Alertmanger pod redirected to OpenSearch viya_ops-* (rather than viya_logs-*) index
+  * [CHANGE] All OpenShift-specific scripts now fail when run on non-OpenShift clusters
+
 
 ## Version 1.2.43 (10OCT2025)
 * **Metrics**

logging/bin/deploy_openshift_prereqs.sh

@@ -18,6 +18,13 @@ if [ "$OPENSHIFT_PREREQS_ENABLE" != "true" ]; then
     exit
 fi
 
+if [ "$OPENSHIFT_CLUSTER" != "true" ]; then
+    if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
+        log_error "This script should only be run on OpenShift clusters"
+        exit 1
+    fi
+fi
+
 # link OpenSearch serviceAccounts to 'privileged' scc
 oc adm policy add-scc-to-user privileged -z v4m-os -n "$LOG_NS"
 

logging/bin/deploy_servicemonitors_openshift.sh

@@ -18,6 +18,13 @@ if [ "$DEPLOY_SERVICEMONITORS" != "true" ]; then
     exit
 fi
 
+if [ "$OPENSHIFT_CLUSTER" != "true" ]; then
+    if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
+        log_error "This script should only be run on OpenShift clusters"
+        exit 1
+    fi
+fi
+
 EVENTROUTER_ENABLE=${EVENTROUTER_ENABLE:-true}
 if [ "$EVENTROUTER_ENABLE" == "true" ]; then
     # Eventrouter ServiceMonitor

logging/bin/remove_openshift_artifacts.sh

@@ -18,6 +18,13 @@ if [ "$OPENSHIFT_ARTIFACTS_REMOVE" != "true" ]; then
     exit
 fi
 
+if [ "$OPENSHIFT_CLUSTER" != "true" ]; then
+    if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
+        log_error "This script should only be run on OpenShift clusters"
+        exit 1
+    fi
+fi
+
 # remove custom OpenShift SCC
 oc delete scc v4mlogging --ignore-not-found
 oc delete scc v4m-logging-v2 --ignore-not-found

logging/bin/remove_openshift_routes.sh

@@ -10,6 +10,13 @@ this_script=$(basename "$0")
 
 log_debug "Script [$this_script] has started [$(date)]"
 
+if [ "$OPENSHIFT_CLUSTER" != "true" ]; then
+    if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
+        log_error "This script should only be run on OpenShift clusters"
+        exit 1
+    fi
+fi
+
 oc -n "$LOG_NS" delete route v4m-es-kibana-svc --ignore-not-found
 oc -n "$LOG_NS" delete route v4m-es-client-service --ignore-not-found
 oc -n "$LOG_NS" delete route v4m-search --ignore-not-found

logging/bin/remove_servicemonitors_openshift.sh

@@ -18,6 +18,13 @@ if [ "$DEPLOY_SERVICEMONITORS" != "true" ]; then
     exit
 fi
 
+if [ "$OPENSHIFT_CLUSTER" != "true" ]; then
+    if [ "${CHECK_OPENSHIFT_CLUSTER:-true}" == "true" ]; then
+        log_error "This script should only be run on OpenShift clusters"
+        exit 1
+    fi
+fi
+
 EVENTROUTER_ENABLE=${EVENTROUTER_ENABLE:-true}
 if [ "$EVENTROUTER_ENABLE" == "true" ]; then
     # Eventrouter ServiceMonitor