Monitoring and finops charts for 1.3.0-HF3. (#138)

TIBCOSoftware · Dec 10, 2024 · d26cc2a · d26cc2a
1 parent 6695617
commit d26cc2a
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 69 deletions.
diff --git a/charts/tp-cp-core-finops/Chart.yaml b/charts/tp-cp-core-finops/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: 1.3.0-HF2
+appVersion: 1.3.0-HF3
 dependencies:
 - name: monitoring-service
-  version: 1.3.267
+  version: 1.3.297
 - name: finops-service
-  version: 1.3.72
+  version: 1.3.82
 - name: finops-prometheus
   version: 1.3.58
 - name: finops-web-server
@@ -13,4 +13,4 @@ dependencies:
   version: 1.3.3
 description: A Helm chart for -- tp-cp-core-finops
 name: tp-cp-core-finops
-version: 1.3.463
+version: 1.3.479
diff --git a/charts/tp-cp-core-finops/charts/finops-service/Chart.yaml b/charts/tp-cp-core-finops/charts/finops-service/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.3.0
+appVersion: 1.3.0-HF3
 description: A Helm chart for -- Finops service
 name: finops-service
-version: 1.3.72
+version: 1.3.82
diff --git a/charts/tp-cp-core-finops/charts/finops-service/templates/_consts.tpl b/charts/tp-cp-core-finops/charts/finops-service/templates/_consts.tpl
@@ -58,14 +58,6 @@
 {{- include "cp-env.get" (dict "key" "CP_PVC_NAME" "default" "control-plane-pvc" "required" "false"  "Release" .Release )}}
 {{- end }}
 {{- end }}
-{{/* Provider name for control plane. Fail if the pvc not exist */}}
-{{- define "cp-core-configuration.provider-name" }}
-{{- if .Values.providerName }}
-  {{- .Values.providerName }}
-{{- else }}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
-{{- end }}
 
 {{- define "cp-core-configuration.enableLogging" }}
   {{- $isEnableLogging := "" -}}

diff --git a/charts/tp-cp-core-finops/charts/finops-service/templates/_generated.tpl b/charts/tp-cp-core-finops/charts/finops-service/templates/_generated.tpl
@@ -1,2 +1,2 @@
-{{- define "finops-service.generated.buildNumber" }}72{{end -}}
-{{- define "finops-service.generated.buildTimestamp" }}09-05-24_08.12.15_AM{{end -}}
+{{- define "finops-service.generated.buildNumber" }}82-1.3.0-HF3{{end -}}
+{{- define "finops-service.generated.buildTimestamp" }}11-29-24_22.10.15_PM{{end -}}
diff --git a/charts/tp-cp-core-finops/charts/finops-service/templates/finops-service.yaml b/charts/tp-cp-core-finops/charts/finops-service/templates/finops-service.yaml
@@ -180,7 +180,7 @@ spec:
           valueFrom:
             configMapKeyRef:
               name: {{ include "finops-service.consts.cp.db.configuration" . }}
-              key: DBHost
+              key: LocalReaderHost
         - name: READ_PGPORT
           valueFrom:
             configMapKeyRef:
@@ -217,10 +217,7 @@ spec:
         - name: WRITE_POSTGRES_DATABASE_SSL_KEY
           value: ""
         - name: WRITE_POSTGRES_DATABASE_SSL_ROOT_CERT
-          valueFrom:
-            configMapKeyRef:
-              name: {{ include "finops-service.consts.cp.db.configuration" . }}
-              key: DBSSLRootCert
+          value: /private/tsc/certificates/{{ .Values.global.tibco.db_ssl_root_cert_filename }}
         - name: READ_POSTGRES_DATABASE_SSL_MODE
           valueFrom:
             configMapKeyRef:
@@ -231,14 +228,11 @@ spec:
         - name: READ_POSTGRES_DATABASE_SSL_KEY
           value: ""
         - name: READ_POSTGRES_DATABASE_SSL_ROOT_CERT
-          valueFrom:
-            configMapKeyRef:
-              name: {{ include "finops-service.consts.cp.db.configuration" . }}
-              key: DBSSLRootCert
+          value: /private/tsc/certificates/{{ .Values.global.tibco.db_ssl_root_cert_filename }}
         volumeMounts:
-        - name: store-vol
+        - name: db-ssl-cert-vol
           mountPath: /private/tsc/certificates
-          subPath: tsc/certificates
+          readOnly: true
 {{- if (include "cp-core-configuration.enableLogging" .) }}
       - name: fluentbit
         image: {{ include "finops-service.image.registry" .}}{{"/"}}{{ include "finops-service.image.repository" .}}{{"/"}}{{ .Values.global.tibco.logging.fluentbit.image.name }}:{{ .Values.global.tibco.logging.fluentbit.image.tag }}
@@ -294,6 +288,9 @@ spec:
           configMap:
             name: {{ include "finops-service.consts.appName" . }}-fluentbit-config
 {{- end }}
+        - name: db-ssl-cert-vol
+          secret:
+            secretName: {{ .Values.global.tibco.db_ssl_root_cert_secretname }}
         - name: store-vol
           persistentVolumeClaim:
             claimName: {{ include "cp-core-configuration.pvc-name" . }}

diff --git a/charts/tp-cp-core-finops/charts/finops-service/values.yaml b/charts/tp-cp-core-finops/charts/finops-service/values.yaml
@@ -3,6 +3,8 @@ global:
   external:
     environment: ""
   tibco:
+    db_ssl_root_cert_secretname: "db-ssl-root-cert"
+    db_ssl_root_cert_filename: "db_ssl_root.cert"
     logging:
       fluentbit:
         image:

diff --git a/charts/tp-cp-core-finops/charts/monitoring-service/Chart.yaml b/charts/tp-cp-core-finops/charts/monitoring-service/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.3.0
+appVersion: 1.3.0-HF3
 description: A Helm chart for -- Monitoring service
 name: monitoring-service
-version: 1.3.267
+version: 1.3.297
diff --git a/charts/tp-cp-core-finops/charts/monitoring-service/templates/_consts.tpl b/charts/tp-cp-core-finops/charts/monitoring-service/templates/_consts.tpl
@@ -52,14 +52,6 @@
 {{- end }}
 {{- end }}
 
-{{- define "cp-core-configuration.provider-name" }}
-{{- if .Values.providerName }}
-  {{- .Values.providerName }}
-{{- else }}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
-{{- end }}
-
 {{- define "cp-core-configuration.enableLogging" }}
   {{- $isEnableLogging := "" -}}
     {{- if eq "true" (include "cp-env.get" (dict "key" "CP_LOGGING_FLUENTBIT_ENABLED" "default" "true" "required" "false"  "Release" .Release )) -}}

diff --git a/charts/tp-cp-core-finops/charts/monitoring-service/templates/_generated.tpl b/charts/tp-cp-core-finops/charts/monitoring-service/templates/_generated.tpl
@@ -1,2 +1,2 @@
-{{- define "monitoring-service.generated.buildNumber" }}267{{end -}}
-{{- define "monitoring-service.generated.buildTimestamp" }}09-11-24_05.39.57_AM{{end -}}
+{{- define "monitoring-service.generated.buildNumber" }}297-1.3.0-HF3{{end -}}
+{{- define "monitoring-service.generated.buildTimestamp" }}11-29-24_22.09.46_PM{{end -}}
diff --git a/charts/tp-cp-core-finops/charts/monitoring-service/templates/monitoring-service.yaml b/charts/tp-cp-core-finops/charts/monitoring-service/templates/monitoring-service.yaml
@@ -219,7 +219,7 @@ spec:
           valueFrom:
             configMapKeyRef:
               name: {{ include "monitoring-service.consts.cp.db.configuration" . }}
-              key: DBHost
+              key: LocalReaderHost
         - name: READ_PGPORT
           valueFrom:
             configMapKeyRef:
@@ -256,10 +256,7 @@ spec:
         - name: WRITE_POSTGRES_DATABASE_SSL_KEY
           value: ""
         - name: WRITE_POSTGRES_DATABASE_SSL_ROOT_CERT
-          valueFrom:
-            configMapKeyRef:
-              name: {{ include "monitoring-service.consts.cp.db.configuration" . }}
-              key: DBSSLRootCert
+          value: /private/tsc/certificates/{{ .Values.global.tibco.db_ssl_root_cert_filename }}
         - name: READ_POSTGRES_DATABASE_SSL_MODE
           valueFrom:
             configMapKeyRef:
@@ -270,14 +267,11 @@ spec:
         - name: READ_POSTGRES_DATABASE_SSL_KEY
           value: ""
         - name: READ_POSTGRES_DATABASE_SSL_ROOT_CERT
-          valueFrom:
-            configMapKeyRef:
-              name: {{ include "monitoring-service.consts.cp.db.configuration" . }}
-              key: DBSSLRootCert
+          value: /private/tsc/certificates/{{ .Values.global.tibco.db_ssl_root_cert_filename }}
         volumeMounts:
-        - name: store-vol
+        - name: db-ssl-cert-vol
           mountPath: /private/tsc/certificates
-          subPath: tsc/certificates
+          readOnly: true
 {{- if (include "cp-core-configuration.enableLogging" .) }}
       - name: fluentbit
         image: {{ include "monitoring-service.image.registry" .}}{{"/"}}{{ include "monitoring-service.image.repository" .}}{{"/"}}{{ .Values.global.tibco.logging.fluentbit.image.name }}:{{ .Values.global.tibco.logging.fluentbit.image.tag }}
@@ -333,6 +327,9 @@ spec:
           configMap:
             name: {{ include "monitoring-service.consts.appName" . }}-fluentbit-config
 {{- end }}
+        - name: db-ssl-cert-vol
+          secret:
+            secretName: {{ .Values.global.tibco.db_ssl_root_cert_secretname }}
         - name: store-vol
           persistentVolumeClaim:
             claimName: {{ include "cp-core-configuration.pvc-name" . }}

diff --git a/charts/tp-cp-core-finops/charts/monitoring-service/values.yaml b/charts/tp-cp-core-finops/charts/monitoring-service/values.yaml
@@ -9,6 +9,8 @@ global:
   external:
     environment: ""
   tibco:
+    db_ssl_root_cert_secretname: "db-ssl-root-cert"
+    db_ssl_root_cert_filename: "db_ssl_root.cert"
     logging:
       fluentbit:
         image:

diff --git a/charts/tp-cp-core-finops/templates/_consts.tpl b/charts/tp-cp-core-finops/templates/_consts.tpl
@@ -86,14 +86,6 @@
 {{- include "cp-env.get" (dict "key" "CP_PVC_NAME" "default" "control-plane-pvc" "required" "false"  "Release" .Release )}}
 {{- end }}
 {{- end }}
-{{/* Provider name for control plane. Fail if the pvc not exist */}}
-{{- define "cp-core-configuration.provider-name" }}
-{{- if .Values.providerName }}
-  {{- .Values.providerName }}
-{{- else }}
-{{- include "cp-env.get" (dict "key" "CP_PROVIDER" "default" "aws" "required" "false"  "Release" .Release )}}
-{{- end }}
-{{- end }}
 {{/* Container registry for control plane. default value empty */}}
 {{- define "cp-core-configuration.container-registry" }}
   {{- include "cp-env.get" (dict "key" "CP_CONTAINER_REGISTRY" "default" "" "required" "false"  "Release" .Release )}}

diff --git a/charts/tp-cp-core-finops/templates/_generated.tpl b/charts/tp-cp-core-finops/templates/_generated.tpl
@@ -1,4 +1,4 @@
-{{- define "tp-cp-core-finops.generated.buildNumber" }}457{{end -}}
-{{- define "tp-cp-core-finops.generated.buildTimestamp" }}10-17-24_14.54.58_PM{{end -}}
-{{- define "tp-cp-core-finops-job.generated.buildNumber" }}457{{end -}}
+{{- define "tp-cp-core-finops.generated.buildNumber" }}479{{end -}}
+{{- define "tp-cp-core-finops.generated.buildTimestamp" }}11-29-24_22.15.54_PM{{end -}}
+{{- define "tp-cp-core-finops-job.generated.buildNumber" }}479{{end -}}
 {{- define "tp-cp-core-finops.generated.debug.buildNumber" }}14{{end -}}
diff --git a/charts/tp-cp-core-finops/templates/jobs.yaml b/charts/tp-cp-core-finops/templates/jobs.yaml
@@ -72,8 +72,6 @@ spec:
             configMapKeyRef:
               key: REGION
               name: {{ include "tp-cp-core-finops.tp-env-configmap" . }}
-        - name: IAAS_VENDOR
-          value: {{ include "cp-core-configuration.provider-name" . }}
         - name: PSQL_SCRIPTS_LOCATION
           value: /opt/tibco/finops/scripts/postgres
         - name: BASE_SCRIPTS_LOCATION
@@ -180,8 +178,6 @@ spec:
             configMapKeyRef:
               key: REGION
               name: {{ include "tp-cp-core-finops.tp-env-configmap" . }}
-        - name: IAAS_VENDOR
-          value: {{ include "cp-core-configuration.provider-name" . }}
         - name: ENVIRONMENT_TYPE
           value: {{ (.Values.global.external.environment | lower) }}
         - name: PSQL_SCRIPTS_LOCATION
@@ -291,8 +287,6 @@ spec:
             configMapKeyRef:
               key: REGION
               name: {{ include "tp-cp-core-finops.tp-env-configmap" . }}
-        - name: IAAS_VENDOR
-          value: {{ include "cp-core-configuration.provider-name" . }}
         - name: DeleteDBOnUninstall
           value: {{ .Values.finops.deleteDBOnUninstall | quote }}
         - name: PSQL_SCRIPTS_LOCATION
@@ -400,8 +394,6 @@ spec:
             configMapKeyRef:
               key: REGION
               name: {{ include "tp-cp-core-finops.tp-env-configmap" . }}
-        - name: IAAS_VENDOR
-          value: {{ include "cp-core-configuration.provider-name" . }}
         - name: PSQL_SCRIPTS_LOCATION
           value: /opt/tibco/finops/scripts/postgres
         - name: BASE_SCRIPTS_LOCATION

diff --git a/charts/tp-cp-core-finops/values.yaml b/charts/tp-cp-core-finops/values.yaml
@@ -11,6 +11,8 @@ finops:
 # Global section will apply to this chart and all of its subcharts.
 global:
   tibco:
+    db_ssl_root_cert_secretname: "db-ssl-root-cert"
+    db_ssl_root_cert_filename: "db_ssl_root.cert"
     is_replica_region: false
   # Pod Security Context configuration
   # This configuration ensures that the pod is run with non-root privileges for enhanced security.