Merge pull request kubernetes#328 from wangzhen127/cp-custom-plugin-fix

Cherry pick 2f5d032 to v0.6: Don't update condition if status stays False/Unknown for custom plugin

Merge pull request kubernetes#315 from xueweiz/metrics

Report metrics from custom-plugin-monitor

Merge pull request kubernetes#312 from yguo0905/wait-apiserver

Cherry pick kubernetes#308 to v0.6: Support waiting for kube-apiserver to be ready with timout during NPD startup

Merge pull request kubernetes#290 from xueweiz/test

Remove TestGoroutineLeak unit tests.

Merge pull request kubernetes#265 from wangzhen127/glog

Disable glog writing to files for log-counter

Merge pull request kubernetes#245 from andyxning/add_resource

add resource

Merge pull request kubernetes#231 from Random-Liu/update-base-image

Update base image for CVE fix.

Merge pull request kubernetes#228 from wangzhen127/custom-plugin-fix

More fix to custom plugin monitor condition change

Merge pull request kubernetes#151 from Random-Liu/improve-cpm

Improve cpm

Merge pull request kubernetes#122 from ajitak/cherrypick-#117-v0.4

Add a new rule which catches docker image corruption (cherrypick kubernetes#117 to v0.4)