Merge pull request #38630 from ncdc/fix-threshold-notifier-build-tags

Automatic merge from submit-queue (batch tested with PRs 38453, 36672, 38629, 34966, 38630) Fix threshold notifier build tags 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.

Merge pull request #38630 from ncdc/fix-threshold-notifier-build-tags
12147a3c · Kubernetes Submit Queue · GitHub · 0ac73a82 · 89ea5ac9 · 12147a3c
Commit 12147a3c authored Dec 12, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

threshold_notifier_linux.go pkg/kubelet/eviction/threshold_notifier_linux.go +2 -0

threshold_notifier_unsupported.go pkg/kubelet/eviction/threshold_notifier_unsupported.go +1 -1

No files found.
--- a/pkg/kubelet/eviction/threshold_notifier_linux.go
+++ b/pkg/kubelet/eviction/threshold_notifier_linux.go
+// +build cgo
+
 /*
 Copyright 2016 The Kubernetes Authors.


--- a/pkg/kubelet/eviction/threshold_notifier_unsupported.go
+++ b/pkg/kubelet/eviction/threshold_notifier_unsupported.go
-// +build !linux
+// +build !linux !cgo

 /*
 Copyright 2016 The Kubernetes Authors.