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 Azure SDK. #47140

Merged
merged 5 commits into from Jul 12, 2017
Merged

Update Azure SDK. #47140

merged 5 commits into from Jul 12, 2017

Conversation

brendandburns
Copy link
Contributor

Updates to the Azure SDK to pick up new APIs.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 7, 2017
@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Jun 7, 2017
@brendandburns
Copy link
Contributor Author

ugh, something is broken here...

@brendandburns brendandburns changed the title Update Azure SDK. WIP: Update Azure SDK. Jun 7, 2017
@thockin thockin removed their assignment Jun 8, 2017
@k8s-github-robot k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 8, 2017
@brendandburns brendandburns changed the title WIP: Update Azure SDK. Update Azure SDK. Jun 13, 2017
@brendandburns brendandburns added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Jun 13, 2017
@brendandburns brendandburns added this to the v1.8 milestone Jun 13, 2017
@brendandburns
Copy link
Contributor Author

/retest

1 similar comment
@brendandburns
Copy link
Contributor Author

/retest

@brendandburns
Copy link
Contributor Author

@jbeda this is good to go (once a flaky tests passes) can I get an LGTM?

@brendandburns
Copy link
Contributor Author

@rootfs @colemickens @jbeda This is ready to go (again), can I get an LGTM? There is nothing here except SDK updates and necessary small changes to the azure client code.

Thanks!

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 12, 2017
@k8s-github-robot k8s-github-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 12, 2017
@rootfs
Copy link
Contributor

rootfs commented Jul 12, 2017

/lgtm

thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 12, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: brendandburns, jbeda, rootfs

Associated issue requirement bypassed by: brendandburns

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:
  • OWNERS [brendandburns,jbeda]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 48672, 47140, 48709, 48786, 48757)

@k8s-github-robot k8s-github-robot merged commit 345d719 into kubernetes:master Jul 12, 2017
@ixdy
Copy link
Member

ixdy commented Jul 13, 2017

I think this may have broken the crossbuild.

From https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/ci-kubernetes-cross-build/2320/:

I0712 10:13:02.637] +++ [0712 10:11:46] windows/amd64: go build started
I0712 10:13:02.637] # k8s.io/kubernetes/vendor/github.com/docker/docker/pkg/term/windows
I0712 10:13:02.637] vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go:139: undefined: winterm.WORD
I0712 10:13:02.637] vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go:146: undefined: winterm.WORD
I0712 10:13:02.637] vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go:210: undefined: winterm.WORD
I0712 10:13:02.637] vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go:210: undefined: winterm.DWORD
I0712 10:13:02.638] vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go:226: undefined: winterm.DWORD

@ixdy
Copy link
Member

ixdy commented Jul 13, 2017

looks like moby/moby@fab67ab made it into docker v1.12, but we vendor v1.11. :\

k8s-github-robot pushed a commit that referenced this pull request Jul 17, 2017
Automatic merge from submit-queue (batch tested with PRs 48997, 48595, 48898, 48711, 48972)

Revert "Use go-ansiterm version matching docker/pkg/term/windows v1.11"

This reverts commit 72044a1.

**What this PR does / why we need it**: earlier this week, #47140 updated the vendored azure dependencies, which broke the windows build because the docker dependencies were too old. #48933 was merged, which reverted part of #47140 and fixed the build, but then #48308, which updated the vendored docker dependencies, broke the windows build again.

By reverting #48933, we should get back to a working build, I hope.

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #48887

**Release note**:

```release-note
NONE
```
/release-note-none
/test pull-kubernetes-cross
/assign @brendandburns 
cc @karataliu @yguo0905 @yujuhong @dchen1107
@wojtek-t wojtek-t modified the milestones: v1.7, v1.8 Jul 18, 2017
seanknox pushed a commit to seanknox/kubernetes that referenced this pull request Jul 18, 2017
@wojtek-t wojtek-t added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 18, 2017
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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants