Merge branch 'main' into install-redis-sentinel

Author: rackerchris

.github/workflows/helm-prometheus-blackbox-exporter.yaml

@@ -31,7 +31,7 @@ jobs:
           ${{ steps.helm.outputs.helm-path }} template prometheus-blackbox-exporter prometheus-community/prometheus-blackbox-exporter \
             --create-namespace \
             --namespace=prometheus \
-            -f ${{ github.workspace }}//base-helm-configs/prometheus-blackbox-exporter/values.yaml \
+            -f ${{ github.workspace }}//base-helm-configs/prometheus-blackbox-exporter/prometheus-blackbox-exporter-helm-overrides.yaml \
             -f ${{ github.workspace }}//base-helm-configs/prometheus-blackbox-exporter/probe_targets.yaml \
             --post-renderer ${{ github.workspace }}/base-kustomize/kustomize.sh \
             --post-renderer-args prometheus-blackbox-exporter/${{ matrix.overlays }} > /tmp/rendered.yaml

base-helm-configs/prometheus-blackbox-exporter/prometheus-blackbox-exporter-helm-overrides.yaml

@@ -0,0 +1,19 @@
+## Enable pod security policy
+---
+pspEnabled: true
+
+nodeSelector:
+  openstack-control-plane: enabled
+
+config:
+  modules:
+    http_2xx:
+      http:
+        valid_status_codes:
+          - 200
+          - 202
+          - 204
+          - 300
+
+selfMonitor:
+  enabled: true