Skip to content

Fix threshold notifier build tags#38630

Merged
k8s-github-robot merged 1 commit intokubernetes:masterfrom
ncdc:fix-threshold-notifier-build-tags
Dec 12, 2016
Merged

Fix threshold notifier build tags#38630
k8s-github-robot merged 1 commit intokubernetes:masterfrom
ncdc:fix-threshold-notifier-build-tags

Conversation

@ncdc
Copy link
Copy Markdown
Member

@ncdc ncdc commented Dec 12, 2016

Fix threshold notifier build tags so the linux version is only built if cgo is
enabled, and the unsupported version is built if it's either not linux or not
cgo.

Fix threshold notifier build tags so the linux version is only built if cgo is
enabled, and the unsupported version is built if it's either not linux or not
cgo.
@ncdc ncdc added 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. labels Dec 12, 2016
@k8s-reviewable
Copy link
Copy Markdown

This change is Reviewable

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 12, 2016
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 12, 2016
@smarterclayton
Copy link
Copy Markdown
Contributor

Looks correct to me.

@derekwaynecarr
Copy link
Copy Markdown
Member

/lgtm

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@derekwaynecarr: you can't LGTM a PR unless you are assigned as a reviewer.

Details

In response to this comment:

/lgtm

If you have questions or suggestions related to this bot's behavior, please file an issue against the kubernetes/test-infra repository.

@derekwaynecarr derekwaynecarr self-assigned this Dec 12, 2016
@derekwaynecarr
Copy link
Copy Markdown
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 12, 2016
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

Jenkins CRI GCE e2e failed for commit 89ea5ac. Full PR test history.

The magic incantation to run this job again is @k8s-bot cri e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot
Copy link
Copy Markdown

Automatic merge from submit-queue (batch tested with PRs 38453, 36672, 38629, 34966, 38630)

@k8s-github-robot k8s-github-robot merged commit 12147a3 into kubernetes:master Dec 12, 2016
@ncdc ncdc deleted the fix-threshold-notifier-build-tags branch February 13, 2017 17:23
k8s-github-robot pushed a commit that referenced this pull request Sep 3, 2017
Automatic merge from submit-queue (batch tested with PRs 51666, 49829, 51058, 51004, 50938)

Fix threshold notifier build tags

**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**:
```release-note
NONE
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

7 participants