Skip to content

Merge upstream into main #235

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 17 commits into from
Apr 27, 2022
Merged

Merge upstream into main #235

openshift-merge-robot merged 17 commits into from
Apr 27, 2022

Conversation

@pierreprinetti
Copy link
Member

@pierreprinetti pierreprinetti commented Apr 25, 2022

No description provided.

apricote and others added 17 commits April 12, 2022 11:24
@apricote
feat: support application credential auth kubernetes-sigs#1146
d94969e 
We currently require an explicit project_id field in the clouds.yaml.
This conflicts with the usual fields for Application Credentials, as
they already include a scope, and setting another conflicts with that.

In this commit, we instead save the returned project_id from the initial
auth api call, and pass it around to all services using the Scope
struct.
@k8s-ci-robot
Merge pull request kubernetes-sigs#1189 from apricote/application-cre…
3ce2de7 
…dential-support

✨ Support Application Credential auth
@jichenjc
address CVE-2022-27191
91384af
@k8s-ci-robot
Merge pull request kubernetes-sigs#1204 from jichenjc/bug/1203
aeedb58 
address CVE-2022-27191
@apricote
rename v1beta1 to v1alpha5
311741f
@k8s-ci-robot
Merge pull request kubernetes-sigs#1198 from apricote/rename-v1beta1-…
af6f623 
…v1alpha5

⚠️ rename v1beta1 to v1alpha5
@apricote
docs: replace dead link for cloud.conf details
603e9db
@chrischdi
Fix capo v1.24 kubernetes compatibility
368bc8b 
kubeadm v1.24 removes the deprecated control-plane node label
node-role.kubernetes.io/master. This PR introduces the new label
node-role.kubernetes.io/control-plane in the CAPO tests and bumps
the CAPI dependency for compatibility to nodes provisioned using
kubeadm v1.24.

* bumps CAPI to v1.1.3
* fixes k8s v1.24 compatibility
* fixes periodics conformance ci job
* adds tolerations and usage of the new control-plane node label
* bumps e2e k8s version to v1.23.5
* bumps capo version to v1.23.2

Signed-off-by: Christian Schlotter <[email protected]>
@k8s-ci-robot
Merge pull request kubernetes-sigs#1211 from apricote/cloud-conf-dead…
0373249 
…-link

📖 replace dead link for cloud.conf details
@apricote
add apricote to capo-reviewers
1aba6e6
@k8s-ci-robot
Merge pull request kubernetes-sigs#1212 from apricote/apricote-reviewer
b580527 
🏃 Add apricote as a reviewer
@mdbooth
Remove prankul88 as a reviewer
9ac4592
@k8s-ci-robot
Merge pull request kubernetes-sigs#1213 from mdbooth/remove_prankul
cfa1a36 
🏃Remove prankul88 as a reviewer
@k8s-ci-robot
Merge pull request kubernetes-sigs#1209 from chrischdi/pr-bump-capi-v…
3431b8a 
…1-1-3

🐛  bump CAPI to v1.1.3
@anilkumar56
Improve log message
46a7cb7
@k8s-ci-robot
Merge pull request kubernetes-sigs#1202 from anilkumar56/improve_log
c3d843f 
Improve log message
@pierreprinetti
Merge upstream/main
53cc87d
@openshift-ci openshift-ci bot requested review from EmilienM and stephenfin April 25, 2022 08:32
@openshift-ci
Copy link

openshift-ci bot commented Apr 25, 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 53cc87d 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.

@pierreprinetti
Copy link
Member Author

pierreprinetti commented Apr 25, 2022

As discussed with @mdbooth, the result of the unit tests is not reliable.

@pierreprinetti
Copy link
Member Author

pierreprinetti commented Apr 25, 2022

/hold until the next upstream bump.

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

pierreprinetti commented Apr 27, 2022

@mandre @mdbooth would you be OK to release the /hold so that we can merge and test application credentials downstream sooner rather than later?

@mandre
Copy link
Member

mandre commented Apr 27, 2022

@mandre @mdbooth would you be OK to release the /hold so that we can merge and test application credentials downstream sooner rather than later?

I brought this up to Matt this morning and it appears the upstream CAPO release may be delayed a little bit due to late bug discovery. So let's bump MAPO twice, once now, and later to align with a stable release.

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 27, 2022
mandre
mandre reviewed Apr 27, 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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 27, 2022
@openshift-ci
Copy link

openshift-ci bot commented Apr 27, 2022

[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 27, 2022
@openshift-merge-robot openshift-merge-robot merged commit 268e159 into openshift:main Apr 27, 2022
@pierreprinetti pierreprinetti deleted the merge_upstream branch April 27, 2022 12:44
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

@EmilienM EmilienM Awaiting requested review from EmilienM

@stephenfin stephenfin Awaiting requested review from stephenfin

Assignees

@mandre mandre

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.

9 participants

@pierreprinetti @mandre @openshift-merge-robot @apricote @k8s-ci-robot @jichenjc @chrischdi @mdbooth @anilkumar56