@@ -1,13 +1,10 @@

 apiVersion: v1beta3

-kind: List

 items:

 - apiVersion: v1beta3

   kind: DeploymentConfig

   metadata:

     name: gitserver

   spec:

-    triggers:

-    - type: ConfigChange

     replicas: 1

     selector:

       run-container: gitserver

@@ -17,13 +14,9 @@ items:

           run-container: gitserver

       spec:

         containers:

-        - name: gitserver

-          image: openshift/origin-gitserver

-          ports:

-          - containerPort: 8080

-          env:

+        - env:

           - name: PUBLIC_URL

-            value: "http://gitserver.myproject.local:8080" # TODO: this needs to be resolved from env

+            value: http://gitserver.myproject.local:8080

           - name: GIT_HOME

             value: /var/lib/git

           - name: HOOK_PATH

@@ -35,40 +28,43 @@ items:

           - name: ALLOW_LAZY_CREATE

             value: "yes"

           - name: AUTOLINK_CONFIG

-            value: /var/lib/gitsecrets/admin.kubeconfig # TODO: use the service account secret

+            value: /var/lib/gitsecrets/admin.kubeconfig

           - name: AUTOLINK_NAMESPACE

-            #value: # TODO: use env generation

           - name: AUTOLINK_HOOK

-            value:

+            value: null

           - name: REQUIRE_GIT_AUTH

-            #value: user:password # if set, authentication is required to push to this server

-          #- name: GIT_INITIAL_CLONE_1

-          #  value:

           - name: OPENSHIFTCONFIG

-            value: /var/lib/gitsecrets/admin.kubeconfig # TODO: use the service account secret

+            value: /var/lib/gitsecrets/admin.kubeconfig

+          image: openshift/origin-gitserver

+          name: gitserver

+          ports:

+          - containerPort: 8080

           volumeMounts:

-          - name: config

-            mountPath: /var/lib/gitsecrets/

+          - mountPath: /var/lib/gitsecrets/

+            name: config

             readOnly: true

         volumes:

         - name: config

           secret:

             secretName: gitserver-config

+    triggers:

+    - type: ConfigChange

 - apiVersion: v1beta3

   kind: Secret

   metadata:

     name: gitserver-config

   spec:

     data:

-      # Needs to be populated

-      admin.kubeconfig:

+      admin.kubeconfig: null

 - apiVersion: v1beta3

   kind: Service

   metadata:

     name: gitserver

   spec:

-    selector:

-      run-container: gitserver

     ports:

     - port: 8080

       targetPort: 8080

+    selector:

+      run-container: gitserver

+kind: List

+metadata: {}

@@ -1,6 +1,7 @@

 apiVersion: v1beta3

 kind: LimitRange

 metadata:

+  creationTimestamp: null

   name: limits

 spec:

   limits:

@@ -1,6 +1,7 @@

 apiVersion: v1beta3

 kind: Pod

 metadata:

+  creationTimestamp: null

   name: pod-with-resources

 spec:

   containers:

@@ -15,5 +16,8 @@ spec:

     securityContext:

       capabilities: {}

       privileged: false

+    terminationMessagePath: /dev/termination-log

   dnsPolicy: ClusterFirst

-  restartPolicy: Always

\ No newline at end of file

+  restartPolicy: Always

+  serviceAccount: ""

+status: {}

@@ -1,6 +1,7 @@

 apiVersion: v1beta3

 kind: Pod

 metadata:

+  creationTimestamp: null

   name: pod-without-resources

 spec:

   containers:

@@ -8,8 +9,12 @@ spec:

     image: gcr.io/google_containers/serve_hostname

     imagePullPolicy: IfNotPresent

     name: kubernetes-serve-hostname

+    resources: {}

     securityContext:

       capabilities: {}

       privileged: false

+    terminationMessagePath: /dev/termination-log

   dnsPolicy: ClusterFirst

-  restartPolicy: Always

\ No newline at end of file

+  restartPolicy: Always

+  serviceAccount: ""

+status: {}

@@ -1,11 +1,14 @@

+apiVersion: v1beta3

 kind: ResourceQuota

 metadata:

+  creationTimestamp: null

   name: quota

 spec:

   hard:

     cpu: "1"

-    memory: "750Mi"

+    memory: 750Mi

     pods: "10"

     replicationcontrollers: "10"

     resourcequotas: "1"

-    services: "10"

\ No newline at end of file

+    services: "10"

+status: {}

@@ -200,6 +200,7 @@

                 "ruby-helloworld"

               ],

               "from": {

+                "kind": "ImageStreamTag",

                 "name": "origin-ruby-sample:latest"

               },

               "lastTriggeredImage": ""

@@ -437,4 +438,4 @@

   "labels": {

     "template": "application-template-stibuild"

   }

-}

+}

\ No newline at end of file

@@ -1,5 +1,4 @@

-apiVersion: v1beta1

-creationTimestamp: null

+apiVersion: v1beta3

 items:

 - apiVersion: v1beta1

   kind: BuildConfig

@@ -274,9 +273,9 @@ items:

 - annotations:

     deploymentConfig: frontend

     deploymentStatus: Failed

-    openshift.io/deployment.status-reason: unable to contact server

     deploymentVersion: "2"

     encodedDeploymentConfig: '{"kind":"DeploymentConfig","apiVersion":"v1beta1","metadata":{"name":"frontend","namespace":"test","selfLink":"/osapi/v1beta1/watch/deploymentConfigs/frontend","uid":"471f24e3-dcdc-11e4-968a-080027c5bfa9","resourceVersion":"346","creationTimestamp":"2015-04-07T04:12:17Z","labels":{"template":"application-template-stibuild"}},"triggers":[{"type":"ImageChange","imageChangeParams":{"automatic":true,"containerNames":["ruby-helloworld"],"from":{"kind":"ImageRepository","name":"origin-ruby-sample"},"tag":"latest","lastTriggeredImage":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58"}}],"template":{"strategy":{"type":"Recreate"},"controllerTemplate":{"replicas":1,"replicaSelector":{"name":"frontend"},"podTemplate":{"desiredState":{"manifest":{"version":"v1beta2","id":"","volumes":null,"containers":[{"name":"ruby-helloworld","image":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58","ports":[{"containerPort":8080,"protocol":"TCP"}],"env":[{"name":"ADMIN_USERNAME","key":"ADMIN_USERNAME","value":"adminNPX"},{"name":"ADMIN_PASSWORD","key":"ADMIN_PASSWORD","value":"7q1IdEao"},{"name":"MYSQL_USER","key":"MYSQL_USER","value":"user1CY"},{"name":"MYSQL_PASSWORD","key":"MYSQL_PASSWORD","value":"FfyXmsGG"},{"name":"MYSQL_DATABASE","key":"MYSQL_DATABASE","value":"root"}],"resources":{},"terminationMessagePath":"/dev/termination-log","imagePullPolicy":"PullIfNotPresent","capabilities":{}}],"restartPolicy":{"always":{}},"dnsPolicy":"ClusterFirst"}},"labels":{"name":"frontend","template":"application-template-stibuild"}}}},"latestVersion":1,"details":{"causes":[{"type":"ImageChange","imageTrigger":{"repositoryName":"172.30.17.139:5000/test/origin-ruby-sample:73214fafa244cb8abbe55273dac5d237a589a5fc7ac09926a1756a42c21e8a58","tag":"latest"}}]}}'

+    openshift.io/deployment.status-reason: unable to contact server

     pod: deploy-frontend-17mza9

   apiVersion: v1beta1

   creationTimestamp: 2015-04-07T04:12:53Z

@@ -523,4 +522,5 @@ items:

   sessionAffinity: None

   uid: 4704cf56-dcdc-11e4-968a-080027c5bfa9

 kind: List

-resourceVersion: 592

+metadata:

+  resourceVersion: "592"

@@ -1,8 +1,4 @@

-#

-# A simple build config, deployment config, build, and service.

-#

-apiVersion: v1beta1

-creationTimestamp: null

+apiVersion: v1beta3

 items:

 - apiVersion: v1beta1

   kind: BuildConfig

@@ -110,4 +106,5 @@ items:

   sessionAffinity: None

   uid: 2b315406-dca0-11e4-aecc-7831c1b76042

 kind: List

-resourceVersion: 116

+metadata:

+  resourceVersion: "116"

@@ -1,5 +1,4 @@

-apiVersion: v1beta1

-creationTimestamp: null

+apiVersion: v1beta3

 items:

 - apiVersion: v1beta1

   kind: BuildConfig

@@ -136,3 +135,4 @@ items:

   sessionAffinity: None

   uid: 2b315406-dca0-11e4-aecc-7831c1b76042

 kind: List

+metadata: {}

@@ -1,5 +1,4 @@

-apiVersion: v1beta1

-creationTimestamp: null

+apiVersion: v1beta3

 items:

 - apiVersion: v1beta1

   kind: BuildConfig

@@ -58,6 +57,17 @@ items:

       to:

         kind: ImageStream

         name: sinatra-app-example

+    revision:

+      git:

+        author:

+          email: someguy@outhere.com

+          name: Roy Programmer

+        commit: 7a4f354721b0c9717e46f2e132b269b495d43e2b

+        commiter:

+          email: openshiftbot@redhat.com

+          name: openshiftbot

+        message: Prepare v1beta3 Template types

+      type: git

     source:

       git:

         uri: git://github.com/mfojtik/sinatra-app-example

@@ -68,17 +78,6 @@ items:

         clean: true

         image: openshift/ruby-20-centos7

       type: STI

-    revision:

-      type: git

-      git:

-        commit: 7a4f354721b0c9717e46f2e132b269b495d43e2b

-        message: Prepare v1beta3 Template types

-        commiter:

-          name: openshiftbot

-          email: openshiftbot@redhat.com

-        author:

-          name: Roy Programmer

-          email: someguy@outhere.com

   startTimestamp: 2015-04-06T21:19:03Z

   status: Running

 - apiVersion: v1beta1

@@ -197,3 +196,4 @@ items:

   sessionAffinity: None

   uid: 2b315406-dca0-11e4-aecc-7831c1b76042

 kind: List

+metadata: {}