Merge branch 'update-monitoring-tag-61.2.0-bb.4' into 'master'

monitoring update to 61.2.0-bb.4

Closes big-bang/product/packages/monitoring#242 and big-bang/product/packages/monitoring#245

See merge request !4890

chart/templates/monitoring/values.yaml

@@ -403,9 +403,6 @@ sso:
 prometheus-node-exporter:
   image:
     pullPolicy: {{ .Values.imagePullPolicy }}
-  serviceAccount:
-    imagePullSecrets:
-    - name: private-registry
 
 
   {{- if or (eq $lokiEnabled true) (eq $istioInjection true) }}
@@ -464,8 +461,6 @@ defaultRules:
 kube-state-metrics:
   image:
     pullPolicy: {{ .Values.imagePullPolicy }}
-  imagePullSecrets:
-  - name: private-registry
   {{- if or (eq $lokiEnabled true) (eq $istioInjection true) }}
   prometheus:
     monitor:

chart/values.yaml

@@ -878,11 +878,11 @@ monitoring:
   git:
     repo: https://repo1.dso.mil/big-bang/product/packages/monitoring.git
     path: "./chart"
-    tag: "61.2.0-bb.2"
+    tag: "61.2.0-bb.4"
   helmRepo:
     repoName: "registry1"
     chartName: "monitoring"
-    tag: "61.2.0-bb.2"
+    tag: "61.2.0-bb.4"
 
   # -- Flux reconciliation overrides specifically for the Monitoring Package
   flux:

tests/test-values.yaml

@@ -1030,7 +1030,6 @@ promtail:
   enabled: true
 
 monitoring:
-  enabled: true
   flux:
     timeout: 20m
     install:
@@ -1040,7 +1039,6 @@ monitoring:
       disableOpenAPIValidation: true
       crds: CreateReplace
   sso:
-    enabled: false
     prometheus:
       client_id: dev_00eb8904-5b88-4c68-ad67-cec0d2e07aa6_prometheus
     alertmanager: