Skip to content

chore(merge-*): restore downstream files and drop upstream .github/workflows post-merge #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
machine424 merged 2 commits into from
Sep 3, 2026
+37 −11
Merged

chore(merge-*): restore downstream files and drop upstream .github/workflows post-merge #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2eb77b
chore(merge-*): add restore-downstream for OWNERS, Dockerfile.ocp and…
machine424 Aug 25, 2026
2d708f6
chore(merge-flow): remove upstream .github/workflows and dependabot c…
machine424 Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/merge-alertmanager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
go.sum
docs/
restore-downstream: >-
.ci-operator.yaml
Dockerfile.ocp
OWNERS
.coderabbit.yaml
.gitignore
assets-cmd: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/merge-flow.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,12 @@ jobs:
- uses: pnpm/action-setup@0977fd99725f1db4007ccb2928dbb4e90d06cc86 # v6.0.10
with:
version: "> 11.12.0"
- name: Remove dependabot configuration
# Upstream CI and bot configs are unused downstream and trigger
# security/dependabot alerts if left in place.
- name: Remove unused upstream configs
run: |
if [ -f .github/dependabot.yml ]; then
git rm -f .github/dependabot.yml
git commit -s -m "[bot] remove dependabot config"
fi
git rm -rf --ignore-unmatch .github/workflows .github/dependabot.yml
git diff --cached --exit-code || git commit -s -m "[bot] remove unused upstream configs"
- name: go mod tidy + vendor
run: |
go mod tidy
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/merge-kube-state-metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
downstream: openshift/kube-state-metrics
sandbox: rhobs/kube-state-metrics
restore-upstream: >-
.github/
.markdownlint-cli2.jsonc
CHANGELOG.md
CONTRIBUTING.md
Expand All @@ -30,7 +29,10 @@ jobs:
VERSION
docs/
go.mod
restore-downstream: OWNERS
restore-downstream: >-
.ci-operator.yaml
Dockerfile.ocp
OWNERS
downstream-version-expression: |
sed -n -E 's/^version: \"*([0-9]+\.[0-9]+\.[0-9]+)\"$/v\1/p' https://raw.githubusercontent.com/openshift/kube-state-metrics/main/data.yaml
secrets:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/merge-metrics-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ jobs:
upstream: kubernetes-sigs/metrics-server
downstream: openshift/kubernetes-metrics-server
sandbox: rhobs/kubernetes-metrics-server
restore-downstream: OWNERS
restore-downstream: >-
.ci-operator.yaml
Dockerfile.ocp

@slashpai slashpai Sep 3, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two exists only downstream, it wont cause merge conflict IIUC. Any reason you think it should be here?

@machine424 machine424 Sep 3, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to be safe, no matter what happens, we want those downstream files there.

OWNERS
restore-upstream: >-
go.mod
go.sum
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/merge-node-exporter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@ jobs:
downstream: openshift/node_exporter
sandbox: rhobs/node_exporter
restore-downstream: >-
.ci-operator.yaml
Dockerfile.ocp
OWNERS
restore-upstream: >-
CHANGELOG.md
VERSION
collector
go.mod
go.sum
.github/workflows/
secrets:
pr-app-id: ${{ secrets.APP_ID }}
pr-app-private-key: ${{ secrets.APP_PRIVATE_KEY }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/merge-prom-label-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ jobs:
downstream: openshift/prom-label-proxy
sandbox: rhobs/prom-label-proxy
restore-downstream: >-
.ci-operator.yaml
Dockerfile.ocp
OWNERS
restore-upstream: >-
CHANGELOG.md
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/merge-prometheus-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ jobs:
scripts/go.mod
scripts/go.sum
pkg
restore-downstream: >-
.ci-operator.yaml
Dockerfile.ocp
Dockerfile.admission-webhook.ocp
Dockerfile.config-reloader.ocp
OWNERS
secrets:
pr-app-id: ${{ secrets.APP_ID }}
pr-app-private-key: ${{ secrets.APP_PRIVATE_KEY }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/merge-prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ jobs:
downstream: openshift/prometheus
sandbox: rhobs/prometheus
restore-downstream: >-
.ci-operator.yaml
.github/PULL_REQUEST_TEMPLATE.md
Dockerfile.ocp
OWNERS
restore-upstream: >-
CHANGELOG.md
VERSION
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/merge-resource-state-metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ jobs:
upstream: kubernetes-sigs/resource-state-metrics
downstream: openshift/kubernetes-sigs-resource-state-metrics
sandbox: rhobs/kubernetes-sigs-resource-state-metrics
restore-downstream: OWNERS
restore-downstream: >-
.ci-operator.yaml
Dockerfile.ocp
OWNERS
restore-upstream: >-
.github/
CONTRIBUTING.md
Dockerfile
README.md
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/merge-thanos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ jobs:
tutorials
.busybox-versions
.devcontainer
restore-downstream: >-
.ci-operator.yaml
Dockerfile.ocp
OWNERS
secrets:
pr-app-id: ${{ secrets.APP_ID }}
pr-app-private-key: ${{ secrets.APP_PRIVATE_KEY }}
Expand Down
Loading