deleted file mode 100644

@@ -1,9 +0,0 @@

-An image stream is a collection of images that share the same metadata. It contains multiple

-versions of an image as it evolves over time with new builds of the codebase. 

-

-An image stream is one of the sources of image metadata. Metadata for an image can come from one of three places:

-* The original image binary as specified by the Dockerfile - this includes environment variables, command to execute, ports exposed, etc.

-* The image definition in the OpenShift environment. This can be used to override metadata from the Dockerfile

-* The image stream which overrides individual image metadata.

-

-Some images can be used as services while others can be used as single execution jobs.

deleted file mode 100644

@@ -1,10 +0,0 @@

-The 3.x model attempts to expose underlying Docker and Google models as

-accurately as possible, with a focus on easy composition of applications

-by a developer (install Ruby, push code, add MySQL). Unlike 2.x, more

-flexibility of configuration is exposed after creation in all aspects

-of the model. Terminology is still being weighed, but the concept of an

-application as a separate object is being removed in favor of more flexible

-composition of "services" - allowing two web containers to reuse a DB,

-or expose a DB directly to the edge of the network.

-The existing API will continue to be supported through 3.x,

-with concepts mapped as closely as possible to the new model.

deleted file mode 100644

@@ -1,3 +0,0 @@

-Projects are a similar concept to v2 domains. A project is a grouping of services with shared

-access control and resource limits. Applications can be assembled from services in a project

-by linking them together via service endpoints.

@@ -1,12 +1,27 @@

 #%RAML 0.8

 # vim: set ft=yaml:

-baseUri: http://server/broker/rest

 title: OpenShift 3

 version: v1beta1

+baseUri: http://localhost:8080/osapi/{version}

 mediaType: application/json

 documentation:

  - title: Overview

-   content: !include doc/overview.md

+   content: |

+    The OpenShift 3.x model attempts to expose underlying Docker and Kubernetes

+    models as accurately as possible, with a focus on easy composition of

+    applications by a developer (install Ruby, push code, add MySQL).

+

+    Unlike 2.x, more flexibility of configuration is exposed after creation in

+    all aspects of the model. Terminology is still being weighed, but the

+    concept of an application as a separate object is being removed in favor of

+    more flexible composition of "services" - allowing two web containers to

+    reuse a DB, or expose a DB directly to the edge of the network. The

+    existing API will continue to be supported through 3.x, with concepts

+    mapped as closely as possible to the new model.

+

+ - title: Kubernetes API

+   content: |

+    OpenShift exposes [Kubernetes API](http://htmlpreview.github.io/?https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/kubernetes.html) at http://localhost:8080/api/v1beta1/.

 /projects:

   displayName: /projects (NOT IMPLEMENTED)

@@ -494,99 +509,3 @@ documentation:

         200:

           body:

             example: !include examples/status-success.json

-

-/pods:

-  get:

-    description: List all pods on this cluster.

-    responses:

-      200:

-        body:

-          example: !include examples/pod-list.json

-  post:

-    description: Create a new pod. currentState is ignored if present.

-    body:

-      schema: !include doc/pod-schema.json

-      example: !include examples/pod.json

-

-  /{podID}:

-    get:

-      description: Get a specific pod.

-      responses:

-        200:

-          body:

-            example: !include examples/pod.json

-    put:

-      description: Update a specific pod.

-      body:

-        schema: !include doc/pod-schema.json

-        example: !include examples/pod.json

-    delete:

-      description: Delete a specific pod.

-      responses:

-        200:

-          body:

-            example: !include examples/status-success.json

-

-/replicationControllers:

-  get:

-    description: List all replicationControllers on this cluster.

-    responses:

-      200:

-        body:

-          example: !include examples/controller-list.json

-  post:

-    description: Create a new controller. currentState is ignored if present.

-    body:

-      schema: !include doc/controller-schema.json

-      example: !include examples/controller.json

-

-  /{controllerID}:

-    get:

-      description: Get a specific controller.

-      responses:

-        200:

-          body:

-            example: !include examples/controller.json

-    put:

-      description: Update a specific controller.

-      body:

-        schema: !include doc/controller-schema.json

-        example: !include examples/controller.json

-    delete:

-      description: Delete a specific controller.

-      responses:

-        200:

-          body:

-            example: !include examples/status-success.json

-

-/services:

-  get:

-    description: List all services on this cluster.

-    responses:

-      200:

-        body:

-          example: !include examples/service-list.json

-  post:

-    description: Create a new service.

-    body:

-      schema: !include doc/service-schema.json

-      example: !include examples/service.json

-

-  /{serviceID}:

-    get:

-      description: Get a specific service.

-      responses:

-        200:

-          body:

-            example: !include examples/service.json

-    put:

-      description: Update a specific service.

-      body:

-        schema: !include doc/service-schema.json

-        example: !include examples/service.json

-    delete:

-      description: Delete a specific service.

-      responses:

-        200:

-          body:

-            example: !include examples/status-success.json