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.

Sign up for GitHub

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

Jump to bottom

fix: license issue in blob disk feature #92824

Merged
merged 1 commit into from
Jul 10, 2020
Merged

fix: license issue in blob disk feature #92824

merged 1 commit into from
Jul 10, 2020
+22 −28

Conversation

andyzhangx
Copy link
Member

@andyzhangx andyzhangx commented Jul 6, 2020 •
edited
Loading

What type of PR is this?
/kind cleanup

What this PR does / why we need it:
This PR fixed the potential license issue mentioned in 92704.

The problematic code was removed upstream - rubiojr/go-vhd#3, rubiojr/go-vhd#4, rubiojr/go-vhd#5

Which issue(s) this PR fixes:

Fixes #92704

Special notes for your reviewer:
cc @nikhita @dims

hack/update-vendor.sh

Does this PR introduce a user-facing change?:

fix: license issue in blob disk feature

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 6, 2020
@andyzhangx andyzhangx mentioned this pull request Jul 6, 2020
Closed
@k8s-ci-robot k8s-ci-robot added area/cloudprovider area/dependency Issues or PRs related to dependency changes sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 6, 2020
@andyzhangx
Copy link
Member Author

/priority important-soon
/sig cloud-provider

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 6, 2020
@k8s-ci-robot k8s-ci-robot requested review from andrewsykim, dchen1107 and a team July 6, 2020 12:23
@andyzhangx
Copy link
Member Author

/test pull-kubernetes-e2e-aks-engine-azure

@dims
Copy link
Member

dims commented Jul 6, 2020

/approve
/lgtm

/assign @liggitt @smarterclayton

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

andyzhangx commented Jul 6, 2020 •
edited
Loading

@chewong @jackfrancis Are you aware of this test failure? Looks like transient issue. Will rerun.
https://prow.k8s.io/view/gcs/kubernetes-jenkins/pr-logs/pull/92824/pull-kubernetes-e2e-aks-engine-azure/1280130243327168512

• Failure [74.430 seconds]
[k8s.io] [sig-node] Events
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/framework/framework.go:592
  should be sent by kubelets and the scheduler about pods scheduling and running  [Conformance] [It]
  /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/framework/framework.go:597
  Jul  6 13:56:56.969: Unexpected error:
      
      <*errors.errorString | 0xc00009de50>: {
          s: "timed out waiting for the condition",
      }
      timed out waiting for the condition
  occurred
  /go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/node/events.go:97
------------------------------
{"msg":"FAILED [k8s.io] [sig-node] Events should be sent by kubelets and the scheduler about pods scheduling and running  [Conformance]","total":-1,"completed":9,"skipped":184,"failed":1,"failures":["[k8s.io] [sig-node] Events should be sent by kubelets and the scheduler about pods scheduling and running  [Conformance]"]}
skipped 207 lines unfold_more
[Fail] [k8s.io] [sig-node] Events [It] should be sent by kubelets and the scheduler about pods scheduling and running  [Conformance] 
/go/src/k8s.io/kubernetes/_output/dockerized/go/src/k8s.io/kubernetes/test/e2e/node/events.go:97
Ran 285 of 5208 Specs in 437.211 seconds
FAIL! -- 284 Passed | 1 Failed | 0 Pending | 4923 Skipped

@andyzhangx
Copy link
Member Author

/retest

@liggitt
Copy link
Member

liggitt commented Jul 7, 2020

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, dims, liggitt

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 Jul 7, 2020
@andyzhangx
Copy link
Member Author

/test pull-kubernetes-e2e-aks-engine-azure

@jackfrancis
Copy link
Contributor

@andyzhangx Not aware, but this change makes sense

@liggitt liggitt added this to the v1.19 milestone Jul 8, 2020
@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jul 9, 2020
@k8s-ci-robot k8s-ci-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 10, 2020
@andyzhangx
Copy link
Member Author

@dims rebased, PTAL, thanks.

@liggitt
Copy link
Member

liggitt commented Jul 10, 2020

/lgtm

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

/test pull-kubernetes-e2e-azure-file
/test pull-kubernetes-e2e-azure-disk

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

1 similar comment
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit c9c5c23 into kubernetes:master Jul 10, 2020
@github-actions github-actions bot mentioned this pull request Jul 14, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

@rubiojr rubiojr rubiojr left review comments

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@dchen1107 dchen1107 Awaiting requested review from dchen1107

Assignees

@dims dims

@liggitt liggitt

@smarterclayton smarterclayton

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/cloudprovider area/dependency Issues or PRs related to dependency changes cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.

Potential license conflict
8 participants
@andyzhangx @dims @liggitt @k8s-ci-robot @jackfrancis @fejta-bot @rubiojr @smarterclayton