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.

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

Bump sigs.k8s.io/controller-runtime to 16.3 #25

Merged
merged 8 commits into from
Nov 15, 2023

Conversation

akalenyu
Copy link
Contributor

@akalenyu akalenyu commented Nov 2, 2023

Commits are a mess. Will try to restructure

…perator

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
This reverts commit 69b30de.

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
@kubevirt-bot kubevirt-bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/XXL labels Nov 2, 2023
@akalenyu
Copy link
Contributor Author

akalenyu commented Nov 2, 2023

@Barakmor1 @mhenriks

Comment on lines 125 to 128
// src := args.mockController.WatchCalls[0].Src
// // kind, ok := src.(*source.Kind)
// // Expect(ok).To(BeTrue())
// // Expect(kind.Type).To(BeAssignableToTypeOf(&testcr.Config{}))
Copy link
Member

Choose a reason for hiding this comment

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

are these leftovers?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah should find a way to keep testing this

@@ -609,10 +608,12 @@ var _ = Describe("Reconciler", func() {
//Modify CRD to be of previousVersion
_ = args.reconciler.CrSetVersion(args.config, prevVersion)
//mark CR for deletion
args.config.SetDeletionTimestamp(&metav1.Time{Time: time.Now()})
// args.config.SetDeletionTimestamp(&metav1.Time{Time: time.Now()})
Copy link
Member

Choose a reason for hiding this comment

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

leftovers?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yup

Comment on lines 736 to 737
getCfg := func() cache.Cache {
return nil
}
Copy link
Member

Choose a reason for hiding this comment

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

nit:

	getCache := func() cache.Cache {
		return nil
	}
	

Comment on lines +97 to +101
Cache: cache.Options{
DefaultNamespaces: map[string]cache.Config{
namespace: {},
},
},
Copy link
Member

Choose a reason for hiding this comment

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

why not 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.

wdym? this is needed to keep the behavior the same as before (Namespace: namespace)

Copy link
Member

Choose a reason for hiding this comment

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

Never mind you are right.

@@ -566,7 +567,7 @@ func (r *Reconciler) WatchResourceTypes(resources ...client.Object) error {
predicates := []predicate.Predicate{sdk.NewIgnoreLeaderElectionPredicate()}

if err := r.controller.Watch(source.Kind(r.getCache(), resource), eventHandler, predicates...); err != nil {
if meta.IsNoMatchError(err) {
if meta.IsNoMatchError(err) || strings.Contains(err.Error(), "failed to find API group") {
Copy link
Member

Choose a reason for hiding this comment

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

+1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I would love if we could not do this :( kubernetes-sigs/controller-runtime#2425 (comment)

@Barakmor1
Copy link
Member

Barakmor1 commented Nov 5, 2023

I think it looks great overall, but I left some comments, mostly nits.
/lgtm

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 5, 2023
@vladikr
Copy link
Member

vladikr commented Nov 15, 2023

@mhenriks can you please take a look?

@mhenriks
Copy link
Member

@vladikr I think @akalenyu was planning some updates?

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
@kubevirt-bot kubevirt-bot removed the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2023
@akalenyu
Copy link
Contributor Author

@Barakmor1 @vladikr @mhenriks PTAL 🙏

@mhenriks
Copy link
Member

/release-note-none

@kubevirt-bot kubevirt-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 15, 2023
@mhenriks
Copy link
Member

/lgtm
/approve

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2023
@kubevirt-bot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: akalenyu, mhenriks

The full list of commands accepted by this bot can be found 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

@mhenriks mhenriks merged commit ad62b84 into kubevirt:master Nov 15, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XXL
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants