refrence monitoring branch that we've been using

.gitlab-ci.yml

@@ -29,7 +29,7 @@ package tests:
     # Install Flux
     - which flux
     - flux --version
-    - flux install --registry registry.dsop.io/platform-one/big-bang/apps/sandbox/fluxv2 --timeout 3m0s
+    - flux install
     - kubectl get namespaces,pods,helmrelease,gitrepositories -A
 
     # Install Big Bang
@@ -42,6 +42,7 @@ package tests:
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang gatekeeper
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang istio-operator
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang istio
+    - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang monitoring
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang eck-operator
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang ek
     - kubectl wait --for=condition=Ready --timeout 300s helmrelease -n bigbang fluent-bit
@@ -73,7 +74,13 @@ package tests:
     - echo "Package tests go here"
     - bash ./tests/virtualservices.sh
     - kubectl get helmrelease -A
+    - echo "Showing images not from ironbank:"
+    # Ignore rancher images since those are from k3d
+    - kubectl get pods -A -o jsonpath="{..image}" | tr -s '[[:space:]]' '\n' | sort | uniq -c | grep -v "registry1" | grep -v "rancher"
 
   after_script:
     # Delete Cluster
+    - kubectl get helmrelease,gitrepositories -A
+    - kubectl describe helmrelease -n bigbang monitoring
+    - kubectl describe all -n monitoring
     - k3d cluster delete umbrella

chart/templates/monitoring/monitoring-helmrelease.yaml

@@ -43,24 +43,7 @@ spec:
       imagePullSecrets:
         - name: private-registry
     hostname: {{ .Values.hostname }}
-    kubePrometheusStack:
-      alertmanager:
-        alertmanagerSpec:
-          image:
-            repository: registry1.dsop.io/ironbank/opensource/prometheus/alertmanager
-            tag: v0.21.0
-        enabled: true
-
-    kubePrometheusStack:
-      grafana:
-        image:
-          pullSecrets:
-          - private-registry
-
-      prometheusOperator:
-        createCustomResource: true
-        manageCrds: true
-
+    
   # TODO: DRY this up
   {{- if or .Values.gatekeeper.enabled .Values.istio.enabled }}
   dependsOn:

chart/values.yaml

@@ -62,7 +62,7 @@ monitoring:
   enabled: true
   git:
     repo: https://repo1.dsop.io/platform-one/big-bang/apps/core/monitoring.git
-    branch: master
+    branch: release-v0.2.x
     # commit: ""
     # tag: ""
   values: {}