Skip to content

USHIFT-913: fix vendoring microshift in etcd/#1404

Merged
openshift-merge-robot merged 3 commits intoopenshift:mainfrom
pmtk:vendor-microshift-in-etcd
Feb 23, 2023
Merged

USHIFT-913: fix vendoring microshift in etcd/#1404
openshift-merge-robot merged 3 commits intoopenshift:mainfrom
pmtk:vendor-microshift-in-etcd

Conversation

@pmtk
Copy link
Copy Markdown
Member

@pmtk pmtk commented Feb 22, 2023

Fixes etcd/go.mod's replace by removing unnecessary / from github.com/openshift/microshift.

This will result in go mod vendor to copy microshift's code from the local directory. Previously etcd/vendor/github.com/openshift/microshift/pkg/config was not kept up to date (rebase.sh didn't handled it because it didn't have the rebase command) and missing latest changes and posing challenges when updating MicroShiftConfig and using updated version in microshift-etcd.

@openshift-ci openshift-ci bot requested review from dhellmann and stlaz February 22, 2023 17:46
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 22, 2023
@pmtk pmtk changed the title go get & vendor microshift in etcd/go.mod USHIFT-913: go get & vendor microshift in etcd/go.mod Feb 22, 2023
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 22, 2023
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Feb 22, 2023

@pmtk: This pull request references USHIFT-913 which is a valid jira issue.

Details

In response to this:

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.

@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Feb 22, 2023

/hold
I need to address this in rebase procedures

@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 Feb 22, 2023
@pmtk pmtk force-pushed the vendor-microshift-in-etcd branch from 4b45442 to 55ff7a6 Compare February 23, 2023 09:12
@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Feb 23, 2023

/unhold

@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 Feb 23, 2023
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Feb 23, 2023

@pmtk: This pull request references USHIFT-913 which is a valid jira issue.

Details

In response to this:

Fixes etcd/go.mod's replace by removing unnecessary / from github.com/openshift/microshift.

This will result in go mod vendor to copy microshift's code from the local directory. Previously etcd/vendor/github.com/openshift/microshift/pkg/config was not kept up to date (rebase.sh didn't handled it because it didn't have the rebase command) and missing latest changes and posing challenges when updating MicroShiftConfig and using updated version in microshift-etcd.

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.

@pmtk
Copy link
Copy Markdown
Member Author

pmtk commented Feb 23, 2023

Commits are logically separated, but not functional without each other (all commits on main should be buildable)
/label tide/merge-method-squash

@openshift-ci openshift-ci bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Feb 23, 2023
@pmtk pmtk changed the title USHIFT-913: go get & vendor microshift in etcd/go.mod USHIFT-913: fix vendoring microshift in etcd/ Feb 23, 2023
@dusk125
Copy link
Copy Markdown
Contributor

dusk125 commented Feb 23, 2023

/lgtm

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 23, 2023
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 23, 2023
@pmtk pmtk force-pushed the vendor-microshift-in-etcd branch from 55ff7a6 to dc81c7b Compare February 23, 2023 10:59
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 23, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 23, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Feb 23, 2023

@pmtk: all tests passed!

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.

@dusk125
Copy link
Copy Markdown
Contributor

dusk125 commented Feb 23, 2023

/lgtm

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

openshift-ci bot commented Feb 23, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dusk125, pmtk

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-merge-robot openshift-merge-robot merged commit cbcfd90 into openshift:main Feb 23, 2023
@pmtk pmtk deleted the vendor-microshift-in-etcd branch February 23, 2023 14:00
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. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants