github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #20944 from janetkuo/move-deployment-example 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-02-11 02:37:31 -08:00
parent 3208665edf ddd983286b
commit 09314f97f6
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
examples/extensions/deployment.yaml → docs/user-guide/deployment.yaml
View File

4
examples/examples_test.go
View File

@ -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{},

6
hack/test-cmd.sh
View File

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