clean up (#33)

OpenNMS · Sep 11, 2023 · 47a5644 · 47a5644
1 parent 9757979
commit 47a5644
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/docs/modules/installation/pages/installation.adoc b/docs/modules/installation/pages/installation.adoc
@@ -55,7 +55,7 @@ helm upgrade --install -f helm-cloud.yaml \
   --set storageClass=onms-share \
   --set ingress.certManager.clusterIssuer=opennms-issuer \
   --set-file dependencies.truststore.content=jks/truststore.jks \
-  --set-file dependencies.postgresql.ca_cert=jks/postgresql-ca.crt \
+  --set-file dependencies.postgresql.caCert=jks/postgresql-ca.crt \
   --set dependencies.postgresql.hostname=onms-db.shared.svc \
   --set dependencies.kafka.hostname=onms-kafka-bootstrap.shared.svc \
   --set dependencies.elasticsearch.hostname=onms-es-http.shared.svc \

diff --git a/horizon/templates/_helpers.tpl b/horizon/templates/_helpers.tpl
@@ -81,16 +81,16 @@ Define custom content for JVM_OPTS to conditionally handle Truststores
 {{/*
 Define whether RRD is enabled
 */}}
-{{- define "core.enable_tss_rrd" -}}
-  {{ or (not .Values.core.configuration.enable_cortex) .Values.core.configuration.enable_tss_dual_write -}}
+{{- define "core.enableTssDualWrite" -}}
+  {{ or (not .Values.core.configuration.enableCortex) .Values.core.configuration.enableTssDualWrite -}}
 {{- end }}
 
 {{/*
 Define common content for Grafana Promtail
 */}}
 {{- define "core.promtailBaseConfig" -}}
 {{- $scheme := "http" -}}
-{{- if ((.Values.dependencies).loki).ca_cert -}}
+{{- if ((.Values.dependencies).loki).caCert -}}
   {{- $scheme := "https" -}}
 {{- end -}}
 server:
@@ -104,7 +104,7 @@ clients:
     username: {{ .Values.dependencies.loki.username }}
     password: {{ .Values.dependencies.loki.password }}
   {{- end }}
-  {{- if ((.Values.dependencies).loki).ca_cert }}
+  {{- if ((.Values.dependencies).loki).caCert }}
   tls_config:
     ca_file: /etc/jks/loki-ca.cert
   {{- end }}

diff --git a/horizon/templates/inspector.yaml b/horizon/templates/inspector.yaml
@@ -17,7 +17,7 @@ spec:
     volumeMounts:
     - name: etc
       mountPath: /opt/opennms/etc
-    {{- if (include "core.enable_tss_rrd" .) }}
+    {{- if (include "core.enableTssDualWrite" .) }}
     - name: rrd
       mountPath: /opennms-data/rrd
     {{- end }}      
@@ -30,7 +30,7 @@ spec:
   - name: etc
     persistentVolumeClaim:
       claimName: onms-etc-pvc
-  {{- if (include "core.enable_tss_rrd" .) }}
+  {{- if (include "core.enableTssDualWrite" .) }}
   - name: rrd
     persistentVolumeClaim:
       claimName: onms-rrd-pvc

diff --git a/horizon/templates/opennms-core.statefulset.yaml b/horizon/templates/opennms-core.statefulset.yaml
@@ -110,7 +110,7 @@ spec:
         - secretRef:
             name: app-credentials
         volumeMounts:
-        {{- if (include "core.enable_tss_rrd" .) }}
+        {{- if (include "core.enableTssDualWrite" .) }}
         - name: rrd
           mountPath: /opennms-data/rrd
         {{- end }}
@@ -211,7 +211,7 @@ spec:
         persistentVolumeClaim:
           claimName: onms-etc-pvc
           readOnly: false
-      {{- if (include "core.enable_tss_rrd" .) }}
+      {{- if (include "core.enableTssDualWrite" .) }}
       - name: rrd
         persistentVolumeClaim:
           claimName: onms-rrd-pvc

diff --git a/horizon/templates/opennms.rrd.pvc.yaml b/horizon/templates/opennms.rrd.pvc.yaml
@@ -1,4 +1,4 @@
-{{- if (include "core.enable_tss_rrd" .) }}
+{{- if (include "core.enableTssDualWrite" .) }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim