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

Package k8s.io/utils/pointer conflict #1407

Merged

Conversation

qu1queee
Copy link
Contributor

Changes

Rollback the k8s.io/utils/ptr dependency to pointer

We have a conflict with our version of controller-runtime, where the
k8s.io/utils/pointer pkg is used, while in our go.mod we favor the k8s.io/utils/ptr.

This conflict leads to issues when calling make generate, at
generate-fakes.sh. This commit fixes that, until controller-runtime
provide a release with the k8s.io/utils/ptr dependency.

Submitter Checklist

  • Includes tests if functionality changed/was added
  • Includes docs if changes are user-facing
  • Set a kind label on this PR
  • Release notes block has been filled in, or marked NONE

See the contributor guide
for details on coding conventions, github and prow interactions, and the code review process.

Release Notes

Downgrade k8s.io/utils/ptr to k8s.io/utils/pointer due to dependency conflicts with controller-runtime pkg

We have a conflict with our version of controller-runtime, where the
k8s.io/utils/pointer pkg is used, while in our go.mod we favor the
k8s.io/utils/ptr.

This conflict leads to issues when calling `make generate`, at
generate-fakes.sh. This commit fixes that, until controller-runtime
provide a release with the k8s.io/utils/ptr dependency.
@qu1queee qu1queee added the kind/bug Categorizes issue or PR as related to a bug. label Oct 18, 2023
@openshift-ci openshift-ci bot added the release-note Label for when a PR has specified a release note label Oct 18, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 18, 2023
@SaschaSchwarze0 SaschaSchwarze0 added this to the release-v0.12.0 milestone Oct 18, 2023
Copy link
Member

@SaschaSchwarze0 SaschaSchwarze0 left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 18, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 18, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SaschaSchwarze0

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 Oct 18, 2023
@qu1queee qu1queee removed the request for review from adambkaplan October 18, 2023 12:13
@openshift-ci openshift-ci bot merged commit 53e9df3 into shipwright-io:main Oct 18, 2023
13 checks passed
@qu1queee qu1queee deleted the qu1queee/utils_pointer_conflict branch October 18, 2023 14:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Label for when a PR has specified a release note size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants