enable the security context for plugins and clean up

OpenNMS · Oct 10, 2023 · 756e68b · 756e68b
1 parent 7314948
commit 756e68b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/docs/OpenShift-1.1.0-Beta1-doc.docx b/docs/OpenShift-1.1.0-Beta1-doc.docx
diff --git a/docs/antora.yml b/docs/antora.yml
@@ -1,5 +1,5 @@
 name: opennmshelmcharts
-version: '1.0.0'
+version: '1.1.0'
 title: Helm Charts (Kubernetes)
 nav:
   - modules/ROOT/nav.adoc
diff --git a/horizon/scripts/onms-core-init.sh b/horizon/scripts/onms-core-init.sh
@@ -41,7 +41,6 @@
 # POSTGRES_SSL_FACTORY
 # POSTGRES_SSL_MODE
 # POSTGRES_USER
-# ON_OPENSHIFT
 
 set -euo pipefail
 trap 's=$?; echo >&2 "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR

diff --git a/horizon/templates/opennms-core.statefulset.yaml b/horizon/templates/opennms-core.statefulset.yaml
@@ -63,9 +63,11 @@ spec:
         image: {{ .Values.core.configuration.alecImage.repository }}:{{ .Values.core.configuration.alecImage.tag }}
         imagePullPolicy: {{ .Values.core.configuration.alecImage.pullPolicy }}
         command: [ cp, /plugins/opennms-alec-plugin.kar, /opennms-deploy ]
-        #securityContext: # To guarantee ownership of the KAR file so that OpenNMS won't complain.
-        #  runAsUser: 10001
-        #  runAsGroup: 10001
+        {{- if eq (include "onOpenShift" .) "false" }}
+        securityContext: # To guarantee ownership of the KAR file so that OpenNMS won't complain.
+          runAsUser: 10001
+          runAsGroup: 10001
+        {{- end }}
         volumeMounts:
         - name: deploy
           mountPath: /opennms-deploy # Required by the init script - DEPLOY_DIR
@@ -75,9 +77,11 @@ spec:
         image: {{ .Values.core.configuration.cortexTssImage.repository }}:{{ .Values.core.configuration.cortexTssImage.tag }}
         imagePullPolicy: {{ .Values.core.configuration.cortexTssImage.pullPolicy }}
         command: [ cp, /plugins/opennms-cortex-tss-plugin.kar, /opennms-deploy ]
-        #securityContext: # To guarantee ownership of the KAR file so that OpenNMS won't complain.
-        #  runAsUser: 10001
-        #  runAsGroup: 10001
+        {{- if eq (include "onOpenShift" .) "false" }}
+        securityContext: # To guarantee ownership of the KAR file so that OpenNMS won't complain.
+          runAsUser: 10001
+          runAsGroup: 10001
+        {{- end }}
         volumeMounts:
         - name: deploy
           mountPath: /opennms-deploy # Required by the init script - DEPLOY_DIR