From e5b3e41ef99719ea5e1a37f5ba46dbe536c77d14 Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Thu, 2 Oct 2014 10:37:41 -0700
Subject: [PATCH] podex: move to contrib

---
 contrib/podex/CONTRIBUTING.md                | 28 ++++++++++++++++++++
 contrib/podex/MAINTAINTERS.md                | 18 +++++++++++++
 contrib/podex/README.md                      | 14 ++++++++++
 {podex => contrib/podex}/podex.go            |  0
 podex/manifests/google/nodejs-hello/pod.json | 19 -------------
 podex/manifests/google/nodejs-hello/pod.yaml | 11 --------
 6 files changed, 60 insertions(+), 30 deletions(-)
 create mode 100644 contrib/podex/CONTRIBUTING.md
 create mode 100644 contrib/podex/MAINTAINTERS.md
 create mode 100644 contrib/podex/README.md
 rename {podex => contrib/podex}/podex.go (100%)
 delete mode 100644 podex/manifests/google/nodejs-hello/pod.json
 delete mode 100644 podex/manifests/google/nodejs-hello/pod.yaml

diff --git a/contrib/podex/CONTRIBUTING.md b/contrib/podex/CONTRIBUTING.md
new file mode 100644
index 00000000000..90672b17f79
--- /dev/null
+++ b/contrib/podex/CONTRIBUTING.md
@@ -0,0 +1,28 @@
+# How to become a contributor and submit your own code
+
+## Contributor License Agreements
+
+We'd love to accept your patches! Before we can take them, we have to jump a couple of legal hurdles.
+
+Please fill out either the individual or corporate Contributor License Agreement (CLA).
+
+  * If you are an individual writing original source code and you're sure you own the intellectual property, then you'll need to sign an [individual CLA](http://code.google.com/legal/individual-cla-v1.0.html).
+  * If you work for a company that wants to allow you to contribute your work, then you'll need to sign a [corporate CLA](http://code.google.com/legal/corporate-cla-v1.0.html).
+
+Follow either of the two links above to access the appropriate CLA and instructions for how to sign and return it. Once we receive it, we'll be able to accept your pull requests.
+
+## Contributing A Patch
+
+1. Submit an issue describing your proposed change to the repo in question.
+1. The repo owner will respond to your issue promptly.
+1. If your proposed change is accepted, and you haven't already done so, sign a Contributor License Agreement (see details above).
+1. Fork the desired repo, develop and test your code changes.
+1. Submit a pull request.
+
+## Protocols for Collaborative Development
+
+Please read [this doc](https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/collab.md) for information on how we're running development for the project.
+
+## Adding dependencies
+
+If your patch depends on new packages, add that package with [`godep`](https://github.com/tools/godep).  Follow the [instructions to add a dependency](https://github.com/tools/godep#add-a-dependency).
diff --git a/contrib/podex/MAINTAINTERS.md b/contrib/podex/MAINTAINTERS.md
new file mode 100644
index 00000000000..5e736383e40
--- /dev/null
+++ b/contrib/podex/MAINTAINTERS.md
@@ -0,0 +1,18 @@
+# Maintainers
+
+People responsible for ports of Kubernetes to different environments. CC at least one maintainer on relevant issues and PRs.
+
+## OS Distributions
+
+* RedHat, Fedora: [Clayton Coleman](https://github.com/smarterclayton), [Derek Carr](https://github.com/derekwaynecarr), [Scott Collier](https://github.com/scollier)
+* CoreOS: [Kelsey Hightower](https://github.com/kelseyhightower)
+
+## Providers / Environments
+
+* GCE: [Brendan Burns](https://github.com/brendandburns), [Joe Beda](https://github.com/jbeda), [Daniel Smith](https://github.com/lavalamp), [Tim Hockin](https://github.com/thockin)
+* Azure: [Jeff Mendoza](https://github.com/jeffmendoza)
+* Vsphere: [Pieter Noordhuis](https://github.com/pietern)
+* Rackspace: [Ryan Richard](https://github.com/doublerr)
+* Ovirt: [Federico Simoncelli](https://github.com/simon3z)
+* Local: [Derek Carr](https://github.com/derekwaynecarr)
+* Vagrant: [Derek Carr](https://github.com/derekwaynecarr)
\ No newline at end of file
diff --git a/contrib/podex/README.md b/contrib/podex/README.md
new file mode 100644
index 00000000000..f87660ebf9e
--- /dev/null
+++ b/contrib/podex/README.md
@@ -0,0 +1,14 @@
+# podex
+
+## Description
+
+`podex` is a command line tool to bootstrap a kubernetes container manifests from docker image metadata.
+
+Manifests can then be edited by a human to match deployment needs.
+
+## Usage
+```
+$ docker pull google/nodejs-hello
+$ podex -yaml google/nodejs-hello > pod.yaml
+$ podex -json google/nodejs-hello > pod.json
+```
diff --git a/podex/podex.go b/contrib/podex/podex.go
similarity index 100%
rename from podex/podex.go
rename to contrib/podex/podex.go
diff --git a/podex/manifests/google/nodejs-hello/pod.json b/podex/manifests/google/nodejs-hello/pod.json
deleted file mode 100644
index b47e27ca61a..00000000000
--- a/podex/manifests/google/nodejs-hello/pod.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "version": "v1beta1",
-  "id": "nodejs-hello-pod",
-  "volumes": null,
-  "containers": [
-    {
-      "name": "nodejs-hello",
-      "image": "google/nodejs-hello",
-      "ports": [
-        {
-          "name": "nodejs-hello-tcp-8080",
-          "hostPort": 80,
-          "containerPort": 8080,
-          "protocol": "TCP"
-        }
-      ]
-    }
-  ]
-}
diff --git a/podex/manifests/google/nodejs-hello/pod.yaml b/podex/manifests/google/nodejs-hello/pod.yaml
deleted file mode 100644
index 5cf4b097b5e..00000000000
--- a/podex/manifests/google/nodejs-hello/pod.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: v1beta1
-id: nodejs-hello-pod
-volumes: []
-containers:
-- name: nodejs-hello
-  image: google/nodejs-hello
-  ports:
-  - name: nodejs-hello-tcp-8080
-    hostPort: 80
-    containerPort: 8080
-    protocol: TCP