Merge branch 'main' into renovate/ansible-lint-6.x

kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml

@@ -207,14 +207,6 @@ spec:
             key: objstore.yml
         retention: 2d
         retentionSize: 15GB
-        additionalScrapeConfigs:
-          - job_name: statsd-exporter
-            scrape_interval: 1m
-            scrape_timeout: 10s
-            honor_timestamps: true
-            static_configs:
-              - targets:
-                  - statsd-exporter.fediverse.svc.cluster.local:9102 # default zalando postgres cluster
         storageSpec:
           volumeClaimTemplate:
             spec:

kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml

@@ -62,6 +62,14 @@ spec:
           - name: "arlen"
             devices:
               - name: /dev/disk/by-id/scsi-0HC_Volume_37460897
+      resources:
+        mgr:
+          limits:
+            cpu: "1000m"
+            memory: "1Gi"
+          requests:
+            cpu: "1000m"
+            memory: "1Gi"
 
     ingress:
       ingressClassName: "nginx"