Fix cross-build for memcg notification#37384
Conversation
|
fyi @sjenning @rmmh @mikedanese @dchen1107 @ncdc I am testing this now, will report back if successful. |
|
fyi @saad-ali to fix build. |
eb65e36 to
b14b0b5
Compare
b14b0b5 to
da127e7
Compare
|
@pires -- i was able to build on windows. |
|
Thanks @derekwaynecarr! |
da127e7 to
609877e
Compare
|
ok, this should go all green now that i updated the test owners file. |
|
I'd like @rmmh to confirm that cross-builds were failing because of kubelet on windows and not on non amd64 linux archs. I can't find the build output anywhere or I would check. |
|
@mikedanese it's in #37340, here's an example failure. It's hard to determine exactly which flavor of builds were failing. |
|
also, you can trigger a cross-build like this: @k8s-bot build this |
|
That example shows both darwin and windows failures. LGTM if everyone else is ok |
|
@rmmh -- thanks for the magic invocation on cross-build trigger. that should clarify things. |
|
Jenkins verification failed for commit 609877e. Full PR test history. The magic incantation to run this job again is |
|
@mikedanese -- should i pull a new version of gazel? |
| "doc.go", | ||
| "eviction_manager.go", | ||
| "helpers.go", | ||
| "threshold_notifier_unsupported.go", |
There was a problem hiding this comment.
I think you should drop the change to this file.
There was a problem hiding this comment.
This block should only contain files used to build linux, amd64. We don't need this file.
|
@derekwaynecarr are you on mac or linux? did you get that diff by running ./hack/update-bazel.sh? |
|
Every incantation of ./hack/update-bazel.sh should pull a new version of gazel. If you are calling gazel directly then yes please pull new versions fairly often. |
|
@mikedanese - i was on fedora 24 and got that diff. |
|
@rmmh @mikedanese -- it looks like cross build is happy again with this, i will try and re-run bazel update to make jenkins happy. |
609877e to
1ec69f6
Compare
|
pushed one last update for bazel, it's possible that diff was from an earlier commit where build tag was wrong on the file. either way, this should pass cross build per the last version i sent. @k8s-bot build this i am not going to be available for next few hours, but this should be good to go. |
|
Ok. All the things are happy. |
|
@ncdc this fixes P0 stuff so is it needed to have P0 label as well? |
|
@pires labeled |
|
Jenkins GCE etcd3 e2e failed for commit 1ec69f6. Full PR test history. The magic incantation to run this job again is |
|
LGTM and I am manually merged this one for build fix. |
|
Removing cherry-pick candidate label this is already in 1.5 |
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
```
Fix the cross-build error from #32577
Fixes #37340
Fixes #37383
This change is