@@ -19,13 +19,13 @@ import (

 func TestExamples(t *testing.T) {

 	expected := map[string]runtime.Object{

-		"guestbook/template.json":               &templateapi.Template{},

-		"hello-openshift/hello-pod.json":        &kubeapi.Pod{},

-		"hello-openshift/hello-project.json":         &projectapi.Project{},

-		"sample-app/buildcfg/buildcfg.json":     &buildapi.BuildConfig{},

-		"sample-app/buildinvoke/pushevent.json": nil, // Skip.

-		"sample-app/registry-config.json":       &configapi.Config{},

-		"sample-app/template/template.json":     &templateapi.Template{},

+		"guestbook/template.json":                 &templateapi.Template{},

+		"hello-openshift/hello-pod.json":          &kubeapi.Pod{},

+		"hello-openshift/hello-project.json":      &projectapi.Project{},

+		"sample-app/application-buildconfig.json": &buildapi.BuildConfig{},

+		"sample-app/github-webhook-example.json":  nil, // Skip.

+		"sample-app/docker-registry-config.json":  &configapi.Config{},

+		"sample-app/application-template.json":    &templateapi.Template{},

 	}

 	files := []string{}

deleted file mode 100644

@@ -1,30 +0,0 @@

-Quickstart

-This section describes how you can quickly test that your OpenShift environment is setup properly, and allows you to watch the flow of an application creation and build in OpenShift.

-

-To do this, run:

-

-        $ ./run.sh

-

-This will:

-

-1. Launch the OpenShift server

- * Logs are available in logs/openshift.log

- 

-2. Create a private Docker registry running in OpenShift

-

-3. Define a build configuration for the application

-

-4. Trigger a new build of the application

-

-5. Submit the template/template.json for parameterization

-

-6. Submit the config json to OpenShift for creation

-

-7. Confirm the application is created/accessible via curl

-

-To reset your system after running this example, you can run:

-        

-    $ ./cleanup.sh

-        

-This will stop the openshift process, remove the etcd storage, and kill all docker containers running on your host system.  (**Use with caution!**   Docker containers unrelated to openshift will also be killed by this script)

@@ -11,8 +11,6 @@ Application Build, Deploy, and Update Flow

 This section covers how to perform all the steps of building, deploying, and updating an application on the OpenShift platform.

-Note:  If you just want to quickly validate your environment or see the expected results, you can run the quickstart script described [here](QUICKSTART.md)

-

 All commands assume the `openshift` binary is in your path:

 1. Pre-pull the docker images used in this sample.  This is not strictly necessary as OpenShift will pull the images as it needs them, but by doing it up front it will prevent lengthy operations during build and deployment which might otherwise lead you to believe the process has failed or hung.

@@ -25,7 +23,7 @@ All commands assume the `openshift` binary is in your path:

 3. Deploy the private docker registry within OpenShift:

-        $ openshift kube apply -c registry-config.json

+        $ openshift kube apply -c docker-registry-config.json

 4. Confirm the registry is started (this can take a few mins):

@@ -35,7 +33,7 @@ All commands assume the `openshift` binary is in your path:

         ID                                     Image(s)                    Host                     Labels                                                                                                   Status

         ----------                             ----------                  ----------               ----------                                                                                               ----------

-        94679170-54dc-11e4-88cc-3c970e3bf0b7   openshift/docker-registry   localhost.localdomain/   deployment=registry-config,name=registryPod,replicationController=946583f6-54dc-11e4-88cc-3c970e3bf0b7   Running

+        94679170-54dc-11e4-88cc-3c970e3bf0b7   openshift/docker-registry   localhost.localdomain/   deployment=registry-config,name=registrypod,replicationController=946583f6-54dc-11e4-88cc-3c970e3bf0b7   Running

 5. Fork the [ruby sample repository](https://github.com/openshift/ruby-hello-world)

@@ -45,12 +43,12 @@ All commands assume the `openshift` binary is in your path:

         $ http://<host>:8080/osapi/v1beta1/buildConfigHooks/build100/secret101/github

   * Note: Using the webhook requires your OpenShift server be publicly accessible so github can reach it to invoke the hook.

-7. Edit buildcfg/buildcfg.json

+7. Edit application-buildconfig.json

  * Update the sourceURI to point to your forked repository.

 8. Create a build configuration for your application.  This configuration is used by OpenShift to rebuild your application's Docker image (e.g. when you push changes to the application source).

-        $ openshift kube create buildConfigs -c buildcfg/buildcfg.json

+        $ openshift kube create buildConfigs -c application-buildconfig.json

     You should see the build configuration returned as output (SourceURI will depend on your repo name):

@@ -62,7 +60,7 @@ All commands assume the `openshift` binary is in your path:

  * If you setup the github webhook in step 6, push a change to app.rb in your ruby sample repository from step 5.

  * Otherwise you can simulate the webhook invocation by running:

-            $ curl -s -A "GitHub-Hookshot/github" -H "Content-Type:application/json" -H "X-Github-Event:push" -d @buildinvoke/pushevent.json http://localhost:8080/osapi/v1beta1/buildConfigHooks/build100/secret101/github

+            $ curl -s -A "GitHub-Hookshot/github" -H "Content-Type:application/json" -H "X-Github-Event:push" -d @github-webhook-example.json http://localhost:8080/osapi/v1beta1/buildConfigHooks/build100/secret101/github

     In the OpenShift logs (logs/openshift.log) you should see something like:

@@ -86,7 +84,7 @@ All commands assume the `openshift` binary is in your path:

 11. Submit the application template for processing and create the application using the processed template:

-        $ openshift kube process -c template/template.json | openshift kube apply -c -

+        $ openshift kube process -c application-template.json | openshift kube apply -c -

 12. Wait for the application's frontend pod to be started (this can take a few mins):

new file mode 100644

@@ -0,0 +1,13 @@

+{

+    "id": "build100",

+    "kind": "BuildConfig",

+    "apiVersion": "v1beta1",

+    "desiredInput":

+    {

+        "type": "docker",

+        "sourceURI": "git://github.com/openshift/ruby-hello-world.git",

+        "imageTag":  "openshift/origin-ruby-sample",

+        "registry":  "127.0.0.1:5001"

+    },

+    "secret": "secret101"

+}

new file mode 100644

@@ -0,0 +1,84 @@

+{

+  "id": "ruby-helloworld-sample",

+  "kind": "Template",

+  "apiVersion": "v1beta1",

+  "name": "ruby-hello-world-template",

+  "description": "This example shows how to create a simple ruby application in openshift origin v3",

+  "parameters": [

+    {

+      "name": "ADMIN_USERNAME",

+      "description": "administrator username",

+      "generate": "expression",

+      "from": "admin[A-Z0-9]{3}"

+    },

+    {

+      "name": "ADMIN_PASSWORD",

+      "description": "administrator password",

+      "generate": "expression",

+      "from": "[a-zA-Z0-9]{8}"

+    },

+    {

+      "name": "DB_PASSWORD",

+      "description": "database password",

+      "generate": "expression",

+      "from": "[a-zA-Z0-9]{8}"

+    }

+  ],

+  "items": [

+    {

+      "id": "frontend",

+      "kind": "Service",

+      "apiVersion": "v1beta1",

+      "port": 5432,

+      "containerPort": 8080,

+      "selector": {

+        "name": "frontend"

+      }

+    },

+    {

+      "id": "frontend",

+      "kind": "Deployment",

+      "apiVersion": "v1beta1",

+      "triggerPolicy": "manual",

+      "strategy": {

+        "type": "Basic"

+      },

+      "controllerTemplate": {

+        "replicas": 1,

+        "replicaSelector": {

+          "name": "frontend"

+        },

+        "podTemplate": {

+          "desiredState": {

+            "manifest": {

+              "version": "v1beta1",

+              "containers": [{

+                "name": "ruby-helloworld",

+                "image": "127.0.0.1:5001/openshift/origin-ruby-sample",

+                "env": [

+                  {

+                    "name": "ADMIN_USERNAME",

+                    "value": "${ADMIN_USERNAME}"

+                  },

+                  {

+                    "name": "ADMIN_PASSWORD",

+                    "value": "${ADMIN_PASSWORD}"

+                  },

+                  {

+                    "name": "DB_PASSWORD",

+                    "value": "${DB_PASSWORD}"

+                  }

+                ],

+                "ports": [{"containerPort": 8080}]

+              }]

+            }

+          },

+          "labels": {"name": "frontend"}

+        }

+      },

+      "labels": {

+        "deploymentConfig": "application-config"

+      }

+    }

+  ]

+}

deleted file mode 100644

@@ -1,12 +0,0 @@

-{

-    "id": "build100",

-    "kind": "BuildConfig",

-    "apiVersion": "v1beta1",

-    "desiredInput":

-    {

-        "sourceURI": "git://github.com/openshift/ruby-hello-world.git",

-        "imageTag":  "openshift/origin-ruby-sample",

-        "registry":  "127.0.0.1:5001"

-    },

-    "secret": "secret101"

-}

deleted file mode 100644

@@ -1,136 +0,0 @@

-{

-   "ref":"refs/heads/master",

-   "after":"9bdc3a26ff933b32f3e558636b58aea86a69f051",

-   "before":"0000000000000000000000000000000000000000",

-   "created":true,

-   "deleted":false,

-   "forced":true,

-   "compare":"https://github.com/anonUser/anonRepo/commit/9bdc3a26ff93",

-   "commits":[

-      {

-         "id":"9bdc3a26ff933b32f3e558636b58aea86a69f051",

-         "distinct":true,

-         "message":"Added license",

-         "timestamp":"2014-08-28T16:55:36+02:00",

-         "url":"https://github.com/anonUser/anonRepo/commit/9bdc3a26ff933b32f3e558636b58aea86a69f051",

-         "author":{

-            "name":"Anonymous User",

-            "email":"anonUser@example.com"

-         },

-         "committer":{

-            "name":"Anonymous User",

-            "email":"anonUser@example.com"

-         },

-         "added":[

-            "LICENSE"

-         ],

-         "removed":[

-

-         ],

-         "modified":[

-

-         ]

-      }

-   ],

-   "head_commit":{

-      "id":"9bdc3a26ff933b32f3e558636b58aea86a69f051",

-      "distinct":true,

-      "message":"Added license",

-      "timestamp":"2014-08-28T16:55:36+02:00",

-      "url":"https://github.com/anonUser/anonRepo/commit/9bdc3a26ff933b32f3e558636b58aea86a69f051",

-      "author":{

-         "name":"Anonymous User",

-         "email":"anonUser@example.com"

-      },

-      "committer":{

-         "name":"Anonymous User",

-         "email":"anonUser@example.com"

-      },

-      "added":[

-         "LICENSE"

-      ],

-      "removed":[

-

-      ],

-      "modified":[

-

-      ]

-   },

-   "repository":{

-      "id":23354788,

-      "name":"anonRepo",

-      "full_name":"anonUser/anonRepo",

-      "owner":{

-         "name":"anonUser",

-         "email":"anonUser@example.com"

-      },

-      "private":false,

-      "html_url":"https://github.com/anonUser/anonRepo",

-      "description":"Git webhook implementation in Go.",

-      "fork":false,

-      "url":"https://github.com/anonUser/anonRepo",

-      "forks_url":"https://api.github.com/repos/anonUser/anonRepo/forks",

-      "keys_url":"https://api.github.com/repos/anonUser/anonRepo/keys{/key_id}",

-      "collaborators_url":"https://api.github.com/repos/anonUser/anonRepo/collaborators{/collaborator}",

-      "teams_url":"https://api.github.com/repos/anonUser/anonRepo/teams",

-      "hooks_url":"https://api.github.com/repos/anonUser/anonRepo/hooks",

-      "issue_events_url":"https://api.github.com/repos/anonUser/anonRepo/issues/events{/number}",

-      "events_url":"https://api.github.com/repos/anonUser/anonRepo/events",

-      "assignees_url":"https://api.github.com/repos/anonUser/anonRepo/assignees{/user}",

-      "branches_url":"https://api.github.com/repos/anonUser/anonRepo/branches{/branch}",

-      "tags_url":"https://api.github.com/repos/anonUser/anonRepo/tags",

-      "blobs_url":"https://api.github.com/repos/anonUser/anonRepo/git/blobs{/sha}",

-      "git_tags_url":"https://api.github.com/repos/anonUser/anonRepo/git/tags{/sha}",

-      "git_refs_url":"https://api.github.com/repos/anonUser/anonRepo/git/refs{/sha}",

-      "trees_url":"https://api.github.com/repos/anonUser/anonRepo/git/trees{/sha}",

-      "statuses_url":"https://api.github.com/repos/anonUser/anonRepo/statuses/{sha}",

-      "languages_url":"https://api.github.com/repos/anonUser/anonRepo/languages",

-      "stargazers_url":"https://api.github.com/repos/anonUser/anonRepo/stargazers",

-      "contributors_url":"https://api.github.com/repos/anonUser/anonRepo/contributors",

-      "subscribers_url":"https://api.github.com/repos/anonUser/anonRepo/subscribers",

-      "subscription_url":"https://api.github.com/repos/anonUser/anonRepo/subscription",

-      "commits_url":"https://api.github.com/repos/anonUser/anonRepo/commits{/sha}",

-      "git_commits_url":"https://api.github.com/repos/anonUser/anonRepo/git/commits{/sha}",

-      "comments_url":"https://api.github.com/repos/anonUser/anonRepo/comments{/number}",

-      "issue_comment_url":"https://api.github.com/repos/anonUser/anonRepo/issues/comments/{number}",

-      "contents_url":"https://api.github.com/repos/anonUser/anonRepo/contents/{+path}",

-      "compare_url":"https://api.github.com/repos/anonUser/anonRepo/compare/{base}...{head}",

-      "merges_url":"https://api.github.com/repos/anonUser/anonRepo/merges",

-      "archive_url":"https://api.github.com/repos/anonUser/anonRepo/{archive_format}{/ref}",

-      "downloads_url":"https://api.github.com/repos/anonUser/anonRepo/downloads",

-      "issues_url":"https://api.github.com/repos/anonUser/anonRepo/issues{/number}",

-      "pulls_url":"https://api.github.com/repos/anonUser/anonRepo/pulls{/number}",

-      "milestones_url":"https://api.github.com/repos/anonUser/anonRepo/milestones{/number}",

-      "notifications_url":"https://api.github.com/repos/anonUser/anonRepo/notifications{?since,all,participating}",

-      "labels_url":"https://api.github.com/repos/anonUser/anonRepo/labels{/name}",

-      "releases_url":"https://api.github.com/repos/anonUser/anonRepo/releases{/id}",

-      "created_at":1409063699,

-      "updated_at":"2014-08-26T14:34:59Z",

-      "pushed_at":1409238007,

-      "git_url":"git://github.com/anonUser/anonRepo.git",

-      "ssh_url":"git@github.com:anonUser/anonRepo.git",

-      "clone_url":"https://github.com/anonUser/anonRepo.git",

-      "svn_url":"https://github.com/anonUser/anonRepo",

-      "homepage":null,

-      "size":0,

-      "stargazers_count":0,

-      "watchers_count":0,

-      "language":null,

-      "has_issues":true,

-      "has_downloads":true,

-      "has_wiki":true,

-      "forks_count":0,

-      "mirror_url":null,

-      "open_issues_count":0,

-      "forks":0,

-      "open_issues":0,

-      "watchers":0,

-      "default_branch":"master",

-      "stargazers":0,

-      "master_branch":"master"

-   },

-   "pusher":{

-      "name":"anonUser",

-      "email":"anonUser@example.com"

-   }

-}

new file mode 100644

@@ -0,0 +1,63 @@

+{

+    "id": "docker-registry",

+    "kind": "Config",

+    "apiVersion": "v1beta1",

+    "creationTimestamp": "2014-09-18T18:28:38-04:00",

+    "name": "docker-registry-config",

+    "description": "Creates a private docker registry",

+    "items": [

+        {

+            "apiVersion": "v1beta1",

+            "creationTimestamp": null,

+            "id": "docker-registry",

+            "kind": "Service",

+            "port": 5001,

+            "containerPort": 5000,

+            "selector": {

+                "name": "registrypod"

+            }

+        },

+        {

+            "id": "docker-registry",

+            "kind": "Deployment",

+            "apiVersion": "v1beta1",

+            "triggerPolicy": "manual",

+            "strategy": {

+              "type": "Basic"

+            },

+            "controllerTemplate": {

+              "replicas": 1,

+              "replicaSelector": {

+                "name": "registrypod"

+              },

+              "podTemplate": {

+              "desiredState": {

+                    "manifest": {

+                        "containers": [

+                            {

+                                "image": "openshift/docker-registry",

+                                "name": "registry-container",

+                                "ports": [

+                                    {

+                                        "containerPort": 5000,

+                                        "protocol": "TCP"

+                                    }

+                                ]

+                            }

+                        ],

+                        "version": "v1beta1",

+                        "volumes": null

+                    },

+                    "restartpolicy": {}

+                },

+                "labels": {

+                    "name": "registrypod"

+                }

+            }

+          },

+          "labels": {

+            "deploymentConfig": "registry-config"

+          }

+        }

+    ]

+}

new file mode 100644

@@ -0,0 +1,136 @@

+{

+   "ref":"refs/heads/master",

+   "after":"9bdc3a26ff933b32f3e558636b58aea86a69f051",

+   "before":"0000000000000000000000000000000000000000",

+   "created":true,

+   "deleted":false,

+   "forced":true,

+   "compare":"https://github.com/anonUser/anonRepo/commit/9bdc3a26ff93",

+   "commits":[

+      {

+         "id":"9bdc3a26ff933b32f3e558636b58aea86a69f051",

+         "distinct":true,

+         "message":"Added license",

+         "timestamp":"2014-08-28T16:55:36+02:00",

+         "url":"https://github.com/anonUser/anonRepo/commit/9bdc3a26ff933b32f3e558636b58aea86a69f051",

+         "author":{

+            "name":"Anonymous User",

+            "email":"anonUser@example.com"

+         },

+         "committer":{

+            "name":"Anonymous User",

+            "email":"anonUser@example.com"

+         },

+         "added":[

+            "LICENSE"

+         ],

+         "removed":[

+

+         ],

+         "modified":[

+

+         ]

+      }

+   ],

+   "head_commit":{

+      "id":"9bdc3a26ff933b32f3e558636b58aea86a69f051",

+      "distinct":true,

+      "message":"Added license",

+      "timestamp":"2014-08-28T16:55:36+02:00",

+      "url":"https://github.com/anonUser/anonRepo/commit/9bdc3a26ff933b32f3e558636b58aea86a69f051",

+      "author":{

+         "name":"Anonymous User",

+         "email":"anonUser@example.com"

+      },

+      "committer":{

+         "name":"Anonymous User",

+         "email":"anonUser@example.com"

+      },

+      "added":[

+         "LICENSE"

+      ],

+      "removed":[

+

+      ],

+      "modified":[

+

+      ]

+   },

+   "repository":{

+      "id":23354788,

+      "name":"anonRepo",

+      "full_name":"anonUser/anonRepo",

+      "owner":{

+         "name":"anonUser",

+         "email":"anonUser@example.com"

+      },

+      "private":false,

+      "html_url":"https://github.com/anonUser/anonRepo",

+      "description":"Git webhook implementation in Go.",

+      "fork":false,

+      "url":"https://github.com/anonUser/anonRepo",

+      "forks_url":"https://api.github.com/repos/anonUser/anonRepo/forks",

+      "keys_url":"https://api.github.com/repos/anonUser/anonRepo/keys{/key_id}",

+      "collaborators_url":"https://api.github.com/repos/anonUser/anonRepo/collaborators{/collaborator}",

+      "teams_url":"https://api.github.com/repos/anonUser/anonRepo/teams",

+      "hooks_url":"https://api.github.com/repos/anonUser/anonRepo/hooks",

+      "issue_events_url":"https://api.github.com/repos/anonUser/anonRepo/issues/events{/number}",

+      "events_url":"https://api.github.com/repos/anonUser/anonRepo/events",

+      "assignees_url":"https://api.github.com/repos/anonUser/anonRepo/assignees{/user}",

+      "branches_url":"https://api.github.com/repos/anonUser/anonRepo/branches{/branch}",

+      "tags_url":"https://api.github.com/repos/anonUser/anonRepo/tags",

+      "blobs_url":"https://api.github.com/repos/anonUser/anonRepo/git/blobs{/sha}",

+      "git_tags_url":"https://api.github.com/repos/anonUser/anonRepo/git/tags{/sha}",

+      "git_refs_url":"https://api.github.com/repos/anonUser/anonRepo/git/refs{/sha}",

+      "trees_url":"https://api.github.com/repos/anonUser/anonRepo/git/trees{/sha}",

+      "statuses_url":"https://api.github.com/repos/anonUser/anonRepo/statuses/{sha}",

+      "languages_url":"https://api.github.com/repos/anonUser/anonRepo/languages",

+      "stargazers_url":"https://api.github.com/repos/anonUser/anonRepo/stargazers",

+      "contributors_url":"https://api.github.com/repos/anonUser/anonRepo/contributors",

+      "subscribers_url":"https://api.github.com/repos/anonUser/anonRepo/subscribers",

+      "subscription_url":"https://api.github.com/repos/anonUser/anonRepo/subscription",

+      "commits_url":"https://api.github.com/repos/anonUser/anonRepo/commits{/sha}",

+      "git_commits_url":"https://api.github.com/repos/anonUser/anonRepo/git/commits{/sha}",

+      "comments_url":"https://api.github.com/repos/anonUser/anonRepo/comments{/number}",

+      "issue_comment_url":"https://api.github.com/repos/anonUser/anonRepo/issues/comments/{number}",

+      "contents_url":"https://api.github.com/repos/anonUser/anonRepo/contents/{+path}",

+      "compare_url":"https://api.github.com/repos/anonUser/anonRepo/compare/{base}...{head}",

+      "merges_url":"https://api.github.com/repos/anonUser/anonRepo/merges",

+      "archive_url":"https://api.github.com/repos/anonUser/anonRepo/{archive_format}{/ref}",

+      "downloads_url":"https://api.github.com/repos/anonUser/anonRepo/downloads",

+      "issues_url":"https://api.github.com/repos/anonUser/anonRepo/issues{/number}",

+      "pulls_url":"https://api.github.com/repos/anonUser/anonRepo/pulls{/number}",

+      "milestones_url":"https://api.github.com/repos/anonUser/anonRepo/milestones{/number}",

+      "notifications_url":"https://api.github.com/repos/anonUser/anonRepo/notifications{?since,all,participating}",

+      "labels_url":"https://api.github.com/repos/anonUser/anonRepo/labels{/name}",

+      "releases_url":"https://api.github.com/repos/anonUser/anonRepo/releases{/id}",

+      "created_at":1409063699,

+      "updated_at":"2014-08-26T14:34:59Z",

+      "pushed_at":1409238007,

+      "git_url":"git://github.com/anonUser/anonRepo.git",

+      "ssh_url":"git@github.com:anonUser/anonRepo.git",

+      "clone_url":"https://github.com/anonUser/anonRepo.git",

+      "svn_url":"https://github.com/anonUser/anonRepo",

+      "homepage":null,

+      "size":0,

+      "stargazers_count":0,

+      "watchers_count":0,

+      "language":null,

+      "has_issues":true,

+      "has_downloads":true,

+      "has_wiki":true,

+      "forks_count":0,

+      "mirror_url":null,

+      "open_issues_count":0,

+      "forks":0,

+      "open_issues":0,

+      "watchers":0,

+      "default_branch":"master",

+      "stargazers":0,

+      "master_branch":"master"

+   },

+   "pusher":{

+      "name":"anonUser",

+      "email":"anonUser@example.com"

+   }

+}

new file mode 100644

deleted file mode 100644

@@ -1,65 +0,0 @@

-{

-    "id": "docker-registry-config",

-    "kind": "Config",

-    "apiVersion": "v1beta1",

-    "creationTimestamp": "2014-09-18T18:28:38-04:00",

-    "name": "docker-registry-config",

-    "description": "Creates a private docker registry",

-    "items": [

-        {

-            "apiVersion": "v1beta1",

-            "creationTimestamp": null,

-            "id": "registryservice",

-            "kind": "Service",

-            "port": 5001,

-            "containerPort": 5000,

-            "selector": {

-                "name": "registryPod"

-            }

-        },

-        {

-            "id": "registry-deploy",

-            "kind": "Deployment",

-            "apiVersion": "v1beta1",

-            "triggerPolicy": "manual",

-            "configId": "registry-config",

-            "strategy": {

-              "type": "CustomPod",

-              "customPod": {

-                "image": "openshift/kube-deploy"

-              }

-            },

-            "controllerTemplate": {

-              "replicas": 1,

-              "replicaSelector": {

-                "name": "registryPod"

-              },

-              "podTemplate": {

-              "desiredState": {

-                    "manifest": {

-                        "containers": [

-                            {

-                                "image": "openshift/docker-registry",

-                                "name": "registry-container",

-                                "ports": [

-                                    {

-                                        "containerPort": 5000,

-                                        "protocol": "TCP"

-                                    }

-                                ]

-                            }

-                        ],

-                        "id": "registryPod",

-                        "version": "v1beta1",

-                        "volumes": null

-                    },

-                    "restartpolicy": {}

-                },

-                "labels": {

-                    "name": "registryPod"

-                }

-            }

-          }

-        }

-    ]

-}

deleted file mode 100755

@@ -1,124 +0,0 @@

-#!/bin/bash

-

-# OpenShift binary

-openshift="../../_output/go/bin/openshift"

-

-# OPTIONAL: Wipe out previous OpenShift/k8s deployment information for a

-# clean start.

-rm -rf openshift.local.etcd

-

-# OPTIONAL: kill all Docker containers before starting

-# docker kill `docker ps --no-trunc -q`

-

-echo "Pre-pulling images"

-./pullimages.sh

-

-# Start the OpenShift all-in-one server

-# (starts a kubernetes master and minion as well as providing the origin REST api)

-echo "Launching openshift all-in-one server"

-$openshift start &> logs/openshift.log &

-

-sleep 5

-

-# Deploy the private Docker registry config

-$openshift kube apply -c registry-config.json

-

-# Wait for the app container to start up

-rc=1

-while [ ! $rc -eq 0 ]

-do

-  echo "Waiting for Docker registry pod to start..."

-  $openshift kube list pods

-  sleep 5

-  $openshift kube list pods | grep registryPod | grep Running

-  rc=$?

-done

-

-$openshift kube list services | grep frontend

-rc=$?

-while [ ! $rc -eq 0 ]

-do

-  echo "Waiting for Docker registry service to start..."

-  $openshift kube list services

-  sleep 5

-  $openshift kube list services | grep registryPod

-  rc=$?

-done

-

-# poke the docker registry to make sure it's alive

-echo "Probing docker registry"

-curl http://localhost:5001 >& /dev/null

-curl http://localhost:5001

-

-# show build cfgs

-echo "Initially no build configurations:"

-$openshift kube list buildConfigs

-

-# define a build cfg

-echo "Defining a new build configuration"

-$openshift kube create buildConfigs -c buildcfg/buildcfg.json

-

-# show build cfgs

-echo "Build configuration defined:"

-$openshift kube list buildConfigs

-

-

-#show no build running

-echo "Initially no builds running:"

-$openshift kube list builds

-

-

-#Requesting new build

-echo "Triggering new build"

-curl -s -A "GitHub-Hookshot/github" -H "Content-Type:application/json" -H "X-Github-Event:push" -d @buildinvoke/pushevent.json http://localhost:8080/osapi/v1beta1/buildConfigHooks/build100/secret101/github

-

-#show build running

-echo "Build now running: "

-$openshift kube list builds

-

-id=`$openshift kube list builds | grep new | awk '{print $1}'`

-

-$openshift kube get builds/$id | grep complete

-rc=$?

-while [ ! $rc -eq 0 ]

-do

-  echo "Waiting for build to complete..."

-  $openshift kube get builds/$id

-  sleep 5

-  $openshift kube get builds/$id | grep complete

-  rc=$?

-done

-

-# Convert template to config

-echo "Submitting application template json for processing..."

-$openshift kube process -c template/template.json | $openshift kube apply -c -

-

-# Wait for the app container to start up

-rc=1

-while [ ! $rc -eq 0 ]

-do

-  echo "Waiting for frontend pod to start..."

-  $openshift kube list pods

-  sleep 5

-  $openshift kube list pods | grep frontend | grep Running

-  rc=$?

-done

-

-$openshift kube list services | grep frontend

-rc=$?

-while [ ! $rc -eq 0 ]

-do

-  echo "Waiting for frontend service to start..."

-  $openshift kube list services

-  sleep 5

-  $openshift kube list services | grep frontend

-  rc=$?

-done

-

-# Sometimes the app isn't quite available even though the pod is running,

-# wait a little longer.

-sleep 20

-

-# Confirm the app is running/responsive.

-echo "Frontend is available, sending request.  Frontend says:"

-curl http://localhost:5432

deleted file mode 100644

@@ -1,86 +0,0 @@

-{

-  "id": "ruby-helloworld-sample-template",

-  "kind": "Template",

-  "apiVersion": "v1beta1",

-  "name": "ruby-hello-world-template",

-  "description": "This example shows how to create a simple ruby application in openshift origin v3",

-  "parameters": [

-    {

-      "name": "ADMIN_USERNAME",

-      "description": "administrator username",

-      "generate": "expression",

-      "from": "admin[A-Z0-9]{3}"

-    },

-    {

-      "name": "ADMIN_PASSWORD",

-      "description": "administrator password",

-      "generate": "expression",

-      "from": "[a-zA-Z0-9]{8}"

-    },

-    {

-      "name": "DB_PASSWORD",

-      "description": "database password",

-      "generate": "expression",

-      "from": "[a-zA-Z0-9]{8}"

-    }

-  ],

-  "items": [

-    {

-      "id": "frontend",

-      "kind": "Service",

-      "apiVersion": "v1beta1",

-      "port": 5432,

-      "containerPort": 8080,

-      "selector": {

-        "name": "frontend"

-      }

-    },

-    {

-      "id": "frontend-deploy",

-      "kind": "Deployment",

-      "apiVersion": "v1beta1",

-      "triggerPolicy": "manual",

-      "configId": "frontend-config",

-      "strategy": {

-        "type": "CustomPod",

-        "customPod": {

-          "image": "openshift/kube-deploy"

-        }

-      },

-      "controllerTemplate": {

-        "replicas": 1,

-        "replicaSelector": {

-          "name": "frontend"

-        },

-        "podTemplate": {

-          "desiredState": {

-            "manifest": {

-              "version": "v1beta1",

-              "id": "frontendController",

-              "containers": [{

-                "name": "ruby-helloworld",

-                "image": "127.0.0.1:5001/openshift/origin-ruby-sample",

-                "env": [

-                  {

-                    "name": "ADMIN_USERNAME",

-                    "value": "${ADMIN_USERNAME}"

-                  },

-                  {

-                    "name": "ADMIN_PASSWORD",

-                    "value": "${ADMIN_PASSWORD}"

-                  },

-                  {

-                    "name": "DB_PASSWORD",

-                    "value": "${DB_PASSWORD}"

-                  }

-                ],

-                "ports": [{"containerPort": 8080}]

-              }]

-            }

-          },

-          "labels": {"name": "frontend"}

-        }

-      }

-    }

-  ]

-}

@@ -22,7 +22,3 @@ docker build -t openshift/base-builder images/builder/docker/base

 docker build -t openshift/docker-builder images/builder/docker/docker-builder

 docker build -t openshift/sti-builder images/builder/docker/sti-builder

 docker build -t openshift/hello-openshift examples/hello-openshift

-

-images/deployer/kube-deploy/build.sh

-docker build -t openshift/kube-deploy images/deployer/kube-deploy

-rm -f images/deployer/kube-deploy/kube-deploy

@@ -67,23 +67,23 @@ wait_for_url "http://localhost:8080/healthz" "[INFO] apiserver: "

 # Deploy private docker registry

 echo "[INFO] Deploying private Docker registry"

-$openshift kube apply -c ${FIXTURE_DIR}/registry-config.json