Skip to content

Merge upstream/release-0.6 #236

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

Jump to bottom
Merged
openshift-merge-robot merged 13 commits into from
Apr 28, 2022
Merged

Merge upstream/release-0.6 #236

openshift-merge-robot merged 13 commits into from
Apr 28, 2022

Conversation

@pierreprinetti
Copy link
Member

@pierreprinetti pierreprinetti commented Apr 28, 2022

No description provided.

apricote and others added 13 commits April 19, 2022 10:49
@apricote
avoid marking cluster as failed on transient load balancer error
912eafe 
Previously we only waited for the loadbalancer to become active in case
we created a new loadbalancer. Through this change, we will also wait
for the loadbalancer to become active in case it already existed prior to
the current reconcile.
@apricote
docs: document CRD changes from v1alpha4 to v1alpha5
66d6869
@chrischdi
controllers/openstackcluster_controller.go fix nil pointer and dump m…
b32a5da 
…ore openstack data

* fixes nil pointer when reconcileDelete gets executed a second time and security groups already got deleted
* adds dump of existing ports at e2e tests
@k8s-ci-robot
Merge pull request kubernetes-sigs#1217 from chrischdi/pr-fix-e2e-con…
06cb0c7 
…formance-bastion-sec-nil

🐛 controllers/openstackcluster_controller.go fix nil pointer and dump openstack ports
@k8s-ci-robot
Merge pull request kubernetes-sigs#1216 from apricote/book-crd-changes
8890189 
📖 Document CRD changes from v1alpha4 to v1alpha5
@k8s-ci-robot
Merge pull request kubernetes-sigs#1200 from apricote/loadbalancer-pe…
944b265 
…nding-update-fails-cluster

🐛 always wait for active Loadbalancer after getOrCreate
@mdbooth
Fix conversion of BFV images
6028125 
Root volumes in v1alpha4 can only specify root volume image by UUID. We were
translating this to use Image from the parent, which requires a name,
not a UUID. In v1alpha5 we can also have the ImageUUID field, so we
translate to that instead.
@k8s-ci-robot
Merge pull request kubernetes-sigs#1223 from shiftstack/volume_image_…
12cc2e9 
…conversion

🐛Fix conversion of boot from volume images
@mdbooth
Don't set ImageRef on server when booting from volume
ff634b7
@k8s-ci-robot
Merge pull request kubernetes-sigs#1225 from shiftstack/bfv_imageref
62e2373 
🐛Don't set ImageRef on server when booting from volume
@mdbooth
Add release 0.6.x to metadata.yaml
c0d7fd9
@k8s-ci-robot
Merge pull request kubernetes-sigs#1227 from k8s-infra-cherrypick-rob…
c4e7b24 
…ot/cherry-pick-1226-to-release-0.6

[release-0.6] 🌱 Add release 0.6.x to metadata.yaml
@pierreprinetti
Merge upstream/release-0.6
221494e
@openshift-ci openshift-ci bot requested review from mandre and stephenfin April 28, 2022 09:23
@pierreprinetti
Copy link
Member Author

pierreprinetti commented Apr 28, 2022

/cc mbooth

@openshift-ci
Copy link

openshift-ci bot commented Apr 28, 2022

@pierreprinetti: GitHub didn't allow me to request PR reviews from the following users: mbooth.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

/cc mbooth

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/test-infra repository.

@pierreprinetti
Copy link
Member Author

pierreprinetti commented Apr 28, 2022

/cc mdbooth

@openshift-ci openshift-ci bot requested a review from mdbooth April 28, 2022 09:24
@mdbooth
Copy link

mdbooth commented Apr 28, 2022

/cc @mdbooth

@mdbooth
Copy link

mdbooth commented Apr 28, 2022

/approve
/lgtm

@openshift-ci
Copy link

openshift-ci bot commented Apr 28, 2022

@pierreprinetti: 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/unit 221494e link false /test unit

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/test-infra repository. I understand the commands that are listed here.

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 28, 2022
@mdbooth
Copy link

mdbooth commented Apr 28, 2022

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 28, 2022
@mdbooth
Copy link

mdbooth commented Apr 28, 2022

/approve cancel
/lgtm cancel

We should merge upstream main into downstream main. We should merge upstream release-0.6 into downstream release-0.6.

@openshift-merge-robot openshift-merge-robot merged commit 523f6d7 into openshift:main Apr 28, 2022
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 28, 2022
@openshift-ci
Copy link

openshift-ci bot commented Apr 28, 2022

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please ask for approval from mdbooth after the PR has been reviewed.

The full list of commands accepted by this bot can be found 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 removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2022
@pierreprinetti pierreprinetti deleted the merge_upstream branch April 28, 2022 11:07
@EmilienM EmilienM mentioned this pull request Jan 31, 2023
Closed
pierreprinetti pushed a commit to shiftstack/cluster-api-provider-openstack that referenced this pull request Apr 22, 2024
@iamemilio @pierreprinetti
Allows security groups to be referenced by name and filters (openshif…
741328d 
…t#236)

* Allows security groups to be referenced by name and filters

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

Reviewers

@mandre mandre Awaiting requested review from mandre

@stephenfin stephenfin Awaiting requested review from stephenfin

@mdbooth mdbooth Awaiting requested review from mdbooth

Assignees

@mdbooth mdbooth

Labels

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@pierreprinetti @mdbooth @openshift-merge-robot @apricote @chrischdi @k8s-ci-robot