Merge remote-tracking branch 'upstream/main'

redhat-hac-qe · Sep 5, 2024 · 4eea07d · 4eea07d
2 parents 51c232d + f9b79ee
commit 4eea07d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/components/monitoring/prometheus/base/monitoringstack/monitoringstack.yaml b/components/monitoring/prometheus/base/monitoringstack/monitoringstack.yaml
@@ -115,7 +115,7 @@ spec:
         - '{__name__="controller_runtime_reconcile_errors_total", namespace!~".*-tenant|openshift-.*|kube-.*"}'
         - '{__name__="controller_runtime_reconcile_total", namespace!~".*-tenant|openshift-.*|kube-.*"}'
         - '{__name__="kube_pod_status_unschedulable", namespace!~".*-tenant|openshift-.*|kube-.*"}'
-        - '{__name__="kube_pod_container_status_restarts_total", namespace="openshift-pipelines|release-service"}'
+        - '{__name__="kube_pod_container_status_restarts_total", namespace=~"openshift-pipelines|release-service"}'
         - '{__name__="kube_pod_container_status_waiting_reason", namespace!~".*-tenant|openshift-.*|kube-.*|release-service"}'
         - '{__name__="kube_pod_status_phase", namespace!~".*-tenant|openshift-.*|kube-.*|release-service"}'
         - '{__name__="kube_pod_container_status_terminated_reason", namespace="release-service"}'

diff --git a/components/multi-platform-controller/staging-downstream/host-config.yaml b/components/multi-platform-controller/staging-downstream/host-config.yaml
@@ -34,10 +34,9 @@ data:
     linux-c8xlarge/arm64,\
     linux/s390x,\
     linux-root/arm64,\
-    linux-root/amd64,\
-    linux/ppc64le\
+    linux-root/amd64\
     "
-  #dynamic-pool-platforms: linux/ppc64le
+  dynamic-pool-platforms: linux/ppc64le
   instance-tag: rhtap-staging
 
   # cpu:memory (1:4)
@@ -302,8 +301,8 @@ data:
   dynamic.linux-ppc64le.cores: "2"
   dynamic.linux-ppc64le.memory: "8"
   dynamic.linux-ppc64le.max-instances: "2"
-  # dynamic.linux-ppc64le.max-age: "120"
-  # dynamic.linux-ppc64le.concurrency: "2"
+  dynamic.linux-ppc64le.max-age: "120"
+  dynamic.linux-ppc64le.concurrency: "2"
 
   # host.ppc1.address: "10.130.72.222"
   # host.ppc1.platform: "linux/ppc64le"