github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 12:46:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20765 from janetkuo/remove-podtemplate-key

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-06 00:44:47 -08:00
parent fe269474ca 38ae5785dc
commit b45a94bc78
23 changed files with 12455 additions and 12668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hack/test-cmd.sh
View File

@@ -678,7 +678,7 @@ runTests() {
kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" 'nginx:'
# Clean up
kubectl delete deployment nginx "${kube_flags[@]}"
kubectl delete rc -l deployment.kubernetes.io/podTemplateHash "${kube_flags[@]}"
kubectl delete rc -l pod-template-hash "${kube_flags[@]}"
##############
# Namespaces #
@@ -1102,7 +1102,7 @@ __EOF__
# Clean up
kubectl delete hpa nginx-deployment "${kube_flags[@]}"
kubectl delete deployment nginx-deployment "${kube_flags[@]}"
kubectl delete rc -l deployment.kubernetes.io/podTemplateHash "${kube_flags[@]}"
kubectl delete rc -l pod-template-hash "${kube_flags[@]}"
### Rollback a deployment
# Pre-condition: no deployment exists
@@ -1131,7 +1131,7 @@ __EOF__
kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:latest:'
# Clean up
kubectl delete deployment nginx-deployment "${kube_flags[@]}"
kubectl delete rc -l deployment.kubernetes.io/podTemplateHash "${kube_flags[@]}"
kubectl delete rc -l pod-template-hash "${kube_flags[@]}"
######################
# ConfigMap #