Skip to content

Conversation

@iamemilio
Copy link

@iamemilio iamemilio commented Jun 17, 2019

What this PR does / why we need it: Pulls down changes from upstream that benefit us
This pull request is a little. For now, we are going to merge upstream patches that are useful, or would prevent merge conflicts in the future.

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jun 17, 2019
@openshift-ci-robot openshift-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Jun 17, 2019
hidekazuna and others added 5 commits June 26, 2019 09:40
This PR adds ConfigDrive zz_generated.deepcopy.go by executing go
generate under pkg/apis and fix Makefile to prevent from missing.
timeout is hard code and sometimes it's might be need to wait
for more than 5 min for instance create in some cloud.
eromanova and others added 3 commits June 27, 2019 14:38
This changes provide security groups removal
during cluster deletion if managedSecurityGroups
is true in clusterSpec.providerSpec

Change-Id: I62002e50ae7c60b7fda38663118f8deabb03ba3c
run 'make unit' locally have those update...
we are not providing any info about control pane CA key and pem
add those info will be confusing to end user
and seems add private key info into the status is not that secure..
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 27, 2019
@trown trown changed the title [WIP] Integrating useful changes from upstream Integrating useful changes from upstream Jun 28, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 28, 2019
@trown
Copy link

trown commented Jun 28, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jun 28, 2019
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamemilio, trown

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-merge-robot openshift-merge-robot merged commit 243b762 into openshift:master Jun 28, 2019
racheljpg pushed a commit to racheljpg/cluster-api-provider-openstack that referenced this pull request Dec 20, 2023
pierreprinetti pushed a commit to shiftstack/cluster-api-provider-openstack that referenced this pull request Apr 22, 2024
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. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants