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

update the dependency pmezard/go-difflib #73941

Merged
merged 1 commit into from
Feb 13, 2019

Conversation

neolit123
Copy link
Member

@neolit123 neolit123 commented Feb 11, 2019

What this PR does / why we need it:
A fmt.Sprintf() bug was fixed upstream.
Use the latest SHA from upstream.

Which issue(s) this PR fixes:

Fixes kubernetes/kubeadm#1368

Special notes for your reviewer:
followed the guide here:
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/godep.md

but hack/run-in-gopath.sh hack/godep-save.sh fails for me with:

+++ [0212 01:54:31] Running godep save - this might take a while
godep: Package (github.com/bazelbuild/bazel-gazelle/cmd/gazelle) not found
!!! Error in hack/godep-save.sh:76
  Error in hack/godep-save.sh:76. 'GOPATH="${GOPATH}:$(pwd)/staging" ${KUBE_GODEP:?} save "${REQUIRED_BINS[@]}"' exited with status 1
Call stack:
  1: hack/godep-save.sh:76 main(...)
Exiting with status 1

so i sort of bootlegged the update.

Does this PR introduce a user-facing change?:

kubeadm: fix a bug in the underlying library for diff related to characters like '%'

/assign @dims @cblecker
/cc @chuckha
/area kubeadm
/kind bug
/priority important-soon

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Feb 11, 2019
@k8s-ci-robot k8s-ci-robot added area/kubeadm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. kind/bug Categorizes issue or PR as related to a bug. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels Feb 11, 2019
@k8s-ci-robot k8s-ci-robot added needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 11, 2019
@neolit123
Copy link
Member Author

/sig cluster-lifecycle

@k8s-ci-robot k8s-ci-robot added sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Feb 11, 2019
@cblecker
Copy link
Member

Will review after tests pass.

A fmt.Sprintf() bug was fixed upstream.
Use the latest SHA from upstream.
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. area/apiserver kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/cli Categorizes an issue or PR as relevant to SIG CLI. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 12, 2019
@neolit123
Copy link
Member Author

@cblecker relevant CI seems to have passed.

Copy link
Contributor

@chuckha chuckha left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks for figuring out how to do this!

@neolit123
Copy link
Member Author

Looks good to me. Thanks for figuring out how to do this!

the existing process assumes a fast computer with fast internet.
next time i will write a small bash/sed script to update this in a equivalent way (for my local usage only).

@dims
Copy link
Member

dims commented Feb 12, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 12, 2019
@dims
Copy link
Member

dims commented Feb 12, 2019

@neolit123 right the existing docs is a hammer, but once you get the hang of it ... you can do a bunch of simple things by hand

@cblecker
Copy link
Member

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cblecker, neolit123

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 Feb 12, 2019
@k8s-ci-robot k8s-ci-robot merged commit 6949a81 into kubernetes:master Feb 13, 2019
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. area/apiserver area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove or fix dependency: difflib
5 participants