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

support listing works with its labels #135

Merged
merged 1 commit into from
Jun 25, 2024
Merged

support listing works with its labels #135

merged 1 commit into from
Jun 25, 2024

Conversation

skeeey
Copy link
Contributor

@skeeey skeeey commented Jun 19, 2024

No description provided.

@skeeey
Copy link
Contributor Author

skeeey commented Jun 19, 2024 •
edited
Loading

should wait for #133 and #136 is merged

@machi1990 machi1990 mentioned this pull request Jun 21, 2024
Merged
@skeeey skeeey force-pushed the search branch 2 times, most recently from 2af893b to d80a6e1 Compare June 21, 2024 10:46
@skeeey skeeey changed the title WIP: support listing works with its labels support listing works with its labels Jun 24, 2024
@machi1990
Copy link
Contributor

lgtm

Once merged, I can test it against the client I am building.

clyang82
clyang82 reviewed Jun 25, 2024
View reviewed changes
pkg/client/cloudevents/grpcsource/util.go Outdated
}

notEqualsLabels = append(notEqualsLabels, fmt.Sprintf(`payload->'metadata'->'labels'->>'%s'<>'%s'`,
requirement.Key(), values.List()[0]))
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe extract payload->'metadata'->'labels' as a constant since it is using in many places.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

pkg/client/cloudevents/grpcsource/util.go
labelSearch = append(labelSearch, notEqualsLabels...)
labelSearch = append(labelSearch, existsKeys...)
labelSearch = append(labelSearch, doesNotExistKeys...)
return labelSelector, strings.Join(labelSearch, " and "), true, nil
Copy link
Contributor

Choose a reason for hiding this comment

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

Does kube label selector support or?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no, it does not

@clyang82
Copy link
Contributor

/ok-to-test

clyang82
clyang82 approved these changes Jun 25, 2024
View reviewed changes
Copy link
Contributor

@clyang82 clyang82 left a comment

Choose a reason for hiding this comment

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

LGTM

@clyang82 clyang82 merged commit d5654af into openshift-online:main Jun 25, 2024
5 checks passed
@machi1990
Copy link
Contributor

lgtm

Once merged, I can test it against the client I am building.

Just an FYI; I've tested the PR with a code similar to this


l := &corev1.NamespaceList{}

err = client.List(ctx, l, k8sClient.MatchingLabels(map[string]string{
"key": "label",
}))

and works as expected. Thanks @skeeey @clyang82 @qiujian16

@skeeey skeeey deleted the search branch July 1, 2024 03:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@machi1990 machi1990 machi1990 left review comments

@clyang82 clyang82 clyang82 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@skeeey @machi1990 @clyang82