Merge pull request kubernetes#5 from joelsmith/master

Get updates from upstream, add Dockerfile.openshift for Origin builds

.gitignore

@@ -1,3 +1,3 @@
-/bin/node-problem-detector
+/bin/
 /Dockerfile
 /*.tar.gz

.travis.yml

@@ -4,8 +4,8 @@ sudo: required
 dist: trusty
 language: go
 go:
- - 1.8
  - 1.9
+ - "1.10"
 services:
  - docker
 before_install:

CONTRIBUTING.md

@@ -0,0 +1,31 @@
+# Contributing Guidelines
+
+Welcome to Kubernetes. We are excited about the prospect of you joining our [community](https://github.com/kubernetes/community)! The Kubernetes community abides by the CNCF [code of conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). Here is an excerpt:
+
+_As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities._
+
+## Getting Started
+
+We have full documentation on how to get started contributing here: 
+
+<!---
+If your repo has certain guidelines for contribution, put them here ahead of the general k8s resources
+-->
+
+- [Contributor License Agreement](https://git.k8s.io/community/CLA.md) Kubernetes projects require that you sign a Contributor License Agreement (CLA) before we can accept your pull requests
+- [Kubernetes Contributor Guide](http://git.k8s.io/community/contributors/guide) - Main contributor documentation, or you can just jump directly to the [contributing section](http://git.k8s.io/community/contributors/guide#contributing)
+- [Contributor Cheat Sheet](https://git.k8s.io/community/contributors/guide/contributor-cheatsheet.md) - Common resources for existing developers
+
+## Mentorship
+
+- [Mentoring Initiatives](https://git.k8s.io/community/mentoring) - We have a diverse set of mentorship programs available that are always looking for volunteers!
+
+<!---
+Custom Information - if you're copying this template for the first time you can add custom content here, for example:
+
+## Contact Information
+
+- [Slack channel](https://kubernetes.slack.com/messages/kubernetes-users) - Replace `kubernetes-users` with your slack channel string, this will send users directly to your channel. 
+- [Mailing list](URL) 
+
+-->

Dockerfile.in

@@ -15,6 +15,8 @@
 FROM @BASEIMAGE@
 MAINTAINER Random Liu <lantaol@google.com>
 
+RUN clean-install bash
+
 # Avoid symlink of /etc/localtime.
 RUN test -h /etc/localtime && rm -f /etc/localtime && cp /usr/share/zoneinfo/UTC /etc/localtime || true
 

Dockerfile.openshift

@@ -0,0 +1,8 @@
+FROM openshift/origin-release:golang-1.10
+COPY . /go/src/k8s.io/node-problem-detector
+RUN yum install -y systemd-devel
+RUN cd /go/src/k8s.io/node-problem-detector && make build-binaries
+
+FROM centos:7
+COPY --from=0 /go/src/k8s.io/node-problem-detector/bin/node-problem-detector /go/src/k8s.io/node-problem-detector/bin/log-counter /usr/bin/
+