Skip to content

Conversation

@mandre
Copy link
Member

@mandre mandre commented Jun 11, 2025

Manual merge due to conflicts.

EmilienM and others added 30 commits December 30, 2024 10:15
…es with 3 updates

Bumps the all-go-mod-patch-and-minor group with 2 updates in the / directory: [github.com/gophercloud/gophercloud/v2](https://github.com/gophercloud/gophercloud) and [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo).
Bumps the all-go-mod-patch-and-minor group with 2 updates in the /hack/tools directory: [github.com/gophercloud/gophercloud/v2](https://github.com/gophercloud/gophercloud) and [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo).
Bumps the all-go-mod-patch-and-minor group with 1 update in the /orc directory: [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo).


Updates `github.com/gophercloud/gophercloud/v2` from 2.3.0 to 2.4.0
- [Release notes](https://github.com/gophercloud/gophercloud/releases)
- [Changelog](https://github.com/gophercloud/gophercloud/blob/v2.4.0/CHANGELOG.md)
- [Commits](gophercloud/gophercloud@v2.3.0...v2.4.0)

Updates `github.com/onsi/ginkgo/v2` from 2.22.0 to 2.22.2
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.22.0...v2.22.2)

Updates `github.com/onsi/gomega` from 1.36.1 to 1.36.2
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.36.1...v1.36.2)

Updates `github.com/gophercloud/gophercloud/v2` from 2.3.0 to 2.4.0
- [Release notes](https://github.com/gophercloud/gophercloud/releases)
- [Changelog](https://github.com/gophercloud/gophercloud/blob/v2.4.0/CHANGELOG.md)
- [Commits](gophercloud/gophercloud@v2.3.0...v2.4.0)

Updates `github.com/onsi/ginkgo/v2` from 2.22.0 to 2.22.2
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.22.0...v2.22.2)

Updates `github.com/onsi/gomega` from 1.36.1 to 1.36.2
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.36.1...v1.36.2)

Updates `github.com/onsi/ginkgo/v2` from 2.22.0 to 2.22.2
- [Release notes](https://github.com/onsi/ginkgo/releases)
- [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md)
- [Commits](onsi/ginkgo@v2.22.0...v2.22.2)

Updates `github.com/onsi/gomega` from 1.36.1 to 1.36.2
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.36.1...v1.36.2)

---
updated-dependencies:
- dependency-name: github.com/gophercloud/gophercloud/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/gophercloud/gophercloud/v2
  dependency-type: indirect
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/gomega
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/ginkgo/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/release-0.11/all-go-mod-patch-and-minor-a2f3651b80

🌱(deps): Bump the all-go-mod-patch-and-minor group across 3 directories with 3 updates
Bumps the all-go-mod-patch-and-minor group with 1 update in the / directory: [golang.org/x/crypto](https://github.com/golang/crypto).


Updates `golang.org/x/crypto` from 0.31.0 to 0.32.0
- [Commits](golang/crypto@v0.31.0...v0.32.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/release-0.11/all-go-mod-patch-and-minor-709908b018

🌱(deps): Bump golang.org/x/crypto from 0.31.0 to 0.32.0 in the all-go-mod-patch-and-minor group across 1 directory
…ot/cherry-pick-2352-to-release-0.11

[release-0.11] 🐛 New IPAddressClaim.ObjectMeta.Labels nil map assign panic
Bumps the all-github-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release).


Updates `softprops/action-gh-release` from 2.2.0 to 2.2.1
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](softprops/action-gh-release@7b4da11...c95fe14)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-github-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
…es with 1 update

Bumps the all-go-mod-patch-and-minor group with 1 update in the / directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).
Bumps the all-go-mod-patch-and-minor group with 1 update in the /hack/tools directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).
Bumps the all-go-mod-patch-and-minor group with 1 update in the /orc directory: [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime).


Updates `sigs.k8s.io/controller-runtime` from 0.18.6 to 0.18.7
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.18.6...v0.18.7)

Updates `sigs.k8s.io/controller-runtime` from 0.18.6 to 0.18.7
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.18.6...v0.18.7)

Updates `sigs.k8s.io/controller-runtime` from 0.18.6 to 0.18.7
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.18.6...v0.18.7)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
…ot/github_actions/release-0.11/all-github-actions-9280ec3d13

🌱(deps): Bump softprops/action-gh-release from 2.2.0 to 2.2.1 in the all-github-actions group
…ot/go_modules/release-0.11/all-go-mod-patch-and-minor-6c5834cdfc

🌱(deps): Bump the all-go-mod-patch-and-minor group across 3 directories with 1 update
…ot/cherry-pick-2339-to-release-0.11

[release-0.11] 🐛 fix: create lbaas in specified subnet
The image used in the postsubmit job that builds staging images was outdated.
It had an image with go1.18 and could not build the image.

Signed-off-by: Lennart Jern <[email protected]>
…ot/cherry-pick-2365-to-release-0.11

[release-0.11] 🌱 Update cloudbuild image
…ot/cherry-pick-2367-to-release-0.11

[release-0.11] 🌱 Update OWNERS_ALIASES
Bumps the all-github-actions group with 1 update: [actions/setup-go](https://github.com/actions/setup-go).


Updates `actions/setup-go` from 5.2.0 to 5.3.0
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@3041bf5...f111f33)

---
updated-dependencies:
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-github-actions
...

Signed-off-by: dependabot[bot] <[email protected]>
…ot/github_actions/release-0.11/all-github-actions-4f79472919

🌱(deps): Bump actions/setup-go from 5.2.0 to 5.3.0 in the all-github-actions group
…es with 7 updates

Bumps the all-go-mod-patch-and-minor group with 2 updates in the / directory: [k8s.io/api](https://github.com/kubernetes/api) and [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver).
Bumps the all-go-mod-patch-and-minor group with 3 updates in the /hack/tools directory: [k8s.io/api](https://github.com/kubernetes/api), [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) and [sigs.k8s.io/kustomize/kustomize/v5](https://github.com/kubernetes-sigs/kustomize).
Bumps the all-go-mod-patch-and-minor group with 2 updates in the /orc directory: [k8s.io/api](https://github.com/kubernetes/api) and [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver).


Updates `k8s.io/api` from 0.30.8 to 0.30.9
- [Commits](kubernetes/api@v0.30.8...v0.30.9)

Updates `k8s.io/apiextensions-apiserver` from 0.30.8 to 0.30.9
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.30.8...v0.30.9)

Updates `k8s.io/apimachinery` from 0.30.8 to 0.30.9
- [Commits](kubernetes/apimachinery@v0.30.8...v0.30.9)

Updates `k8s.io/client-go` from 0.30.8 to 0.30.9
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.30.8...v0.30.9)

Updates `k8s.io/component-base` from 0.30.8 to 0.30.9
- [Commits](kubernetes/component-base@v0.30.8...v0.30.9)

Updates `k8s.io/api` from 0.31.4 to 0.31.5
- [Commits](kubernetes/api@v0.30.8...v0.30.9)

Updates `k8s.io/apiextensions-apiserver` from 0.31.4 to 0.31.5
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.30.8...v0.30.9)

Updates `k8s.io/apimachinery` from 0.31.4 to 0.31.5
- [Commits](kubernetes/apimachinery@v0.30.8...v0.30.9)

Updates `k8s.io/client-go` from 0.31.4 to 0.31.5
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.30.8...v0.30.9)

Updates `k8s.io/component-base` from 0.31.4 to 0.31.5
- [Commits](kubernetes/component-base@v0.30.8...v0.30.9)

Updates `k8s.io/code-generator` from 0.31.4 to 0.31.5
- [Commits](kubernetes/code-generator@v0.31.4...v0.31.5)

Updates `sigs.k8s.io/kustomize/kustomize/v5` from 5.5.0 to 5.6.0
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](kubernetes-sigs/kustomize@kustomize/v5.5.0...kustomize/v5.6.0)

Updates `k8s.io/api` from 0.30.8 to 0.30.9
- [Commits](kubernetes/api@v0.30.8...v0.30.9)

Updates `k8s.io/apiextensions-apiserver` from 0.30.8 to 0.30.9
- [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases)
- [Commits](kubernetes/apiextensions-apiserver@v0.30.8...v0.30.9)

Updates `k8s.io/apimachinery` from 0.30.8 to 0.30.9
- [Commits](kubernetes/apimachinery@v0.30.8...v0.30.9)

