Skip to content
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

Update k8s dependencies to v0.27.2 and controller-runtime to v0.15.0 #114

Merged
merged 1 commit into from
Jun 7, 2023
Merged

Update k8s dependencies to v0.27.2 and controller-runtime to v0.15.0 #114

merged 1 commit into from
Jun 7, 2023

Conversation

tiraboschi
Copy link
Contributor

@tiraboschi tiraboschi commented May 5, 2023 •
edited
Loading

Description of the change:
Update k8s dependencies to v0.27.1 and controller-runtime to v0.15.0

Motivation for the change:
keep the pace with k8s development

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 5, 2023
@openshift-ci
Copy link

openshift-ci bot commented May 5, 2023

Hi @tiraboschi. Thanks for your PR.

I'm waiting for a operator-framework member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

tiraboschi
tiraboschi commented May 5, 2023
View reviewed changes
conditions/conditions_test.go
@@ -74,7 +74,7 @@ var _ = Describe("Condition", func() {
sch := runtime.NewScheme()
err = apiv2.AddToScheme(sch)
Expect(err).NotTo(HaveOccurred())
cl = fake.NewClientBuilder().WithScheme(sch).Build()
cl = fake.NewClientBuilder().WithScheme(sch).WithStatusSubresource(operatorCond).Build()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

see: kubernetes-sigs/controller-runtime#2259

handler/example_test.go
@@ -54,7 +54,7 @@ func ExampleNewPause() {
if err != nil {
os.Exit(1)
}
if err := c.Watch(&source.Kind{Type: &v1.Pod{}}, pause); err != nil {
if err := c.Watch(source.Kind(mgr.GetCache(), &v1.Pod{}), pause); err != nil {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

see: kubernetes-sigs/controller-runtime#2120

@tiraboschi
Copy link
Contributor Author

@rashmigottipati FYI

@tiraboschi tiraboschi force-pushed the k8s_v0.27.1 branch 2 times, most recently from 3a8eb3a to fe56e57 Compare May 22, 2023 10:09
tiraboschi
tiraboschi commented May 22, 2023
View reviewed changes
handler/enqueue_annotation_test.go
var q workqueue.RateLimitingInterface
var instance EnqueueRequestForAnnotation
var pod *corev1.Pod
var podOwner *corev1.Pod

BeforeEach(func() {
q = controllertest.Queue{Interface: workqueue.New()}
q = &controllertest.Queue{Interface: workqueue.New()}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

see: kubernetes-sigs/controller-runtime#2325

handler/instrumented_enqueue_object_test.go
@@ -39,7 +43,7 @@ var _ = Describe("InstrumentedEnqueueRequestForObject", func() {
registry.MustRegister(metrics.ResourceCreatedAt)

BeforeEach(func() {
q = controllertest.Queue{Interface: workqueue.New()}
q = &controllertest.Queue{Interface: workqueue.New()}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

see: kubernetes-sigs/controller-runtime#2325

internal/annotation/filter_test.go
err error
q workqueue.RateLimitingInterface
pod *corev1.Pod
)
BeforeEach(func() {
q = controllertest.Queue{Interface: workqueue.New()}
q = &controllertest.Queue{Interface: workqueue.New()}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

see: kubernetes-sigs/controller-runtime#2325

@tiraboschi tiraboschi changed the title Update k8s dependencies to v0.27.1 and controller-runtime to v0.15.0-alpha.0 Update k8s dependencies to v0.27.2 and controller-runtime to v0.15.0-beta.0 May 22, 2023
@tiraboschi
Update k8s dependencies to v0.27.2 and controller-runtime to v0.15.0
81a1707 
- update k8s dependencies to v0.27.2
- update controller-runtime to v0.15.0
- add context to EventHandler calls, see: kubernetes-sigs/controller-runtime#2139

Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>
@tiraboschi tiraboschi changed the title Update k8s dependencies to v0.27.2 and controller-runtime to v0.15.0-beta.0 Update k8s dependencies to v0.27.2 and controller-runtime to v0.15.0 May 23, 2023
@kschoche kschoche mentioned this pull request May 30, 2023
Closed
@rashmigottipati
Copy link
Member

/retest

@rashmigottipati
Copy link
Member

/ok-to-test

@openshift-ci openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 1, 2023
rashmigottipati
rashmigottipati approved these changes Jun 7, 2023
View reviewed changes
Copy link
Member

@rashmigottipati rashmigottipati left a comment •
edited
Loading

Choose a reason for hiding this comment

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

/lgtm

The apidiff tests are failing due to the author adding ccontext.Context parameter to EnqueueRequestForAnnotation and InstrumentedEnqueueRequestForObject handlers to comply with controller-runtime v0.15.0. Wondering if we can override this and force merge this PR.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 7, 2023
varshaprasad96
varshaprasad96 approved these changes Jun 7, 2023
View reviewed changes
Copy link
Member

@varshaprasad96 varshaprasad96 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

go.mod
github.com/onsi/gomega v1.24.1
github.com/go-logr/logr v1.2.4
github.com/onsi/ginkgo/v2 v2.9.5
github.com/onsi/gomega v1.27.7
github.com/operator-framework/api v0.17.4-0.20230223191600-0131a6301e42
Copy link
Member

Choose a reason for hiding this comment

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

TODO: we would have to bump o-f/api once the k8s bump in it is done.

@openshift-ci
Copy link

openshift-ci bot commented Jun 7, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: varshaprasad96

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 7, 2023
@varshaprasad96
Copy link
Member

/override go-apidiff

@openshift-ci
Copy link

openshift-ci bot commented Jun 7, 2023

@varshaprasad96: Overrode contexts on behalf of varshaprasad96: go-apidiff

In response to this:

/override go-apidiff

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.

@openshift-merge-robot openshift-merge-robot merged commit ecb9be4 into operator-framework:main Jun 7, 2023
@tiraboschi tiraboschi deleted the k8s_v0.27.1 branch June 7, 2023 14:07
@iblancasa iblancasa mentioned this pull request Jun 8, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rashmigottipati rashmigottipati rashmigottipati approved these changes

@varshaprasad96 varshaprasad96 varshaprasad96 approved these changes

@camilamacedo86 camilamacedo86 Awaiting requested review from camilamacedo86

Assignees

@rashmigottipati rashmigottipati

@varshaprasad96 varshaprasad96

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tiraboschi @rashmigottipati @varshaprasad96 @openshift-merge-robot