Skip to content

Commit b876b3d

Browse files
copejoncursoragent
andcommitted
USHIFT-6951: Add standalone cluster-monitoring-operator rebase script
Move kube-state-metrics rebase logic out of shared assets.yaml/rebase.sh into rebase_cluster_monitoring_operator.sh with a matching assets recipe. The script is identical across sibling PRs (openshift#6808, openshift#6809, openshift#6810) to simplify merging the three optional monitoring components. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 75b0cfa commit b876b3d

4 files changed

Lines changed: 411 additions & 0 deletions

File tree

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
assets:
2+
- dir: optional/kube-state-metrics/
3+
no_clean: True
4+
src: cluster-monitoring-operator/assets/kube-state-metrics/
5+
files:
6+
- file: 00-namespace.yaml
7+
ignore: "MicroShift-specific, no upstream equivalent"
8+
git_restore: True
9+
- file: 01-cluster-role.yaml
10+
src: cluster-role.yaml
11+
- file: 01-cluster-role-binding.yaml
12+
src: cluster-role-binding.yaml
13+
- file: 01-service-account.yaml
14+
src: service-account.yaml
15+
- file: 02-custom-resource-state-configmap.yaml
16+
src: custom-resource-state-configmap.yaml
17+
- file: 02-kube-rbac-proxy-secret.yaml
18+
src: kube-rbac-proxy-secret.yaml
19+
- file: 03-deployment.yaml
20+
src: deployment.yaml
21+
- file: 04-service.yaml
22+
src: service.yaml
23+
- file: kustomization.yaml
24+
ignore: "MicroShift-specific kustomization"
25+
git_restore: True
26+
- file: kustomization.x86_64.yaml
27+
ignore: "gets generated during image rebase"
28+
- file: kustomization.aarch64.yaml
29+
ignore: "gets generated during image rebase"
30+
- file: release-kube-state-metrics-x86_64.json
31+
ignore: "gets generated during image rebase"
32+
- file: release-kube-state-metrics-aarch64.json
33+
ignore: "gets generated during image rebase"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash -x
2+
./scripts/auto-rebase/rebase_cluster_monitoring_operator.sh to "registry.ci.openshift.org/ocp/release-5:5.0.0-0.nightly-2026-06-19-155631" "registry.ci.openshift.org/ocp-arm64/release-5-arm64:5.0.0-0.nightly-arm64-2026-06-19-154904"

scripts/auto-rebase/presubmit.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"./scripts/auto-rebase/assets_ai_model_serving.yaml",
3030
"./scripts/auto-rebase/assets_cert_manager.yaml",
3131
"./scripts/auto-rebase/assets_sriov.yaml",
32+
"./scripts/auto-rebase/assets_cluster_monitoring_operator.yaml",
3233
]
3334

3435

0 commit comments

Comments
 (0)