Merge remote-tracking branch 'upstream/main'

components/monitoring/prometheus/base/monitoringstack/monitoringstack.yaml

@@ -105,7 +105,6 @@ spec:
         - '{__name__="tekton_pipelines_controller_running_taskruns_throttled_by_node"}'
         - '{__name__="tekton_pipelines_controller_pipelinerun_duration_seconds_sum"}'
         - '{__name__="tekton_pipelines_controller_pipelinerun_duration_seconds_count"}'
-        - '{__name__="tekton_pipelines_controller_pipelinerun_taskrun_duration_seconds_bucket"}'
         - '{__name__="watcher_workqueue_depth"}'
         - '{__name__="watcher_client_latency_bucket"}'
         - '{__name__="pac_watcher_work_queue_depth"}'

components/multi-platform-controller/staging-downstream/host-config.yaml

@@ -303,7 +303,32 @@ data:
   dynamic.linux-ppc64le.max-instances: "2"
   dynamic.linux-ppc64le.max-age: "120"
   dynamic.linux-ppc64le.concurrency: "2"
+  dynamic.linux-ppc64le.user-data: |-
+    Content-Type: multipart/mixed; boundary="//"
+    MIME-Version: 1.0
 
+    --//
+    Content-Type: text/cloud-config; charset="us-ascii"
+    MIME-Version: 1.0
+    Content-Transfer-Encoding: 7bit
+    Content-Disposition: attachment; filename="cloud-config.txt"
+
+    #cloud-config
+    cloud_final_modules:
+      - [scripts-user, always]
+
+    --//
+    Content-Type: text/x-shellscript; charset="us-ascii"
+    MIME-Version: 1.0
+    Content-Transfer-Encoding: 7bit
+    Content-Disposition: attachment; filename="userdata.txt"
+
+    #!/bin/bash -ex
+
+    ip add route 10.0.0.0/8 via 10.130.72.1
+    ip add route 0.0.0.0/0 via 192.168.196.185
+
+    --//--
   # host.ppc1.address: "10.130.72.222"
   # host.ppc1.platform: "linux/ppc64le"
   # host.ppc1.user: "root"