Skip to content

UPSTREAM-SYNC:Merge https://github.com/k-orc/openstack-resource-controller:release-1.0 into main#20

Open
shiftstack-merge-bot[bot] wants to merge 23 commits intoopenshift:mainfrom
shiftstack:merge-bot-main
Open

UPSTREAM-SYNC:Merge https://github.com/k-orc/openstack-resource-controller:release-1.0 into main#20
shiftstack-merge-bot[bot] wants to merge 23 commits intoopenshift:mainfrom
shiftstack:merge-bot-main

Conversation

@shiftstack-merge-bot
Copy link
Copy Markdown

@shiftstack-merge-bot shiftstack-merge-bot Bot commented Jun 26, 2025

No description provided.

@openshift-ci openshift-ci Bot requested review from MaysaMacedo and gryf June 26, 2025 12:17
@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 26, 2025
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Jun 26, 2025

Hi @shiftstack-merge-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@gryf
Copy link
Copy Markdown
Member

gryf commented Jul 1, 2025

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 1, 2025
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 10, 2025
@mandre
Copy link
Copy Markdown
Member

mandre commented Aug 21, 2025

/ok-to-test

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 21, 2025
@shiftstack-merge-bot-cloner shiftstack-merge-bot-cloner Bot force-pushed the merge-bot-main branch 2 times, most recently from fee8f34 to bbb7c98 Compare September 11, 2025 12:05
@shiftstack-merge-bot-cloner shiftstack-merge-bot-cloner Bot force-pushed the merge-bot-main branch 2 times, most recently from 5b0c7eb to 5757977 Compare September 25, 2025 12:09
@shiftstack-merge-bot-cloner shiftstack-merge-bot-cloner Bot force-pushed the merge-bot-main branch 2 times, most recently from 1125dd2 to cb5c48a Compare November 6, 2025 12:21
@shiftstack-merge-bot-cloner shiftstack-merge-bot-cloner Bot force-pushed the merge-bot-main branch 3 times, most recently from 330ee56 to 6c53027 Compare November 27, 2025 12:08
@shiftstack-merge-bot-cloner shiftstack-merge-bot-cloner Bot force-pushed the merge-bot-main branch 2 times, most recently from 4e4b497 to 9c5a7a3 Compare December 18, 2025 12:19
@shiftstack-merge-bot-cloner shiftstack-merge-bot-cloner Bot force-pushed the merge-bot-main branch 2 times, most recently from f072ecf to 5866b2a Compare January 22, 2026 12:05
mandre and others added 10 commits April 2, 2026 15:08
@mandre
Bump golang.org/x/net
99aae29 
Fixes https://pkg.go.dev/vuln/GO-2026-4559.
@mandre
Bump trivy to v0.69.3
3023222
@mandre
Merge pull request k-orc#735 from shiftstack/security-fixes-v1
5a4de16 
Library bumps
@mandre
Bump go to v1.25.9
9f3d2a7 
Fixes a few vulnerabilities:
- GO-2026-4865
- GO-2026-4870
- GO-2026-4946
- GO-2026-4947
@mandre
Bump go.opentelemetry.io/otel/sdk
ada2798 
Fixes CVE-2026-39883.
@mandre
Merge pull request k-orc#742 from shiftstack/bump-libs-1.0
dafad2a 
[release-1.0] Bump go and go.opentelemetry.io/otel/sdk
@mandre
Fix image building
4f53213 
The github action uses go1.24 while the go mod requires at lease go1.25.
This thus fails when trying to build the image directly with `docker
build`.

We must use the `docker-build` make target to ensure the go version is
the expected one. Let's also use the `docker-push` target for
consistency.
@mandre
Merge pull request k-orc#743 from shiftstack/image-building-1.0
5ab4d69 
Fix image building
@dependabot
🌱(deps): Bump actions/upload-artifact
59d6f1e 
Bumps the all-github-actions group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact).


Updates `actions/upload-artifact` from 7.0.0 to 7.0.1
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@bbbca2d...043fb46)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 7.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
@mandre
Merge pull request k-orc#752 from k-orc/dependabot/github_actions/rel…
6704cd3 
…ease-1.0/all-github-actions-4684ddd577

🌱(deps): Bump actions/upload-artifact from 7.0.0 to 7.0.1 in the all-github-actions group
@openshift-bot
Copy link
Copy Markdown

openshift-bot commented Apr 24, 2026

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

@openshift-ci openshift-ci Bot added lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Apr 24, 2026
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 27, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 27, 2026 •
edited
Loading

@shiftstack-merge-bot[bot]: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn cb5c48a link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@stephenfin
Copy link
Copy Markdown

stephenfin commented Apr 27, 2026

/override ci/prow/e2e-hypershift

This is continually failing for now.

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 27, 2026

@stephenfin: Overrode contexts on behalf of stephenfin: ci/prow/e2e-hypershift

Details

In response to this:

/override ci/prow/e2e-hypershift

This is continually failing for now.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

mandre
mandre reviewed Apr 28, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@mandre mandre left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 28, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Apr 28, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mandre

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2026
@mandre
Copy link
Copy Markdown
Member

mandre commented Apr 28, 2026

/retitle UPSTREAM-SYNC:Merge https://github.com/k-orc/openstack-resource-controller:release-1.0 into main

@openshift-ci openshift-ci Bot changed the title Merge https://github.com/k-orc/openstack-resource-controller:release-1.0 into main UPSTREAM-SYNC:Merge https://github.com/k-orc/openstack-resource-controller:release-1.0 into main Apr 28, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Apr 28, 2026
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Apr 28, 2026

@shiftstack-merge-bot[bot]: This pull request is an upstream sync and explicitly references no jira issue.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mandre mandre mandre left review comments

@gryf gryf Awaiting requested review from gryf

@MaysaMacedo MaysaMacedo Awaiting requested review from MaysaMacedo

Assignees

@mandre mandre

@gryf gryf

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@gryf @mandre @openshift-bot @stephenfin @openshift-ci-robot