Merge branch 'redis-6-metrics-argocd' into 'master'

Adding Conditional Support for Monitoring of Anchore & ArgoCD Redis Installations

See merge request platform-one/big-bang/bigbang!1198

chart/templates/anchore/values.yaml

@@ -90,6 +90,19 @@ anchore-ui-redis:
   image:
     pullSecrets:
       - private-registry
+  {{- if and .Values.monitoring.enabled (not (and .Values.addons.anchore.redis.host .Values.addons.anchore.redis.port .Values.addons.anchore.redis.password)) }}
+  metrics:
+    enabled: true
+    image:
+      pullSecrets:
+        - private-registry
+    serviceMonitor:
+      enabled: true
+      namespace: anchore
+      selector:
+        app.kubernetes.io/name: anchore-ui-redis
+        app.kubernetes.io/instance: anchore
+  {{- end }}
 {{- end }}
 
 {{- end }}

chart/templates/argocd/values.yaml

@@ -34,6 +34,19 @@ redis-bb:
   enabled: true
   auth:
     enabled: false
+  {{- if .Values.monitoring.enabled }}
+  metrics:
+    enabled: true
+    image:
+      pullSecrets:
+        - private-registry
+    serviceMonitor:
+      enabled: true
+      namespace: argocd
+      selector:
+        app.kubernetes.io/name: redis-bb
+        app.kubernetes.io/instance: argocd-argocd
+  {{- end }}
 
 server:
   image: 

chart/values.yaml

@@ -553,7 +553,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd.git
       path: "./chart"
-      tag: "3.27.1-bb.0"
+      tag: "3.27.1-bb.1"
 
     # -- Flux reconciliation overrides specifically for the ArgoCD Package
     flux: {}
@@ -918,7 +918,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise.git
       path: "./chart"
-      tag: "1.15.0-bb.0"
+      tag: "1.15.0-bb.1"
 
     # -- Flux reconciliation overrides specifically for the Anchore Package
     flux:

tests/test-values.yaml

@@ -691,17 +691,15 @@ addons:
           limits: {}
       anchoreEnterpriseRbac:
         authResources:
-          resources:
-            requests:
-              cpu: 100m
-              memory: 200Mi
-            limits: {}
+          requests:
+            cpu: 100m
+            memory: 200Mi
+          limits: {}
         managerResources:
-          resources:
-            requests:
-              cpu: 100m
-              memory: 200Mi
-            limits: {}
+          requests:
+            cpu: 100m
+            memory: 200Mi
+          limits: {}
       anchoreEnterpriseReports:
         resources:
           requests: