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

 7. *Optional:* Add the following webhook to your new github repository:

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

+        $ http://<host>:8080/osapi/v1beta1/buildConfigHooks/ruby-sample-build/secret101/github

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

 8. Edit application-template.json

@@ -74,11 +74,11 @@ All commands assume the `openshift` binary is in your path:

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

  * 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 @github-webhook-example.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/ruby-sample-build/secret101/github

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

-        I0916 13:50:22.479529 21375 log.go:134] POST /osapi/v1beta1/buildConfigHooks/build100/secret101/github

+        I0916 13:50:22.479529 21375 log.go:134] POST /osapi/v1beta1/buildConfigHooks/ruby-sample-build/secret101/github

     which confirms the webhook was triggered.

@@ -136,7 +136,7 @@ You should see a welcome page and a form that allows you to query and update key

 15. Make a change to your ruby sample main.html file and push it.

  * If you do not have the webhook enabled, you'll have to manually trigger another build:

-            $ 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

+            $ 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/ruby-sample-build/secret101/github

 16. Repeat step 11 (waiting for the build to complete).  Once the build is complete, refreshing your browser should show your changes.

@@ -50,7 +50,7 @@

       }

     },

     {

-      "id": "build100",

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

       "kind": "BuildConfig",

       "apiVersion": "v1beta1",

       "parameters": {

@@ -70,7 +70,7 @@

       },

       "secret": "secret101",

       "labels": {

-        "name": "build100"

+        "name": "ruby-sample-build"

       }

     },

     {

@@ -88,9 +88,6 @@

             "repositoryName": "172.121.17.1:5001/openshift/origin-ruby-sample",

             "tag": "latest"

           }

-        },

-        {

-          "type": "ConfigChange"

         }

       ],

       "template": {

@@ -156,46 +153,52 @@

     },

     {

       "id": "database",

-      "kind": "Deployment",

+      "kind": "DeploymentConfig",

       "apiVersion": "v1beta1",

-      "triggerPolicy": "manual",

-      "strategy": {

-        "type": "Basic"

-      },

-      "controllerTemplate": {

-        "replicas": 1,

-        "replicaSelector": {

-          "name": "database"

-      },

-      "podTemplate": {

-        "desiredState": {

-          "manifest": {

-            "version": "v1beta1",

-            "containers": [

-              {

-                 "name": "ruby-helloworld-database",

-                 "image": "mysql",

-                  "env": [

-                    {

-                      "name": "MYSQL_ROOT_PASSWORD",

-                      "value": "${MYSQL_ROOT_PASSWORD}"

-                    },

-                    {

-                      "name": "MYSQL_DATABASE",

-                      "value": "${MYSQL_DATABASE}"

-                    }

-                  ],

-                  "ports": [

-                    {

-                      "containerPort": 3306

-                    }

-                  ]

-                }

-              ]

-            }

-          },

-          "labels": {

+      "triggers": [

+        {

+          "type": "ConfigChange"

+        }

+      ],

+      "template": {

+        "strategy": {

+          "type": "Basic"

+        },

+        "controllerTemplate": {

+          "replicas": 1,

+          "replicaSelector": {

             "name": "database"

+        },

+        "podTemplate": {

+          "desiredState": {

+            "manifest": {

+              "version": "v1beta1",

+              "containers": [

+                {

+                   "name": "ruby-helloworld-database",

+                   "image": "mysql",

+                    "env": [

+                      {

+                        "name": "MYSQL_ROOT_PASSWORD",

+                        "value": "${MYSQL_ROOT_PASSWORD}"

+                      },

+                      {

+                        "name": "MYSQL_DATABASE",

+                        "value": "${MYSQL_DATABASE}"

+                      }

+                    ],

+                    "ports": [

+                      {

+                        "containerPort": 3306

+                      }

+                    ]

+                  }

+                ]

+              }

+            },

+            "labels": {

+              "name": "database"

+            }

           }

         }

       }

@@ -1,83 +1,95 @@

 {

-  "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": [

+  "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"

+      "apiVersion":"v1beta1",

+      "creationTimestamp":null,

+      "id":"docker-registry",

+      "kind":"Service",

+      "port":5001,

+      "containerPort":5000,

+      "selector":{

+        "name":"registrypod"

       }

     },

     {

-      "id": "docker-registry",

-      "kind": "ReplicationController",

-      "apiVersion": "v1beta1",

-      "desiredState": {

-        "replicas": 1,

-        "replicaSelector": {

-          "name": "registrypod"

+      "id":"docker-registry",

+      "kind":"DeploymentConfig",

+      "apiVersion":"v1beta1",

+      "triggers":[

+        {

+          "type":"ConfigChange",

+        }

+      ],

+      "template":{

+        "strategy":{

+          "type":"Basic"

         },

-        "podTemplate": {

-          "desiredState": {

-            "manifest": {

-              "containers": [

-                {

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

-                  "name": "registry-container",

-                  "ports": [

-                    {

-                      "containerPort": 5000,

-                      "protocol": "TCP"

-                    }

-                  ],

-                  "env": [

-                    {

-                      "name": "STORAGE_PATH",

-                      "value": "/tmp/openshift.local.registry"

-                    },

-                    {

-                      "name": "OPENSHIFT_URL",

-                      "value": "http://172.17.42.1:8080/osapi/v1beta1"

-                    },

-                    {

-                      "name": "REGISTRY_URL",

-                      "value": "172.121.17.1:5001"

-                    }

-                  ],

-                  "volumeMounts": [

-                    {

-                      "name": "registry-storage",

-                      "mountPath": "/tmp/openshift.local.registry",

-                      "readOnly": false

-                    }

-                  ]

-                }

-              ],

-              "version": "v1beta1",

-              "volumes": [

-                {

-                  "name": "registry-storage",

-                  "source": {

-                    "hostDir": {

-                      "path": "/tmp/openshift.local.registry"

+        "controllerTemplate":{

+          "replicas":1,

+          "replicaSelector":{

+            "name":"registrypod"

+          },

+          "podTemplate":{

+            "desiredState":{

+              "manifest":{

+                "containers":[

+                  {

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

+                    "name":"registry-container",

+                    "ports":[

+                      {

+                        "containerPort":5000,

+                        "protocol":"TCP"

+                      }

+                    ],

+                    "env":[

+                      {

+                        "name":"STORAGE_PATH",

+                        "value":"/tmp/openshift.local.registry"

+                      },

+                      {

+                        "name":"OPENSHIFT_URL",

+                        "value":"http://172.17.42.1:8080/osapi/v1beta1"

+                      },

+                      {

+                        "name":"REGISTRY_URL",

+                        "value":"172.121.17.1:5001"

+                      }

+                    ],

+                    "volumeMounts":[

+                      {

+                        "name":"registry-storage",

+                        "mountPath":"/tmp/openshift.local.registry",

+                        "readOnly":false

+                      }

+                    ]

+                  }

+                ],

+                "version":"v1beta1",

+                "volumes":[

+                  {

+                    "name":"registry-storage",

+                    "source":{

+                      "hostDir":{

+                        "path":"/tmp/openshift.local.registry"

+                      }

                     }

                   }

-                }

-              ]

+                ]

+              },

+              "restartpolicy":{

+

+              }

             },

-            "restartpolicy": {}

-          },

-          "labels": {

-            "name": "registrypod"

+            "labels":{

+              "name":"registrypod"

+            }

           }

         }

       }

@@ -139,7 +139,7 @@ $openshift kube apply --ns=${NAMESPACE} -c $CONFIG_FILE

 # Trigger build

 echo "[INFO] Simulating github hook to trigger new build using curl"

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

+curl -s -A "GitHub-Hookshot/github" -H "Content-Type:application/json" -H "X-Github-Event:push" -d @${FIXTURE_DIR}/github-webhook-example.json http://localhost:8080/osapi/v1beta1/buildConfigHooks/ruby-sample-build/secret101/github?namespace=${NAMESPACE}

 # Wait for build to complete

 echo "[INFO] Waiting for build to complete"

@@ -48,7 +48,8 @@ func (dc *DeploymentConfigChangeController) HandleDeploymentConfig() {

 	}

 	if config.LatestVersion == 0 {

-		glog.V(4).Info("Ignoring config change with LatestVersion=0")

+		glog.V(4).Infof("Creating new deployment for config %v", config.ID)

+		dc.generateDeployment(config, nil)

 		return

 	}

@@ -67,6 +68,10 @@ func (dc *DeploymentConfigChangeController) HandleDeploymentConfig() {

 		return

 	}

+	dc.generateDeployment(config, deployment)

+}

+

+func (dc *DeploymentConfigChangeController) generateDeployment(config *deployapi.DeploymentConfig, deployment *deployapi.Deployment) {

 	ctx := kapi.WithNamespace(kapi.NewContext(), config.Namespace)

 	newConfig, err := dc.ChangeStrategy.GenerateDeploymentConfig(ctx, config.ID)

 	if err != nil {

@@ -74,7 +79,9 @@ func (dc *DeploymentConfigChangeController) HandleDeploymentConfig() {

 		return

 	}

-	glog.V(4).Infof("Updating config %s (LatestVersion: %d -> %d) to advance existing deployment %s", config.ID, config.LatestVersion, newConfig.LatestVersion, deployment.ID)

+	if deployment != nil {

+		glog.V(4).Infof("Updating config %s (LatestVersion: %d -> %d) to advance existing deployment %s", config.ID, config.LatestVersion, newConfig.LatestVersion, deployment.ID)

+	}

 	// set the trigger details for the new deployment config

 	causes := []*deployapi.DeploymentCause{}

@@ -8,8 +8,8 @@ import (

 	deploytest "github.com/openshift/origin/pkg/deploy/controller/test"

 )

-// Test the controller's response to a new DeploymentConfig

-func TestNewConfig(t *testing.T) {

+// Test the controller's response to a new DeploymentConfig with a config change trigger.

+func TestNewConfigWithoutTrigger(t *testing.T) {

 	generated := false

 	updated := false

@@ -25,9 +25,9 @@ func TestNewConfig(t *testing.T) {

 			},

 		},

 		NextDeploymentConfig: func() *deployapi.DeploymentConfig {

-			return initialConfig()

+			return newConfigWithoutTrigger()

 		},

-		DeploymentStore: deploytest.NewFakeDeploymentStore(matchingInitialDeployment()),

+		DeploymentStore: deploytest.NewFakeDeploymentStore(nil),

 	}

 	controller.HandleDeploymentConfig()

@@ -41,6 +41,46 @@ func TestNewConfig(t *testing.T) {

 	}

 }

+func TestNewConfigWithTrigger(t *testing.T) {

+	var (

+		generatedId string

+		updated     *deployapi.DeploymentConfig

+	)

+

+	controller := &DeploymentConfigChangeController{

+		ChangeStrategy: &testChangeStrategy{

+			GenerateDeploymentConfigFunc: func(id string) (*deployapi.DeploymentConfig, error) {

+				generatedId = id

+				return generatedConfig(), nil

+			},

+			UpdateDeploymentConfigFunc: func(config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error) {

+				updated = config

+				return config, nil

+			},

+		},

+		NextDeploymentConfig: func() *deployapi.DeploymentConfig {

+			return newConfigWithTrigger()

+		},

+		DeploymentStore: deploytest.NewFakeDeploymentStore(nil),

+	}

+

+	controller.HandleDeploymentConfig()

+

+	if generatedId != "test-deploy-config" {

+		t.Fatalf("Unexpected generated config id.  Expected test-deploy-config, got: %v", generatedId)

+	}

+

+	if updated.ID != "test-deploy-config" {

+		t.Fatalf("Unexpected updated config id.  Expected test-deploy-config, got: %v", updated.ID)

+	} else if updated.Details == nil {

+		t.Fatalf("expected config change details to be set")

+	} else if updated.Details.Causes == nil {

+		t.Fatalf("expected config change causes to be set")

+	} else if updated.Details.Causes[0].Type != deployapi.DeploymentTriggerOnConfigChange {

+		t.Fatalf("expected config change cause to be set to config change trigger, got %s", updated.Details.Causes[0].Type)

+	}

+}

+

 // Test the controller's response when the pod template is changed

 func TestChangeWithTemplateDiff(t *testing.T) {

 	var (

@@ -52,7 +92,7 @@ func TestChangeWithTemplateDiff(t *testing.T) {

 		ChangeStrategy: &testChangeStrategy{

 			GenerateDeploymentConfigFunc: func(id string) (*deployapi.DeploymentConfig, error) {

 				generatedId = id

-				return generatedConfig(), nil

+				return generatedExistingConfig(), nil

 			},

 			UpdateDeploymentConfigFunc: func(config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error) {

 				updated = config

@@ -98,7 +138,7 @@ func TestChangeWithoutTemplateDiff(t *testing.T) {

 			},

 		},

 		NextDeploymentConfig: func() *deployapi.DeploymentConfig {

-			return initialConfig()

+			return existingConfigWithTrigger()

 		},

 		DeploymentStore: deploytest.NewFakeDeploymentStore(matchingInitialDeployment()),

 	}

@@ -127,7 +167,7 @@ func (i *testChangeStrategy) UpdateDeploymentConfig(ctx kapi.Context, config *de

 	return i.UpdateDeploymentConfigFunc(config)

 }

-func initialConfig() *deployapi.DeploymentConfig {

+func existingConfigWithTrigger() *deployapi.DeploymentConfig {

 	return &deployapi.DeploymentConfig{

 		TypeMeta: kapi.TypeMeta{ID: "test-deploy-config"},

 		Triggers: []deployapi.DeploymentTriggerPolicy{

@@ -163,6 +203,19 @@ func initialConfig() *deployapi.DeploymentConfig {

 	}

 }

+func newConfigWithTrigger() *deployapi.DeploymentConfig {

+	config := existingConfigWithTrigger()

+	config.LatestVersion = 0

+	return config

+}

+

+func newConfigWithoutTrigger() *deployapi.DeploymentConfig {

+	config := existingConfigWithTrigger()

+	config.LatestVersion = 0

+	config.Triggers = []deployapi.DeploymentTriggerPolicy{}

+	return config

+}

+

 func diffedConfig() *deployapi.DeploymentConfig {

 	return &deployapi.DeploymentConfig{

 		TypeMeta: kapi.TypeMeta{ID: "test-deploy-config"},

@@ -199,7 +252,7 @@ func diffedConfig() *deployapi.DeploymentConfig {

 	}

 }

-func generatedConfig() *deployapi.DeploymentConfig {

+func generatedExistingConfig() *deployapi.DeploymentConfig {

 	return &deployapi.DeploymentConfig{

 		TypeMeta: kapi.TypeMeta{ID: "test-deploy-config"},

 		Triggers: []deployapi.DeploymentTriggerPolicy{

@@ -235,6 +288,12 @@ func generatedConfig() *deployapi.DeploymentConfig {

 	}

 }

+func generatedConfig() *deployapi.DeploymentConfig {

+	config := generatedExistingConfig()

+	config.LatestVersion = 0

+	return config

+}

+

 func matchingInitialDeployment() *deployapi.Deployment {

 	return &deployapi.Deployment{

 		TypeMeta: kapi.TypeMeta{ID: "test-deploy-config-1"},

@@ -154,15 +154,6 @@ func TestSimpleConfigChangeTrigger(t *testing.T) {

 		t.Fatalf("Couldn't create DeploymentConfig: %v", err)

 	}

-	// submit the initial generated config, which will cause an initial deployment

-	if config, err = openshift.Client.GenerateDeploymentConfig(ctx, config.ID); err != nil {

-		t.Fatalf("Error generating config: %v", err)

-	}

-

-	if _, err := openshift.Client.UpdateDeploymentConfig(ctx, config); err != nil {

-		t.Fatalf("Couldn't create updated DeploymentConfig: %v", err)

-	}

-

 	// verify the initial deployment exists

 	event := <-watch.ResultChan()

 	deployment := event.Object.(*deployapi.Deployment)