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

Fix weaveworks/mesh vendoring #8797

Merged
merged 1 commit into from
Mar 25, 2020
Merged

Conversation

rifelpet
Copy link
Member

The make gomod target removes peer_name_mac.go and performs updates to peer_name_hash.go.

kops/Makefile

Lines 462 to 466 in b29284c

gomod: gomod-prereqs
GO111MODULE=on go mod vendor
# Switch weavemesh to use peer_name_hash - bazel rule-go doesn't support build tags yet
rm vendor/github.com/weaveworks/mesh/peer_name_mac.go
sed -i -e 's/peer_name_hash/!peer_name_mac/g' vendor/github.com/weaveworks/mesh/peer_name_hash.go

It looks like peer_name_mac.go was accidentally checked in, so I'm rerunning make gomod on master and these are the resulting changes.

closes #8796

The `make gomod` target removes peer_name_mac.go and performs updates to peer_name_hash.go.

It looks like peer_name_mac.go was accidentally checked in, so I'm rerunning `make gomod` on master and these are the resulting changes.
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 25, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rifelpet

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 25, 2020
@hakman
Copy link
Member

hakman commented Mar 25, 2020

/retest
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 25, 2020
@rifelpet
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit c6a75d3 into kubernetes:master Mar 25, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Mar 25, 2020
@rifelpet rifelpet deleted the weaveworks branch August 6, 2020 02:50
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

HA prow jobs failing due to gossip error
3 participants