Fix threshold notifier build tags#38630
Merged
k8s-github-robot merged 1 commit intokubernetes:masterfrom Dec 12, 2016
Merged
Conversation
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.
Contributor
|
Looks correct to me. |
Member
|
/lgtm |
Contributor
|
@derekwaynecarr: you can't LGTM a PR unless you are assigned as a reviewer. DetailsIn response to this comment:
If you have questions or suggestions related to this bot's behavior, please file an issue against the kubernetes/test-infra repository. |
Member
|
/lgtm |
Contributor
|
Jenkins CRI GCE e2e failed for commit 89ea5ac. Full PR test history. The magic incantation to run this job again is |
|
Automatic merge from submit-queue (batch tested with PRs 38453, 36672, 38629, 34966, 38630) |
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
```
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.