Merge pull request kubernetes#20944 from janetkuo/move-deployment-exa…

…mple Auto commit by PR queue bot
satnam6502 · Feb 11, 2016 · 09314f9 · 09314f9
2 parents 3208665 + ddd9832
commit 09314f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/examples/extensions/deployment.yaml → docs/user-guide/deployment.yaml b/examples/extensions/deployment.yaml → docs/user-guide/deployment.yaml
diff --git a/examples/examples_test.go b/examples/examples_test.go
@@ -231,6 +231,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"nginx-deployment":     &extensions.Deployment{},
 			"new-nginx-deployment": &extensions.Deployment{},
 			"replication":          &api.ReplicationController{},
+			"deployment":           &extensions.Deployment{},
 		},
 		"../docs/admin": {
 			"daemon": &extensions.DaemonSet{},
@@ -388,9 +389,6 @@ func TestExampleObjectSchemas(t *testing.T) {
 		"../examples/fibre_channel": {
 			"fc": &api.Pod{},
 		},
-		"../examples/extensions": {
-			"deployment": &extensions.Deployment{},
-		},
 		"../examples/javaweb-tomcat-sidecar": {
 			"javaweb":   &api.Pod{},
 			"javaweb-2": &api.Pod{},

diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh
@@ -979,7 +979,7 @@ __EOF__
   # kubectl delete rs --all "${kube_flags[@]}"
 
   ### Expose a deployment as a service
-  kubectl create -f examples/extensions/deployment.yaml "${kube_flags[@]}"
+  kubectl create -f docs/user-guide/deployment.yaml "${kube_flags[@]}"
   # Pre-condition: 3 replicas
   kube::test::get_object_assert 'deployment nginx-deployment' "{{$deployment_replicas}}" '3'
   # Command
@@ -1098,7 +1098,7 @@ __EOF__
   # Pre-condition: no deployment exists
   kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" ''
   # Command
-  kubectl create -f examples/extensions/deployment.yaml "${kube_flags[@]}"
+  kubectl create -f docs/user-guide/deployment.yaml "${kube_flags[@]}"
   kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" 'nginx-deployment:'
   # autoscale 2~3 pods, default CPU utilization (80%)
   kubectl-with-retry autoscale deployment nginx-deployment "${kube_flags[@]}" --min=2 --max=3
@@ -1113,7 +1113,7 @@ __EOF__
   kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" ''
   # Command
   # Create a deployment (revision 1)
-  kubectl create -f examples/extensions/deployment.yaml "${kube_flags[@]}"
+  kubectl create -f docs/user-guide/deployment.yaml "${kube_flags[@]}"
   kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" 'nginx-deployment:'
   kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:'
   # Rollback to revision 1 - should be no-op