Clean up logics for OpenShift

horizon/scripts/onms-core-init.sh

@@ -28,6 +28,7 @@
 # KAFKA_SASL_PASSWORD
 # KAFKA_SASL_USERNAME
 # KAFKA_SECURITY_PROTOCOL
+# OPENSHIFT_ENVIRONMENT
 # OPENNMS_ADMIN_PASS
 # OPENNMS_DATABASE_CONNECTION_MAXPOOL
 # OPENNMS_DBNAME
@@ -77,19 +78,26 @@ OPENNMS_DATABASE_CONNECTION_MAXPOOL=${OPENNMS_DATABASE_CONNECTION_MAXPOOL-50}
 KAFKA_SASL_MECHANISM=${KAFKA_SASL_MECHANISM-PLAIN}
 KAFKA_SECURITY_PROTOCOL=${KAFKA_SECURITY_PROTOCOL-SASL_PLAINTEXT}
 
-# See if we can get the OpenNMS package name and version from the package manager
-if command -v rpm   >/dev/null 2>&1; then
-  PKG=$(rpm -qa | egrep '(meridian|opennms)-core')
-  VERSION=$(rpm -q --queryformat '%{VERSION}' $PKG)
-elif command -v dpkg-query >/dev/null 2>&1; then
-  if PKG=$(dpkg-query -f '${Package}\n' -W | grep -Fx -e opennms-common -e meridian-common); then
-    VERSION=$(dpkg-query -f '${Version}\n' -W "${PKG}")
-  else
-    PKG="unknown"
-  fi
-else
-  PKG="unknown"
-fi
+
+if [[ $OPENSHIFT_ENVIRONMENT ]];then
+ echo "Running on OpenShift environment!" 
+ PKG=$(unzip -q -c "/opt/opennms/lib/opennms_install.jar" installer.properties | grep "install.package.name"  | cut -d '=' -f 2)
+ VERSION=$(tail -1 "/opt/opennms/jetty-webapps/opennms/WEB-INF/version.properties" | cut -d '=' -f 2)
+#else
+## See if we can get the OpenNMS package name and version from the package manager
+#if command -v rpm   >/dev/null 2>&1; then
+#  PKG=$(rpm -qa | egrep '(meridian|opennms)-core')
+#  VERSION=$(rpm -q --queryformat '%{VERSION}' $PKG)
+#elif command -v dpkg-query >/dev/null 2>&1; then
+#  if PKG=$(dpkg-query -f '${Package}\n' -W | grep -Fx -e opennms-common -e meridian-common); then
+#    VERSION=$(dpkg-query -f '${Version}\n' -W "${PKG}")
+#  else
+#    PKG="unknown"
+#  fi
+#else
+#  PKG="unknown"
+#fi
+fi 
 
 if [[ "${PKG}" == "unknown" ]]; then
   if [[ ! -e jetty-webapps/opennms/WEB-INF/version.properties ]]; then

horizon/templates/app-settings.configmap.yaml

@@ -19,6 +19,7 @@ data:
   ENABLE_CORTEX: {{ ((.Values.core).configuration).enableCortex | quote }}
   ENABLE_TSS_DUAL_WRITE: {{ ((.Values.core).configuration).enableTssDualWrite | quote }}
   ENABLE_GRAFANA: {{ if gt ((.Values.grafana).replicaCount|int) 0 }}"true"{{ else }}"false"{{ end }}
+  OPENSHIFT_ENVIRONMENT: {{ include "onOpenShift" . | quote }}
   OPENNMS_INSTANCE_ID: {{ .Release.Name | quote }}
   OPENNMS_SERVER: {{ printf "onms-core.%s.svc" .Release.Name | quote }}
   OPENNMS_DBNAME: {{ printf "%s_opennms" .Release.Name | quote }}

horizon/templates/opennms-core.route.yaml

@@ -1,3 +1,4 @@
+{{- if eq (include "omOpenShift" .) "true" }}
 kind: Route
 apiVersion: route.openshift.io/v1
 metadata:
@@ -31,4 +32,5 @@ status:
           status: 'True'
           #lastTransitionTime: '2023-08-10T14:16:19Z'
       wildcardPolicy: None
-      routerCanonicalHostname: router-default.apps-crc.testing
+      routerCanonicalHostname: router-default.apps-crc.testing
+{{- end }}

horizon/templates/opennms-core.sa.yaml

@@ -1,4 +1,4 @@
-{{- if include "onOpenShift" . }}
+{{- if eq (include "omOpenShift" .) "true" }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:

horizon/templates/opennms-core.scc.yaml

@@ -1,4 +1,4 @@
-{{- if include "onOpenShift" . }}
+{{- if eq (include "omOpenShift" .) "true" }}
 ---
 kind: SecurityContextConstraints
 metadata:

horizon/values.schema.json

@@ -43,7 +43,8 @@
                                 "",
                                 "32.0.0",
                                 "32.0.1",
-                                "32.0.2"
+                                "32.0.2",
+                                "bleeding"
                             ]
                         }
                     }