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 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

@neolit123

This comment has been minimized.

Copy link
Member Author

neolit123 commented Feb 11, 2019

/sig cluster-lifecycle

@cblecker

This comment has been minimized.

Copy link
Member

cblecker commented Feb 11, 2019

Will review after tests pass.

@neolit123 neolit123 force-pushed the neolit123:update-go-difflib branch from 6af2a99 to dcda4d9 Feb 12, 2019

update the dependency pmezard/go-difflib
A fmt.Sprintf() bug was fixed upstream.
Use the latest SHA from upstream.
@neolit123

This comment has been minimized.

Copy link
Member Author

neolit123 commented Feb 12, 2019

@cblecker relevant CI seems to have passed.

@chuckha
Copy link
Member

chuckha left a comment

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

@neolit123

This comment has been minimized.

Copy link
Member Author

neolit123 commented Feb 12, 2019

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

This comment has been minimized.

Copy link
Member

dims commented Feb 12, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Feb 12, 2019

@dims

This comment has been minimized.

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

This comment has been minimized.

Copy link
Member

cblecker commented Feb 12, 2019

/lgtm
/approve

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Feb 12, 2019

[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 merged commit 6949a81 into kubernetes:master Feb 13, 2019

17 checks passed

cla/linuxfoundation neolit123 authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-godeps Job succeeded.
Details
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce-big Job succeeded.
Details
pull-kubernetes-local-e2e Skipped
pull-kubernetes-local-e2e-containerized Skipped
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
pull-publishing-bot-validate Skipped
tide In merge pool.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.