From ddd983286b8452bd2abd7d1ac563b3e11c014019 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Tue, 9 Feb 2016 16:59:02 -0800 Subject: [PATCH] Move deployment example to docs/user-guide --- {examples/extensions => docs/user-guide}/deployment.yaml | 0 examples/examples_test.go | 4 +--- hack/test-cmd.sh | 6 +++--- 3 files changed, 4 insertions(+), 6 deletions(-) rename {examples/extensions => docs/user-guide}/deployment.yaml (100%) diff --git a/examples/extensions/deployment.yaml b/docs/user-guide/deployment.yaml similarity index 100% rename from examples/extensions/deployment.yaml rename to docs/user-guide/deployment.yaml diff --git a/examples/examples_test.go b/examples/examples_test.go index 04bc0464ca..fa77d676a4 100644 --- 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 index 06c78e07d3..b5b1b4aeb5 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -977,7 +977,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 @@ -1096,7 +1096,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 @@ -1111,7 +1111,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