Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Jan 2, 2024

These had snuck in back in 80e7b4d (#3756), 81136ed (#3770), and similar. Having the same package imported under multiple names doesn't have any functional impact, but it's less confusing to read if the package is refered to with a consistent prefix. This commit addresses all the duplicates turned up with:

$ git grep -c '"github.com/openshift/api/machineconfiguration/v1"'  | grep '[.]go:' | grep -v 'vendor/\|:1$'

@wking wking force-pushed the dedup-machine-config-v1-import branch from 6ba8b34 to 0f3a73a Compare January 2, 2024 22:50
These had snuck in back in 80e7b4d (keep track of certs in
ControllerConfigStatus, 2023-06-20, openshift#3756), 81136ed (implement the
ability for the MCO to handle image registry certificates, 2023-06-27, openshift#3770),
and similar.  Having the same package imported under multiple names
doesn't have any functional impact, but it's less confusing to read if
the package is refered to with a consistent prefix.  This commit
addresses all the duplicates turned up with:

  $ git grep -c '"github.com/openshift/api/machineconfiguration/v1"'  | grep '[.]go:' | grep -v 'vendor/\|:1$'
@wking wking force-pushed the dedup-machine-config-v1-import branch from 0f3a73a to 9fe86fd Compare January 2, 2024 23:09
@wking wking changed the title pkg: Deduplicate api/machineconfiguration/v1 imports NO-ISSUE: pkg: Deduplicate api/machineconfiguration/v1 imports Jan 2, 2024
@openshift-ci-robot
Copy link
Contributor

@wking: This pull request explicitly references no jira issue.

Details

In response to this:

These had snuck in back in 80e7b4d (#3756), 81136ed (#3770), and similar. Having the same package imported under multiple names doesn't have any functional impact, but it's less confusing to read if the package is refered to with a consistent prefix. This commit addresses all the duplicates turned up with:

$ git grep -c '"github.com/openshift/api/machineconfiguration/v1"'  | grep '[.]go:' | grep -v 'vendor/\|:1$'

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 2, 2024
Copy link
Contributor

@yuqi-zhang yuqi-zhang left a comment

Choose a reason for hiding this comment

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

/lgtm

Thanks for catching this!

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 4, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 4, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wking, yuqi-zhang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Jan 4, 2024
@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD e0dda82 and 2 for PR HEAD 9fe86fd in total

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 854a866 and 1 for PR HEAD 9fe86fd in total

@wking
Copy link
Member Author

wking commented Jan 6, 2024

/retest-required

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 7dae64a and 0 for PR HEAD 9fe86fd in total

@openshift-ci-robot
Copy link
Contributor

/hold

Revision 9fe86fd was retested 3 times: holding

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 8, 2024
@yuqi-zhang
Copy link
Contributor

/hold cancel
/override ci/prow/e2e-gcp-op-single-node

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 8, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 8, 2024

@yuqi-zhang: Overrode contexts on behalf of yuqi-zhang: ci/prow/e2e-gcp-op-single-node

Details

In response to this:

/hold cancel
/override ci/prow/e2e-gcp-op-single-node

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-ci
Copy link
Contributor

openshift-ci bot commented Jan 8, 2024

@wking: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-op-layering 9fe86fd link false /test e2e-gcp-op-layering
ci/prow/okd-scos-e2e-aws-ovn 9fe86fd link false /test okd-scos-e2e-aws-ovn

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 7dae64a and 2 for PR HEAD 9fe86fd in total

@openshift-merge-bot openshift-merge-bot bot merged commit 84da3e5 into openshift:master Jan 9, 2024
@wking wking deleted the dedup-machine-config-v1-import branch January 9, 2024 03:41
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build openshift-proxy-pull-test-container-v4.16.0-202401090832.p0.g84da3e5.assembly.stream for distgit openshift-proxy-pull-test.
All builds following this will include this PR.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants