Skip to content

Fix threshold notifier build tags#50938

Merged
k8s-github-robot merged 1 commit intokubernetes:masterfrom
cblecker:threshold-crossbuild
Sep 3, 2017
Merged

Fix threshold notifier build tags#50938
k8s-github-robot merged 1 commit intokubernetes:masterfrom
cblecker:threshold-crossbuild

Conversation

@cblecker
Copy link
Copy Markdown
Member

What this PR does / why we need it:
Cross building from darwin is currently broken on the following error:

# k8s.io/kubernetes/pkg/kubelet/eviction
pkg/kubelet/eviction/threshold_notifier_unsupported.go:25: NewMemCGThresholdNotifier redeclared in this block
        previous declaration at pkg/kubelet/eviction/threshold_notifier_linux.go:38

It looks like #49300 broke the build tags introduced in #38630 and #37384. This fixes the build tag on threshold_notifier_unsupported.go as the cgo requirement was removed from threshold_notifier_linux.go.

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

Special notes for your reviewer:

Release note:

NONE

This was preventing cross builds from darwin
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 18, 2017
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels Aug 18, 2017
@cblecker
Copy link
Copy Markdown
Member Author

cc @derekwaynecarr @ncdc @kubernetes/sig-node-pr-reviews

@k8s-ci-robot k8s-ci-robot added the sig/node Categorizes an issue or PR as relevant to SIG Node. label Aug 18, 2017
@cblecker
Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@cblecker
Copy link
Copy Markdown
Member Author

/retest

@cblecker
Copy link
Copy Markdown
Member Author

Unassigning TLAs that were mistakenly assigned by this bug. Hopefully this should pick up the sig-node reviewers.
/unassign @smarterclayton @lavalamp

@cblecker
Copy link
Copy Markdown
Member Author

/test pull-kubernetes-bazel-build
/test pull-kubernetes-bazel-test

@cblecker
Copy link
Copy Markdown
Member Author

ping @vishh @dchen1107 @ncdc @derekwaynecarr

@vishh
Copy link
Copy Markdown
Contributor

vishh commented Aug 31, 2017

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

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

Associated issue: 49300

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

Details Needs approval from an approver in each of these OWNERS Files:

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 k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 31, 2017
@fejta-bot
Copy link
Copy Markdown

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

Review the full test history for this PR.

@abgworrall abgworrall modified the milestone: v1.8 Sep 2, 2017
@k8s-github-robot
Copy link
Copy Markdown

Automatic merge from submit-queue (batch tested with PRs 51666, 49829, 51058, 51004, 50938)

@k8s-github-robot k8s-github-robot merged commit 0554520 into kubernetes:master Sep 3, 2017
@cblecker cblecker deleted the threshold-crossbuild branch September 3, 2017 05:53
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. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cross building from darwin is broken

9 participants