WIP (fleet/kube-prometheus-stack) deploy prometheus stack

fleet/lib/kube-prometheus-stack-pre/fleet.yaml

@@ -12,38 +12,3 @@ dependsOn:
   - selector:
       matchLabels:
         bundle: external-secrets
-targetCustomizations:
-  - name: ayekan
-    clusterSelector:
-      matchExpressions:
-        - key: management.cattle.io/cluster-display-name
-          operator: In
-          values:
-            - ayekan
-    yaml:
-      overlays:
-        - ayekan
-  - name: ogldap  # remove if/when direct ldap is dropped
-    clusterSelector:
-      matchExpressions:
-        - key: management.cattle.io/cluster-display-name
-          operator: In
-          values:
-            - pillan
-            - ruka
-            - kueyen
-    yaml:
-      overlays:
-        - prod
-        - ldap
-  - name: prod
-    clusterSelector:
-      matchExpressions:
-        - key: site
-          operator: In
-          values:
-            - ls
-            - cp
-    yaml:
-      overlays:
-        - prod

fleet/lib/kube-prometheus-stack/aggregator/values.yaml

@@ -69,13 +69,6 @@ grafana:
   serviceMonitor:
     labels:
       lsst.io/monitor: "true"
-  resources:
-    limits:
-      cpu: 4
-      memory: 512Mi
-    requests:
-      cpu: 250m
-      memory: 512Mi
   persistence:
     enabled: true
   deploymentStrategy:

fleet/lib/kube-prometheus-stack/fleet.yaml

@@ -9,7 +9,7 @@ helm:
   releaseName: *name
   repo: https://prometheus-community.github.io/helm-charts
   version: 75.11.0
-  timeoutSeconds: 600
+  timeoutSeconds: 1200
   waitForJobs: true
   valuesFiles:
     - values.yaml
@@ -43,19 +43,6 @@ diff:
       jsonPointers:
         - /spec/automountServiceAccountToken
 targetCustomizations:
-  - name: kueyen
-    clusterSelector:
-      matchExpressions:
-        - key: management.cattle.io/cluster-display-name
-          operator: In
-          values:
-            - kueyen
-    helm:
-      valuesFiles:
-        - pvc/values.yaml
-        - aggregator/values.yaml
-        - ldap/values.yaml
-        - overlays/kueyen/values.yaml
   - name: pillan
     clusterSelector:
       matchExpressions:
@@ -67,33 +54,30 @@ targetCustomizations:
       valuesFiles:
         - pvc/values.yaml
         - aggregator/values.yaml
-        - ldap/values.yaml
         - overlays/pillan/values.yaml
-  - name: ruka
+  - name: antu
     clusterSelector:
       matchExpressions:
         - key: management.cattle.io/cluster-display-name
           operator: In
           values:
-            - ruka
+            - antu
     helm:
       valuesFiles:
-        - pvc/values.yaml
+        - pvc/values.yaml  #not needed, loaded on all sites except tu
         - aggregator/values.yaml
-        - ldap/values.yaml
-        - overlays/ruka/values.yaml
-  - name: antu
+        - overlays/antu/values.yaml
+  - name: dev
     clusterSelector:
       matchExpressions:
-        - key: management.cattle.io/cluster-display-name
+        - key: site
           operator: In
           values:
-            - antu
+            - dev
     helm:
       valuesFiles:
-        - pvc/values.yaml
         - aggregator/values.yaml
-        - overlays/antu/values.yaml
+        - overlays/dev/values.yaml
   - name: cl-nopvc
     clusterSelector:
       matchExpressions:
@@ -117,6 +101,7 @@ targetCustomizations:
               - url: https://mimir.ruka.dev.lsst.org/api/v1/push
               - url: https://mimir.antu.ls.lsst.org/api/v1/push
               - url: https://mimir.kueyen.dev.lsst.org/api/v1/push
+              - url: https://mimir.pukem.dev.lsst.org/api/v1/push
   - name: cl-default
     clusterSelector:
       matchExpressions: