Skip to content

Merge upstream kubernetes-sigs/cluster-api-provider-openstack #227

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 9 commits into from
Apr 4, 2022
Merged

Merge upstream kubernetes-sigs/cluster-api-provider-openstack #227

openshift-merge-robot merged 9 commits into from
Apr 4, 2022

Conversation

@pierreprinetti
Copy link
Member

@pierreprinetti pierreprinetti commented Mar 29, 2022

No description provided.

apricote and others added 9 commits March 18, 2022 13:14
@apricote
feat: add Scopes to pass data to services
3bde85f
@pierreprinetti
Address CVE-2022-21698
0ceab04 
Upgrade the Prometheus client to v1.11.1.

This commit is the result of running:

```
go get github.com/prometheus/client_golang@v1.11.1 \
        && go mod tidy
```

See GHSA-cg3q-j54f-5p7p
@apricote
upgrade golangci-lint for go 1.18 support
cae44b1 
With versions lower than 1.45.0, golangci-lint returns a lot of invalid
errors when running in Go 1.18+.

This commit upgrades golangci-lint to the latest released version and fixes
all linting errors that came up.
@k8s-ci-robot
Merge pull request kubernetes-sigs#1184 from apricote/fix-ci-go-18
b28f11f 
🐛 upgrade golangci-lint for go 1.18 support
@k8s-ci-robot
Merge pull request kubernetes-sigs#1182 from shiftstack/bump_promethe…
d739650 
…us_client

🐛 Address CVE-2022-21698
@k8s-ci-robot
Merge pull request kubernetes-sigs#1178 from apricote/scopes
2e5c4b1 
🏃 Add Scopes to pass data to services
@lentzi90
🐛 Install sshuttle using pip instead of from source
833d022
@k8s-ci-robot
Merge pull request kubernetes-sigs#1185 from Nordix/lentzi90/fix-sshu…
1c3cb90 
…ttle-install

🐛 Install sshuttle using pip instead of from source
@pierreprinetti
Merge upstream kubernetes-sigs/cluster-api-provider-openstack
53d673b
@openshift-ci openshift-ci bot requested a review from mdbooth March 29, 2022 14:18
EmilienM
EmilienM reviewed Mar 29, 2022
View reviewed changes
Copy link
Member

@EmilienM EmilienM left a comment

Choose a reason for hiding this comment

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

/retest

EmilienM
EmilienM reviewed Mar 29, 2022
View reviewed changes
Copy link
Member

@EmilienM EmilienM left a comment

Choose a reason for hiding this comment

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

/retest

EmilienM
EmilienM approved these changes Mar 29, 2022
View reviewed changes
Copy link
Member

@EmilienM EmilienM 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 Mar 29, 2022
@pierreprinetti
Copy link
Member Author

pierreprinetti commented Mar 29, 2022

/retest

There is no test defined yet :)

WIP here: openshift/release#27380

mandre
mandre reviewed Apr 1, 2022
View reviewed changes
Copy link
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

@pierreprinetti
Copy link
Member Author

pierreprinetti commented Apr 1, 2022

@mdbooth Do you mind approving, while we figure out a patch to this downstream's OWNERS? 😄

@mandre
Copy link
Member

mandre commented Apr 4, 2022

/approve

@openshift-ci
Copy link

openshift-ci bot commented Apr 4, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM, 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 4, 2022
@openshift-ci
Copy link

openshift-ci bot commented Apr 4, 2022

@pierreprinetti: all tests passed!

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-merge-robot openshift-merge-robot merged commit d6bf6d3 into openshift:main Apr 4, 2022
@pierreprinetti pierreprinetti deleted the main-merge branch April 4, 2022 08:19
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

@mdbooth mdbooth Awaiting requested review from mdbooth

+1 more reviewer

@EmilienM EmilienM EmilienM approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@mandre mandre

@EmilienM EmilienM

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@pierreprinetti @mandre @EmilienM @openshift-merge-robot @apricote @k8s-ci-robot @lentzi90