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 controller-runtime and k8s.io deps #216

Merged
merged 10 commits into from
Jul 25, 2023

Conversation

bshephar
Copy link
Contributor

This change bumps controller-runtime to 0.15, k8s.io/* deps to 0.27.2 and kubebuilder to the commit hash that includes both of these controller-runtime and k8s.io upgrades.

@bshephar bshephar marked this pull request as draft June 14, 2023 03:54
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 14, 2023
This change bumps controller-runtime to 0.15 and k8s.io/* deps to 0.27.2

Signed-off-by: Brendan Shephard <bshephar@redhat.com>
@bshephar bshephar force-pushed the controller-runtime branch from 7adc05f to 8595064 Compare June 14, 2023 06:43
@bshephar bshephar force-pushed the controller-runtime branch 4 times, most recently from 67948b5 to 6410ccf Compare June 26, 2023 22:40
This commit contains:
1. Bumping and pinning of right dependencies
2. Remove Delegating client
3. Fixing NewDynamicRestMapper func signature
4. Fix cmd/ to not take client as an option
5. Use go/v4 instead of v3

Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
…ecks

Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
@bshephar bshephar force-pushed the controller-runtime branch from 505383e to 85653be Compare July 6, 2023 23:13
@bshephar bshephar marked this pull request as ready for review July 6, 2023 23:17
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 6, 2023
@bshephar bshephar force-pushed the controller-runtime branch 2 times, most recently from f4afaa9 to 5e09267 Compare July 6, 2023 23:30
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.

@bshephar could you run make generate again and commit the changes. Looks like CI is failing for sanity checks: https://github.com/operator-framework/helm-operator-plugins/actions/runs/5481106188/jobs/9998233497?pr=216#step:8:1

@jmrodri
Copy link
Member

jmrodri commented Jul 12, 2023

@bshephar @everettraven @varshaprasad96 looks like the sanity test is failing. It looks like the go.mod isn't matching. Might be a difference between authors version of go and the one used in CI or something else. This needs to be addressed to avoid issues in other PRs.

The go-apidiff is okay and expected.

Signed-off-by: Varsha Prasad Narsing <varshaprasad96@gmail.com>
@bshephar bshephar force-pushed the controller-runtime branch from 063f554 to 5c7c077 Compare July 15, 2023 23:08
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.

@bshephar could you bump golangci-lint to 1.51.2 at these places:

This should fix the issues with CI. In hindsight, we should remove the separate CI run that runs linter again, as that is anyway done as a part of test action.

If that is addressed, I think the PR should be good to go.

@bshephar bshephar force-pushed the controller-runtime branch 2 times, most recently from 222ba73 to d7cb9ff Compare July 24, 2023 21:18
This change bumps controller-runtime to 0.15 and k8s.io/* deps to 0.27.2

Signed-off-by: Brendan Shephard <bshephar@redhat.com>
@bshephar bshephar force-pushed the controller-runtime branch from d7cb9ff to 724035b Compare July 24, 2023 23:58
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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 25, 2023
@varshaprasad96
Copy link
Member

/override go-apidiff

@openshift-ci
Copy link

openshift-ci bot commented Jul 25, 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.

@varshaprasad96
Copy link
Member

APIDiff is expected on this PR. Merging, since the CI passes with current changes.

@varshaprasad96 varshaprasad96 merged commit 8c7e1e2 into operator-framework:main Jul 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants