Merge pull request #9265 from mesosphere/upstream-k8sm-cm-and-km

Upstream Kubernetes Mesos controller manager and km binary

cmd/hyperkube/hyperkube.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// CAUTION: If you update code in this file, you may need to also update code
+//          in contrib/mesos/cmd/km/hyperkube.go
 package main
 
 import (

cmd/hyperkube/hyperkube_test.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// CAUTION: If you update code in this file, you may need to also update code
+//          in contrib/mesos/cmd/km/hyperkube_test.go
 package main
 
 import (

cmd/hyperkube/kube-apiserver.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// CAUTION: If you update code in this file, you may need to also update code
+//          in contrib/mesos/cmd/km/kube-apiserver.go
 package main
 
 import (

cmd/hyperkube/kube-controller-manager.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// CAUTION: If you update code in this file, you may need to also update code
+//          in contrib/mesos/cmd/km/k8sm-controllermanager.go
 package main
 
 import (

cmd/hyperkube/kube-proxy.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// CAUTION: If you update code in this file, you may need to also update code
+//          in contrib/mesos/cmd/km/kube-proxy.go
 package main
 
 import (

cmd/hyperkube/kube-scheduler.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// CAUTION: If you update code in this file, you may need to also update code
+//          in contrib/mesos/cmd/km/k8sm-scheduler.go
 package main
 
 import (

cmd/hyperkube/main.go

@@ -16,6 +16,9 @@ limitations under the License.
 
 // A binary that can morph into all of the other kubernetes binaries. You can
 // also soft-link to it busybox style.
+//
+// CAUTION: If you update code in this file, you may need to also update code
+//          in contrib/mesos/cmd/km/km.go
 package main
 
 import (

cmd/hyperkube/server.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// CAUTION: If you update code in this file, you may need to also update code
+//          in contrib/mesos/cmd/km/server.go
 package main
 
 import (

cmd/kube-controller-manager/app/controllermanager.go

@@ -17,6 +17,9 @@ limitations under the License.
 // Package app implements a server that runs a set of active
 // components.  This includes replication controllers, service endpoints and
 // nodes.
+//
+// CAUTION: If you update code in this file, you may need to also update code
+//          in contrib/mesos/pkg/controllermanager/controllermanager.go
 package app
 
 import (