Updates `k8s.io/client-go` from 0.30.8 to 0.30.9
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](kubernetes/client-go@v0.30.8...v0.30.9)

Updates `k8s.io/component-base` from 0.30.8 to 0.30.9
- [Commits](kubernetes/component-base@v0.30.8...v0.30.9)

---
updated-dependencies:
- dependency-name: k8s.io/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/api
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/client-go
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/code-generator
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/kustomize/kustomize/v5
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apiextensions-apiserver
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: k8s.io/component-base
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
See kubernetes/gengo#286
for context & details.

(cherry picked from commit 4dc2967)
…ot/go_modules/release-0.11/all-go-mod-patch-and-minor-85c73e3001

🌱(deps): Bump the all-go-mod-patch-and-minor group across 3 directories with 7 updates
…es with 2 updates

Bumps the all-go-mod-patch-and-minor group with 2 updates in the / directory: [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api) and [sigs.k8s.io/cluster-api/test](https://github.com/kubernetes-sigs/cluster-api).
Bumps the all-go-mod-patch-and-minor group with 1 update in the /hack/tools directory: [sigs.k8s.io/cluster-api](https://github.com/kubernetes-sigs/cluster-api).


Updates `sigs.k8s.io/cluster-api` from 1.8.8 to 1.8.9
- [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases)
- [Commits](kubernetes-sigs/cluster-api@v1.8.8...v1.8.9)

Updates `sigs.k8s.io/cluster-api/test` from 1.8.8 to 1.8.9
- [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases)
- [Commits](kubernetes-sigs/cluster-api@v1.8.8...v1.8.9)

Updates `sigs.k8s.io/cluster-api` from 1.8.8 to 1.8.9
- [Release notes](https://github.com/kubernetes-sigs/cluster-api/releases)
- [Commits](kubernetes-sigs/cluster-api@v1.8.8...v1.8.9)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/cluster-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/cluster-api/test
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
- dependency-name: sigs.k8s.io/cluster-api
  dependency-type: indirect
  update-type: version-update:semver-patch
  dependency-group: all-go-mod-patch-and-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
…ot/go_modules/release-0.11/all-go-mod-patch-and-minor-23d806d2a3

🌱(deps): Bump the all-go-mod-patch-and-minor group across 2 directories with 2 updates
@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 Jun 11, 2025
@openshift-ci-robot
Copy link

@mandre: This pull request references Jira Issue OCPBUGS-44458, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.18.z) matches configured target version for branch (4.18.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-45387 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-45387 targets the "4.19.0" version, which is one of the valid target versions: 4.19.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Manual merge due to conflicts.

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.

@mandre mandre force-pushed the 4.18-sync-from-upstream-0.11 branch from ec5d476 to 35b741c Compare June 11, 2025 15:01
@gryf
Copy link
Member

gryf commented Jun 13, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 13, 2025
@mandre
Copy link
Member Author

mandre commented Jun 16, 2025

/retest

@mandre
Copy link
Member Author

mandre commented Jun 23, 2025

/approve
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Jun 23, 2025
@openshift-ci
Copy link

openshift-ci bot commented Jun 23, 2025

[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

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 Jun 23, 2025
exportloopref is no longer relevant since go 1.22 and produces an
error. It is now replaced by copyloopvar.
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 23, 2025
@openshift-ci
Copy link

openshift-ci bot commented Jun 23, 2025

@mandre: all tests passed!

Full PR test history. Your PR dashboard.

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.

@eurijon
Copy link

eurijon commented Jun 23, 2025

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 23, 2025
@gryf
Copy link
Member

gryf commented Jun 23, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 23, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit ce2c2d1 into openshift:release-4.18 Jun 23, 2025
9 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the 4.18-sync-from-upstream-0.11 branch June 23, 2025 11:55
@openshift-ci-robot
Copy link

@mandre: Jira Issue OCPBUGS-44458: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-44458 has been moved to the MODIFIED state.

In response to this:

Manual merge due to conflicts.

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.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openstack-cluster-api-controllers
This PR has been included in build openstack-cluster-api-controllers-container-v4.18.0-202506231404.p0.gce2c2d1.assembly.stream.el9.
All builds following this will include this PR.

@openshift-merge-robot
Copy link

Fix included in accepted release 4.18.0-0.nightly-2025-06-23-211337

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.